address pr comments

Author: wedamija

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

@@ -16,6 +16,7 @@
 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,
@@ -182,10 +183,13 @@ def sync_repos_for_org(organization_integration_id: int) -> None:
                 if str(repo["id"]) in new_ids
             ]
             if repo_configs:
-                created_repos = []
+                created_repos: list[RpcRepository] = []
+                reactivated_repos: list[RpcRepository] = []
                 try:
-                    created_repos = integration_repo_provider.create_repositories(
-                        configs=repo_configs, organization=rpc_org
+                    created_repos, reactivated_repos = (
+                        integration_repo_provider.create_repositories(
+                            configs=repo_configs, organization=rpc_org
+                        )
                     )
                 except RepoExistsError:
                     pass
@@ -199,6 +203,15 @@ def sync_repos_for_org(organization_integration_id: int) -> None:
                         provider=integration.provider,
                     )
 
+                for repo in reactivated_repos:
+                    log_repo_change(
+                        event_name="REPO_ENABLED",
+                        organization_id=organization_id,
+                        repo=repo,
+                        source="repository sync",
+                        provider=integration.provider,
+                    )
+
         if removed_ids:
             repository_service.disable_repositories_by_external_ids(
                 organization_id=organization_id,
@@ -208,13 +221,13 @@ def sync_repos_for_org(organization_integration_id: int) -> None:
             )
 
             for eid in removed_ids:
-                repo = repo_by_external_id.get(eid)
-                if repo:
+                removed_repo = repo_by_external_id.get(eid)
+                if removed_repo:
                     log_repo_change(
                         event_name="REPO_DISABLED",
                         organization_id=organization_id,
-                        repo=repo,
-                        source="repository sync",
+                        repo=removed_repo,
+                        source="automatic SCM syncing",
                         provider=integration.provider,
                     )
 
@@ -229,7 +242,7 @@ def sync_repos_for_org(organization_integration_id: int) -> None:
                         event_name="REPO_ENABLED",
                         organization_id=organization_id,
                         repo=repo,
-                        source="repository sync",
+                        source="automatic SCM syncing",
                         provider=integration.provider,
                     )
 

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

@@ -8,6 +8,7 @@
 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,
@@ -120,9 +121,10 @@ def _sync_repos_for_org(
                 continue
 
         if repo_configs:
-            created_repos = []
+            created_repos: list[RpcRepository] = []
+            reactivated_repos: list[RpcRepository] = []
             try:
-                created_repos = integration_repo_provider.create_repositories(
+                created_repos, reactivated_repos = integration_repo_provider.create_repositories(
                     configs=repo_configs, organization=rpc_org
                 )
             except RepoExistsError:
@@ -137,6 +139,15 @@ def _sync_repos_for_org(
                     provider=integration.provider,
                 )
 
+            for reactivated_repo in reactivated_repos:
+                log_repo_change(
+                    event_name="REPO_ENABLED",
+                    organization_id=rpc_org.id,
+                    repo=reactivated_repo,
+                    source="GitHub webhook",
+                    provider=integration.provider,
+                )
+
     if repos_removed:
         # Look up repos before disabling to get their IDs and names
         external_ids = [str(repo["id"]) for repo in repos_removed]
@@ -145,7 +156,11 @@ def _sync_repos_for_org(
             integration_id=integration.id,
             providers=[provider],
         )
-        repo_by_eid = {r.external_id: r for r in existing_repos if r.external_id}
+        repo_by_eid = {
+            r.external_id: r
+            for r in existing_repos
+            if r.external_id and r.status == ObjectStatus.ACTIVE
+        }
 
         repository_service.disable_repositories_by_external_ids(
             organization_id=rpc_org.id,

src/sentry/plugins/providers/integration_repository.py

@@ -240,7 +240,12 @@ def create_repositories(
         self,
         configs: list[RepositoryInputConfig],
         organization: RpcOrganization,
-    ) -> list[RpcRepository]:
+    ) -> tuple[list[RpcRepository], list[RpcRepository]]:
+        """
+        Create or update repositories from configs.
+        Returns (created, reactivated) — newly created repos and repos that
+        were reactivated or updated from a hidden/unlinked state.
+        """
         external_id_to_repo_config: dict[str, RepositoryConfig] = {}
         for config in configs:
             result = self.build_repository_config(organization=organization, data=config)
@@ -304,7 +309,7 @@ def create_repositories(
         if missing_repos:
             raise RepoExistsError(repos=missing_repos)
 
-        return created_repos + repos_to_update
+        return created_repos, repos_to_update
 
     def dispatch(self, request: Request, organization, **kwargs):
         try: