ref: CommitContextClient.get_merge_commit_sha_from_commit accepts repository instance

Author: jianyuan

src/sentry/integrations/github/client.py

@@ -227,11 +227,11 @@ def get_commit(self, repo: str, sha: str) -> Any:
         """
         return self.get_cached(f"/repos/{repo}/commits/{sha}")
 
-    def get_merge_commit_sha_from_commit(self, repo: str, sha: str) -> str | None:
+    def get_merge_commit_sha_from_commit(self, repo: Repository, sha: str) -> str | None:
         """
         Get the merge commit sha from a commit sha.
         """
-        response = self.get_pullrequest_from_commit(repo, sha)
+        response = self.get_pullrequest_from_commit(repo.name, sha)
         if not response or (isinstance(response, list) and len(response) != 1):
             # the response should return a single merged PR, return if multiple
             return None

src/sentry/integrations/gitlab/client.py

@@ -309,7 +309,7 @@ def get_commit(self, project_id, sha):
         """
         return self.get_cached(GitLabApiClientPath.commit.format(project=project_id, sha=sha))
 
-    def get_merge_commit_sha_from_commit(self, repo: str, sha: str) -> str | None:
+    def get_merge_commit_sha_from_commit(self, repo: Repository, sha: str) -> str | None:
         raise IntegrationFeatureNotImplementedError
 
     def compare_commits(self, project_id, start_sha, end_sha):

src/sentry/integrations/source_code_management/commit_context.py

@@ -190,7 +190,7 @@ def queue_comment_task_if_needed(
             try:
                 client = self.get_client()
                 merge_commit_sha = client.get_merge_commit_sha_from_commit(
-                    repo=repo.name, sha=commit.key
+                    repo=repo, sha=commit.key
                 )
             except Exception as e:
                 sentry_sdk.capture_exception(e)
@@ -385,5 +385,5 @@ def update_comment(
         raise NotImplementedError
 
     @abstractmethod
-    def get_merge_commit_sha_from_commit(self, repo: str, sha: str) -> str | None:
+    def get_merge_commit_sha_from_commit(self, repo: Repository, sha: str) -> str | None:
         raise NotImplementedError

tests/sentry/integrations/github/test_client.py

@@ -364,9 +364,7 @@ def test_get_merge_commit_sha_from_commit(self, get_jwt):
             json=pull_requests,
         )
 
-        sha = self.github_client.get_merge_commit_sha_from_commit(
-            repo=self.repo.name, sha=commit_sha
-        )
+        sha = self.github_client.get_merge_commit_sha_from_commit(repo=self.repo, sha=commit_sha)
         assert sha == merge_commit_sha
 
     @mock.patch("sentry.integrations.github.client.get_jwt", return_value="jwt_token_1")
@@ -381,9 +379,7 @@ def test_get_merge_commit_sha_from_commit_open_pr(self, get_jwt):
             json=pull_requests,
         )
 
-        sha = self.github_client.get_merge_commit_sha_from_commit(
-            repo=self.repo.name, sha=commit_sha
-        )
+        sha = self.github_client.get_merge_commit_sha_from_commit(repo=self.repo, sha=commit_sha)
         assert sha is None
 
     @responses.activate