don't miss audit logs

Author: wedamija

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

@@ -13,7 +13,6 @@
 )
 from sentry.organizations.services.organization import organization_service
 from sentry.plugins.providers.integration_repository import (
-    RepoExistsError,
     RepositoryInputConfig,
     get_integration_repository_provider,
 )
@@ -40,7 +39,7 @@ def get_repo_config(repo: Mapping[str, Any], integration_id: int) -> RepositoryI
     processing_deadline_duration=60,
     silo_mode=SiloMode.CONTROL,
 )
-@retry(exclude=(RepoExistsError, KeyError))
+@retry(exclude=(KeyError,))
 def link_all_repos(
     integration_key: str,
     integration_id: int,
@@ -88,14 +87,15 @@ def link_all_repos(
                 missing_repos.append(repo)
                 continue
 
-        try:
+        _created_repos, _reactivated_repos, existing_repos = (
             integration_repo_provider.create_repositories(
                 configs=repo_configs, organization=rpc_org
             )
-        except RepoExistsError as e:
+        )
+        if existing_repos:
             lifecycle.record_halt(
                 str(LinkAllReposHaltReason.REPOSITORY_NOT_CREATED),
-                {"missing_repos": e.repos, "integration_id": integration_id},
+                {"missing_repos": existing_repos, "integration_id": integration_id},
             )
 
         if missing_repos:

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

@@ -16,18 +16,14 @@
 from sentry.constants import ObjectStatus
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.integrations.services.integration import integration_service
-from sentry.integrations.services.repository.model import RpcRepository
 from sentry.integrations.services.repository.service import repository_service
 from sentry.integrations.source_code_management.metrics import (
     SCMIntegrationInteractionEvent,
     SCMIntegrationInteractionType,
 )
 from sentry.integrations.source_code_management.repo_audit import log_repo_change
 from sentry.organizations.services.organization import organization_service
-from sentry.plugins.providers.integration_repository import (
-    RepoExistsError,
-    get_integration_repository_provider,
-)
+from sentry.plugins.providers.integration_repository import get_integration_repository_provider
 from sentry.shared_integrations.exceptions import ApiError
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task, retry
@@ -183,16 +179,9 @@ def sync_repos_for_org(organization_integration_id: int) -> None:
                 if str(repo["id"]) in new_ids
             ]
             if repo_configs:
-                created_repos: list[RpcRepository] = []
-                reactivated_repos: list[RpcRepository] = []
-                try:
-                    created_repos, reactivated_repos = (
-                        integration_repo_provider.create_repositories(
-                            configs=repo_configs, organization=rpc_org
-                        )
-                    )
-                except RepoExistsError:
-                    pass
+                created_repos, reactivated_repos, _ = integration_repo_provider.create_repositories(
+                    configs=repo_configs, organization=rpc_org
+                )
 
                 for repo in created_repos:
                     log_repo_change(

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

@@ -8,7 +8,6 @@
 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.model import RpcRepository
 from sentry.integrations.services.repository.service import repository_service
 from sentry.integrations.source_code_management.metrics import (
     SCMIntegrationInteractionEvent,
@@ -18,7 +17,6 @@
 from sentry.organizations.services.organization import organization_service
 from sentry.organizations.services.organization.model import RpcOrganization
 from sentry.plugins.providers.integration_repository import (
-    RepoExistsError,
     RepositoryInputConfig,
     get_integration_repository_provider,
 )
@@ -38,7 +36,7 @@
     processing_deadline_duration=120,
     silo_mode=SiloMode.CONTROL,
 )
-@retry(exclude=(RepoExistsError, KeyError))
+@retry(exclude=(KeyError,))
 def sync_repos_on_install_change(
     integration_id: int,
     action: str,
@@ -121,14 +119,11 @@ def _sync_repos_for_org(
                 continue
 
         if repo_configs:
-            created_repos: list[RpcRepository] = []
-            reactivated_repos: list[RpcRepository] = []
-            try:
-                created_repos, reactivated_repos = integration_repo_provider.create_repositories(
+            created_repos, reactivated_repos, _missing_repos = (
+                integration_repo_provider.create_repositories(
                     configs=repo_configs, organization=rpc_org
                 )
-            except RepoExistsError:
-                pass
+            )
 
             for created_repo in created_repos:
                 log_repo_change(

src/sentry/plugins/providers/integration_repository.py

@@ -240,11 +240,13 @@ def create_repositories(
         self,
         configs: list[RepositoryInputConfig],
         organization: RpcOrganization,
-    ) -> tuple[list[RpcRepository], list[RpcRepository]]:
+    ) -> tuple[list[RpcRepository], list[RpcRepository], list[RepositoryConfig]]:
         """
         Create or update repositories from configs.
-        Returns (created, reactivated) — newly created repos and repos that
-        were reactivated or updated from a hidden/unlinked state.
+        Returns (created, reactivated, missing) — newly created repos, repos that
+        were reactivated or updated from a hidden/unlinked state, and repo configs
+        that could not be created because a repository with that configuration
+        already exists.
         """
         external_id_to_repo_config: dict[str, RepositoryConfig] = {}
         for config in configs:
@@ -306,10 +308,7 @@ def create_repositories(
                 updates=repos_to_update,
             )
 
-        if missing_repos:
-            raise RepoExistsError(repos=missing_repos)
-
-        return created_repos, repos_to_update
+        return created_repos, repos_to_update, missing_repos
 
     def dispatch(self, request: Request, organization, **kwargs):
         try: