address comment

Author: wedamija

src/sentry/integrations/github/tasks/sync_repos_on_install_change.py

@@ -1,10 +1,11 @@
 import logging
-from typing import Literal, TypedDict
+from typing import Literal
 
 from taskbroker_client.retry import Retry
 
 from sentry import features
 from sentry.constants import ObjectStatus
+from sentry.integrations.github.webhook_types import GitHubInstallationRepo
 from sentry.integrations.services.integration import integration_service
 from sentry.integrations.services.integration.model import RpcIntegration
 from sentry.integrations.services.repository.service import repository_service
@@ -25,13 +26,6 @@
 
 from .link_all_repos import get_repo_config
 
-
-class GitHubRepo(TypedDict, total=False):
-    id: int
-    full_name: str
-    private: bool
-
-
 logger = logging.getLogger(__name__)
 
 
@@ -46,8 +40,8 @@ class GitHubRepo(TypedDict, total=False):
 def sync_repos_on_install_change(
     integration_id: int,
     action: str,
-    repos_added: list[GitHubRepo],
-    repos_removed: list[GitHubRepo],
+    repos_added: list[GitHubInstallationRepo],
+    repos_removed: list[GitHubInstallationRepo],
     repository_selection: Literal["all", "selected"],
 ) -> None:
     """
@@ -111,8 +105,8 @@ def _sync_repos_for_org(
     integration: RpcIntegration,
     rpc_org: RpcOrganization,
     provider: str,
-    repos_added: list[GitHubRepo],
-    repos_removed: list[GitHubRepo],
+    repos_added: list[GitHubInstallationRepo],
+    repos_removed: list[GitHubInstallationRepo],
 ) -> None:
     if repos_added:
         integration_repo_provider = get_integration_repository_provider(integration)

src/sentry/integrations/github/webhook.py

@@ -8,7 +8,7 @@
 from abc import ABC
 from collections.abc import Mapping, MutableMapping, Sequence
 from datetime import timezone
-from typing import Any, Literal, Protocol, TypedDict
+from typing import Any, Protocol
 
 import orjson
 import sentry_sdk
@@ -30,6 +30,7 @@
 from sentry.integrations.github.webhook_types import (
     GITHUB_WEBHOOK_TYPE_HEADER_KEY,
     GithubWebhookType,
+    InstallationRepositoriesEvent,
 )
 from sentry.integrations.pipeline import ensure_integration
 from sentry.integrations.services.integration.model import (
@@ -418,21 +419,6 @@ def _handle_organization_deletion(
             )
 
 
-class GitHubInstallationRepo(TypedDict):
-    id: int
-    full_name: str
-    private: bool
-
-
-class InstallationRepositoriesEvent(TypedDict):
-    action: Literal["added", "removed"]
-    installation: dict[str, Any]
-    repositories_added: list[GitHubInstallationRepo]
-    repositories_removed: list[GitHubInstallationRepo]
-    repository_selection: Literal["all", "selected"]
-    sender: dict[str, Any]
-
-
 class InstallationRepositoriesEventWebhook(GitHubWebhook):
     """
     Handles installation_repositories events when repos are added to or

src/sentry/integrations/github/webhook_types.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from enum import StrEnum
+from typing import Any, Literal, TypedDict
 
 GITHUB_WEBHOOK_TYPE_HEADER = "HTTP_X_GITHUB_EVENT"
 GITHUB_WEBHOOK_TYPE_HEADER_KEY = "X-GITHUB-EVENT"
@@ -29,3 +30,18 @@ class GithubWebhookType(StrEnum):
 CELL_PROCESSED_GITHUB_EVENTS = frozenset(
     t.value for t in GithubWebhookType if t not in _CONTROL_ONLY_EVENTS
 )
+
+
+class GitHubInstallationRepo(TypedDict):
+    id: int
+    full_name: str
+    private: bool
+
+
+class InstallationRepositoriesEvent(TypedDict):
+    action: Literal["added", "removed"]
+    installation: dict[str, Any]
+    repositories_added: list[GitHubInstallationRepo]
+    repositories_removed: list[GitHubInstallationRepo]
+    repository_selection: Literal["all", "selected"]
+    sender: dict[str, Any]

tests/sentry/integrations/github/test_webhook.py

@@ -22,9 +22,9 @@
 from sentry.constants import ObjectStatus
 from sentry.integrations.github.webhook import (
     GitHubIntegrationsWebhookEndpoint,
-    InstallationRepositoriesEvent,
     InstallationRepositoriesEventWebhook,
 )
+from sentry.integrations.github.webhook_types import InstallationRepositoriesEvent
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.integrations.services.integration import integration_service