-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ref(integrations): Remove indirect imports from messaging integrations #77094
Merged
RyanSkonnord
merged 13 commits into
master
from
cleanup-messaging-integration-indirect-imports
Sep 19, 2024
Merged
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
3e3ff42
ref(integrations): Remove indirect imports from Slack package
RyanSkonnord a961181
ref(integrations): Remove indirect imports from MSTeams package
RyanSkonnord 60831f3
ref(integrations): Remove indirect imports from Discord package
RyanSkonnord d4c5f6f
Fix more imports in tests
RyanSkonnord 1fa0519
Replace task imports colliding with module names
RyanSkonnord c0cb4fe
Fix mock references
RyanSkonnord 4116ec0
Fix mock reference in MSTeamsNotificationTest
RyanSkonnord 4f6bb0f
Merge branch 'master' into cleanup-messaging-integration-indirect-imp…
RyanSkonnord 5117fe8
Temporary getsentry fix
RyanSkonnord 4e99e07
Merge branch 'master' into cleanup-messaging-integration-indirect-imp…
RyanSkonnord af42cd0
Revert "Temporary getsentry fix"
RyanSkonnord a21026d
Merge branch 'master' into cleanup-messaging-integration-indirect-imp…
RyanSkonnord be86d38
Merge branch 'master' into cleanup-messaging-integration-indirect-imp…
RyanSkonnord File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,3 @@ | ||
from sentry.integrations.discord.spec import DiscordMessagingSpec | ||
|
||
from .actions import * # noqa: F401,F403 | ||
from .analytics import * # noqa: F401,F403 | ||
from .client import * # noqa: F401,F403 | ||
from .integration import * # noqa: F401,F403 | ||
from .message_builder.base import * # noqa: F401,F403 | ||
from .message_builder.issues import * # noqa: F401,F403 | ||
from .urls import * # noqa: F401,F403 | ||
from .utils import * # noqa: F401,F403 | ||
from .views import * # noqa: F401,F403 | ||
|
||
DiscordMessagingSpec().initialize() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +0,0 @@ | ||
from .issue_alert.form import * # noqa: F401, F403 | ||
from .issue_alert.notification import * # noqa: F401, F403 | ||
from .metric_alert import * # noqa: F401, F403 | ||
20 changes: 0 additions & 20 deletions
20
src/sentry/integrations/discord/message_builder/__init__.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +0,0 @@ | ||
from __future__ import annotations | ||
|
||
# Discord likes colors as decimal integers | ||
LEVEL_TO_COLOR = { | ||
"_actioned_issue": int("0xEDEEEF", 16), | ||
"_incident_resolved": int("0x4DC771", 16), | ||
"debug": int("0xFBE14F", 16), | ||
"error": int("0xE03E2F", 16), | ||
"fatal": int("0xFA4747", 16), | ||
"info": int("0x2788CE", 16), | ||
"warning": int("0xFFC227", 16), | ||
} | ||
|
||
INCIDENT_COLOR_MAPPING = { | ||
"Resolved": "_incident_resolved", | ||
"Warning": "warning", | ||
"Critical": "fatal", | ||
} | ||
|
||
DISCORD_URL_FORMAT = "[{text}]({url})" | ||
20 changes: 20 additions & 0 deletions
20
src/sentry/integrations/discord/message_builder/constants.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
from __future__ import annotations | ||
|
||
# Discord likes colors as decimal integers | ||
LEVEL_TO_COLOR = { | ||
"_actioned_issue": int("0xEDEEEF", 16), | ||
"_incident_resolved": int("0x4DC771", 16), | ||
"debug": int("0xFBE14F", 16), | ||
"error": int("0xE03E2F", 16), | ||
"fatal": int("0xFA4747", 16), | ||
"info": int("0x2788CE", 16), | ||
"warning": int("0xFFC227", 16), | ||
} | ||
|
||
INCIDENT_COLOR_MAPPING = { | ||
"Resolved": "_incident_resolved", | ||
"Warning": "warning", | ||
"Critical": "fatal", | ||
} | ||
|
||
DISCORD_URL_FORMAT = "[{text}]({url})" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,3 @@ | ||
from sentry.integrations.msteams.spec import MsTeamsMessagingSpec | ||
|
||
from .actions.form import * # noqa: F401,F403 | ||
from .actions.notification import * # noqa: F401,F403 | ||
from .analytics import * # noqa: F401,F403 | ||
from .card_builder.base import * # noqa: F401,F403 | ||
from .card_builder.block import * # noqa: F401,F403 | ||
from .card_builder.help import * # noqa: F401,F403 | ||
from .card_builder.identity import * # noqa: F401,F403 | ||
from .card_builder.installation import * # noqa: F401,F403 | ||
from .card_builder.notifications import * # noqa: F401,F403 | ||
from .client import * # noqa: F401,F403 | ||
from .integration import * # noqa: F401,F403 | ||
from .link_identity import * # noqa: F401,F403 | ||
from .notifications import * # noqa: F401,F403 | ||
from .unlink_identity import * # noqa: F401,F403 | ||
from .urls import * # noqa: F401,F403 | ||
from .utils import * # noqa: F401,F403 | ||
from .webhook import * # noqa: F401,F403 | ||
|
||
MsTeamsMessagingSpec().initialize() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +0,0 @@ | ||
from .form import MsTeamsNotifyServiceForm | ||
from .notification import MsTeamsNotifyServiceAction | ||
|
||
__all__ = ( | ||
"MsTeamsNotifyServiceForm", | ||
"MsTeamsNotifyServiceAction", | ||
) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +0,0 @@ | ||
from __future__ import annotations | ||
|
||
ME = "ME" | ||
MSTEAMS_URL_FORMAT = "[{text}]({url})" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,43 +1,3 @@ | ||
from sentry.integrations.slack.spec import SlackMessagingSpec | ||
|
||
from .actions.form import * # noqa: F401,F403 | ||
from .actions.notification import * # noqa: F401,F403 | ||
from .analytics import * # noqa: F401,F403 | ||
from .integration import * # noqa: F401,F403 | ||
from .message_builder.base.base import * # noqa: F401,F403 | ||
from .message_builder.base.block import * # noqa: F401,F403 | ||
from .message_builder.disconnected import * # noqa: F401,F403 | ||
from .message_builder.discover import * # noqa: F401,F403 | ||
from .message_builder.help import * # noqa: F401,F403 | ||
from .message_builder.incidents import * # noqa: F401,F403 | ||
from .message_builder.issues import * # noqa: F401,F403 | ||
from .message_builder.metric_alerts import * # noqa: F401,F403 | ||
from .message_builder.notifications.base import * # noqa: F401,F403 | ||
from .message_builder.notifications.digest import * # noqa: F401,F403 | ||
from .message_builder.notifications.issues import * # noqa: F401,F403 | ||
from .message_builder.prompt import * # noqa: F401,F403 | ||
from .notifications import * # noqa: F401,F403 | ||
from .requests.action import * # noqa: F401,F403 | ||
from .requests.base import * # noqa: F401,F403 | ||
from .requests.command import * # noqa: F401,F403 | ||
from .requests.event import * # noqa: F401,F403 | ||
from .unfurl.discover import * # noqa: F401,F403 | ||
from .unfurl.issues import * # noqa: F401,F403 | ||
from .unfurl.metric_alerts import * # noqa: F401,F403 | ||
from .urls import * # noqa: F401,F403 | ||
from .utils.auth import * # noqa: F401,F403 | ||
from .utils.channel import * # noqa: F401,F403 | ||
from .utils.escape import * # noqa: F401,F403 | ||
from .utils.notifications import * # noqa: F401,F403 | ||
from .utils.rule_status import * # noqa: F401,F403 | ||
from .utils.users import * # noqa: F401,F403 | ||
from .views.link_identity import * # noqa: F401,F403 | ||
from .views.link_team import * # noqa: F401,F403 | ||
from .views.unlink_identity import * # noqa: F401,F403 | ||
from .views.unlink_team import * # noqa: F401,F403 | ||
from .webhooks.action import * # noqa: F401,F403 | ||
from .webhooks.base import * # noqa: F401,F403 | ||
from .webhooks.command import * # noqa: F401,F403 | ||
from .webhooks.event import * # noqa: F401,F403 | ||
|
||
SlackMessagingSpec().initialize() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +0,0 @@ | ||
from .form import SlackNotifyServiceForm | ||
from .notification import SlackNotifyServiceAction | ||
|
||
__all__ = ( | ||
"SlackNotifyServiceForm", | ||
"SlackNotifyServiceAction", | ||
) | ||
25 changes: 0 additions & 25 deletions
25
src/sentry/integrations/slack/message_builder/notifications/__init__.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +0,0 @@ | ||
from __future__ import annotations | ||
|
||
from .base import SlackNotificationsMessageBuilder | ||
from .daily_summary import SlackDailySummaryMessageBuilder | ||
from .digest import DigestNotificationMessageBuilder | ||
from .issues import IssueNotificationMessageBuilder | ||
|
||
|
||
def get_message_builder(class_name: str) -> type[SlackNotificationsMessageBuilder]: | ||
"""TODO(mgaeta): HACK to get around circular imports.""" | ||
return { | ||
"DigestNotificationMessageBuilder": DigestNotificationMessageBuilder, | ||
"IssueNotificationMessageBuilder": IssueNotificationMessageBuilder, | ||
"SlackNotificationsMessageBuilder": SlackNotificationsMessageBuilder, | ||
"SlackDailySummaryMessageBuilder": SlackDailySummaryMessageBuilder, | ||
}[class_name] | ||
|
||
|
||
__all__ = ( | ||
"get_message_builder", | ||
"DigestNotificationMessageBuilder", | ||
"IssueNotificationMessageBuilder", | ||
"SlackNotificationsMessageBuilder", | ||
"SlackDailySummaryMessageBuilder", | ||
) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +0,0 @@ | ||
__all__ = ("SlackRequest", "SlackRequestError") | ||
|
||
from .base import SlackRequest, SlackRequestError | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +0,0 @@ | ||
from .find_channel_id_for_alert_rule import find_channel_id_for_alert_rule | ||
from .find_channel_id_for_rule import find_channel_id_for_rule | ||
from .link_slack_user_identities import link_slack_user_identities | ||
from .post_message import post_message, post_message_control | ||
from .send_notifications_on_activity import send_activity_notifications_to_slack_threads | ||
|
||
__all__ = ( | ||
"send_activity_notifications_to_slack_threads", | ||
"find_channel_id_for_alert_rule", | ||
"find_channel_id_for_rule", | ||
"link_slack_user_identities", | ||
"post_message", | ||
"post_message_control", | ||
) | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should audit if we even need this service