ref(github-growth): check external id when creating repo (#53307)

Author: cathteng

src/sentry/plugins/providers/integration_repository.py

@@ -85,32 +85,34 @@ def create_repository(
 
         integration_id = result.get("integration_id")
         external_id = result.get("external_id")
+        name = result.get("name")
 
         repo_update_params = {
             "external_id": external_id,
             "url": result.get("url"),
             "config": result.get("config") or {},
             "provider": self.id,
             "integration_id": integration_id,
+            "name": name,
         }
 
         # first check if there is an existing hidden repository with an integration that matches
         existing_repo = Repository.objects.filter(
             organization_id=organization.id,
-            name=result["name"],
             integration_id=integration_id,
             external_id=external_id,
             status=ObjectStatus.HIDDEN,
         ).first()
         if existing_repo:
             existing_repo.status = ObjectStatus.ACTIVE
+            existing_repo.name = name
             existing_repo.save()
             metrics.incr("sentry.integration_repo_provider.repo_relink")
             return result, existing_repo
 
         # then check if there is a repository without an integration that matches
         repo = Repository.objects.filter(
-            organization_id=organization.id, name=result["name"], integration_id=None
+            organization_id=organization.id, external_id=external_id, integration_id=None
         ).first()
 
         if repo:
@@ -133,18 +135,23 @@ def create_repository(
             try:
                 with transaction.atomic(router.db_for_write(Repository)):
                     repo = Repository.objects.create(
-                        organization_id=organization.id, name=result["name"], **repo_update_params
+                        organization_id=organization.id, **repo_update_params
                     )
             except IntegrityError:
                 # Try to delete webhook we just created
                 try:
-                    repo = Repository(
-                        organization_id=organization.id, name=result["name"], **repo_update_params
-                    )
+                    repo = Repository(organization_id=organization.id, **repo_update_params)
                     self.on_delete_repository(repo)
                 except IntegrationError:
                     pass
 
+                # if possible update the repo with matching integration
+                repo = Repository.objects.filter(
+                    organization_id=organization.id,
+                    external_id=external_id,
+                    integration_id=integration_id,
+                ).update(**repo_update_params)
+
                 raise RepoExistsError
 
         return result, repo

tests/sentry/api/endpoints/test_organization_repositories.py

@@ -333,7 +333,10 @@ def test_simple(self, mock_build_repository_config):
     )
     def test_floating_repo(self, mock_build_repository_config):
         repo = Repository.objects.create(
-            organization_id=self.org.id, name="getsentry/sentry", status=2
+            organization_id=self.org.id,
+            name="getsentry/sentry",
+            status=2,
+            external_id="my_external_id",
         )
         with patch.object(
             ExampleRepositoryProvider, "build_repository_config", return_value=self.repo_config_data

tests/sentry/integrations/github/test_webhooks.py

@@ -162,6 +162,7 @@ def test_ignores_hidden_repo(self):
             name="baxterthehacker/public-repo",
         )
         repo.status = ObjectStatus.HIDDEN
+        repo.external_id = "35129377"
         repo.save()
 
         self._setup_repo_test(project)
@@ -453,6 +454,7 @@ def test_ignores_hidden_repo(self):
             name="baxterthehacker/public-repo",
         )
         repo.status = ObjectStatus.HIDDEN
+        repo.external_id = "35129377"
         repo.save()
 
         self._setup_repo_test(project)

tests/sentry/plugins/test_integration_repository.py

@@ -45,9 +45,9 @@ def setUp(self):
     def provider(self):
         return GitHubRepositoryProvider("integrations:github")
 
-    def _create_repo(self, external_id=None):
+    def _create_repo(self, external_id=None, name=None):
         return Repository.objects.create(
-            name=self.repo_name,
+            name=name if name else self.repo_name,
             provider="integrations:github",
             organization_id=self.organization.id,
             integration_id=self.integration.id,
@@ -66,11 +66,20 @@ def test_create_repository(self, get_jwt):
         assert repos[0].provider == "integrations:github"
 
     def test_create_repository__repo_exists(self, get_jwt):
-        self._create_repo()
+        self._create_repo(external_id=self.config["external_id"])
 
         with pytest.raises(RepoExistsError):
             self.provider.create_repository(self.config, self.organization)
 
+    def test_create_repository__repo_exists_update_name(self, get_jwt):
+        repo = self._create_repo(external_id=self.config["external_id"], name="getsentry/santry")
+
+        with pytest.raises(RepoExistsError):
+            self.provider.create_repository(self.config, self.organization)
+
+        repo.refresh_from_db()
+        assert repo.name == self.repo_name
+
     @patch("sentry.models.Repository.objects.create")
     @patch("sentry.plugins.providers.IntegrationRepositoryProvider.on_delete_repository")
     def test_create_repository__delete_webhook(self, mock_on_delete, mock_repo, get_jwt):