fix(bitbucketcloud): optimize commit info fetch

zakisk · chmouel · commit 02cb1b7032e1 · 2026-01-29T13:52:05.000+01:00
Replace paginated GetCommits API with direct GetCommit lookup to eliminate performance bottleneck on repositories with many commits. When SHA is unavailable, fetch branch info first to get HEAD commit SHA, then use GetCommit for single-commit retrieval. This reduces webhook processing time from 49 seconds to <1 second on repositories with 2333+ commits by avoiding pagination through entire commit history. Fixes: #2336 https://issues.redhat.com/browse/SRVKP-10617 Signed-off-by: Zaki Shaikh <zashaikh@redhat.com> Assisted-by: Claude Sonnet 4.5 (via Claude Code)
diff --git a/pkg/provider/bitbucketcloud/bitbucket.go b/pkg/provider/bitbucketcloud/bitbucket.go
@@ -217,31 +217,44 @@ func (v *Provider) SetClient(_ context.Context, run *params.Run, event *info.Eve
 }
 
 func (v *Provider) GetCommitInfo(_ context.Context, event *info.Event) error {
-	branchortag := event.SHA
-	if branchortag == "" {
-		branchortag = event.HeadBranch
+	// If we don't have a SHA, get it from the branch first
+	sha := event.SHA
+	if sha == "" && event.HeadBranch != "" {
+		v.Logger.Infof("fetching branch info to get commit SHA for branch: %s", event.HeadBranch)
+		branchInfo, err := v.Client().Repositories.Repository.GetBranch(&bitbucket.RepositoryBranchOptions{
+			Owner:      event.Organization,
+			RepoSlug:   event.Repository,
+			BranchName: event.HeadBranch,
+		})
+		if err != nil {
+			return err
+		}
+		// Extract hash from Target map
+		if hash, ok := branchInfo.Target["hash"].(string); ok {
+			sha = hash
+		} else {
+			return fmt.Errorf("cannot extract commit hash from branch %s", event.HeadBranch)
+		}
 	}
-	response, err := v.Client().Repositories.Commits.GetCommits(&bitbucket.CommitsOptions{
-		Owner:       event.Organization,
-		RepoSlug:    event.Repository,
-		Branchortag: branchortag,
+
+	// Use GetCommit API for direct single-commit fetch (no pagination)
+	v.Logger.Infof("fetching commit info using GetCommit API for SHA: %s", sha)
+	response, err := v.Client().Repositories.Commits.GetCommit(&bitbucket.CommitsOptions{
+		Owner:    event.Organization,
+		RepoSlug: event.Repository,
+		Revision: sha,
 	})
 	if err != nil {
 		return err
 	}
+
 	commitMap, ok := response.(map[string]any)
 	if !ok {
-		return fmt.Errorf("cannot convert")
-	}
-	values, ok := commitMap["values"].([]any)
-	if !ok {
-		return fmt.Errorf("cannot convert")
-	}
-	if len(values) == 0 {
-		return fmt.Errorf("we did not get commit information from commit: %s", event.SHA)
+		return fmt.Errorf("cannot convert commit response")
 	}
+
 	commitinfo := &types.Commit{}
-	err = mapstructure.Decode(values[0], commitinfo)
+	err = mapstructure.Decode(commitMap, commitinfo)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/provider/bitbucketcloud/bitbucket_test.go b/pkg/provider/bitbucketcloud/bitbucket_test.go
@@ -225,12 +225,13 @@ func TestGetCommitInfo(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			ctx, _ := rtesting.SetupFakeContext(t)
+			observer, _ := zapobserver.New(zap.InfoLevel)
+			fakelogger := zap.New(observer).Sugar()
 			bbclient, mux, tearDown := bbcloudtest.SetupBBCloudClient(t)
 			defer tearDown()
-			v := &Provider{bbClient: bbclient}
-			bbcloudtest.MuxCommits(t, mux, tt.event, []types.Commit{
-				tt.commitinfo,
-			})
+			v := &Provider{Logger: fakelogger, bbClient: bbclient}
+			bbcloudtest.MuxCommit(t, mux, tt.event, tt.commitinfo)
+			bbcloudtest.MuxBranch(t, mux, tt.event, tt.commitinfo)
 			bbcloudtest.MuxRepoInfo(t, mux, tt.event, tt.repoinfo)
 
 			if err := v.GetCommitInfo(ctx, tt.event); (err != nil) != tt.wantErr {
diff --git a/pkg/provider/bitbucketcloud/test/bbcloudtest.go b/pkg/provider/bitbucketcloud/test/bbcloudtest.go
@@ -121,15 +121,48 @@ func MuxListDirFiles(t *testing.T, mux *http.ServeMux, event *info.Event, dirs m
 	}
 }
 
-func MuxCommits(t *testing.T, mux *http.ServeMux, event *info.Event, commits []types.Commit) {
+// MuxCommit mocks the GetCommit API (single commit, not paginated).
+func MuxCommit(t *testing.T, mux *http.ServeMux, event *info.Event, commit types.Commit) {
 	t.Helper()
 
-	path := fmt.Sprintf("/repositories/%s/%s/commits/%s", event.Organization, event.Repository, event.SHA)
+	shas := []string{}
+	if event.SHA != "" {
+		shas = append(shas, event.SHA)
+	}
+	if commit.Hash != "" && commit.Hash != event.SHA {
+		shas = append(shas, commit.Hash)
+	}
+	if len(shas) == 0 {
+		shas = append(shas, "HEAD")
+	}
+
+	for _, sha := range shas {
+		path := fmt.Sprintf("/repositories/%s/%s/commit/%s", event.Organization, event.Repository, sha)
+		mux.HandleFunc(path, func(rw http.ResponseWriter, _ *http.Request) {
+			// GetCommit returns a single commit object, not {values: [...]}
+			b, _ := json.Marshal(commit)
+			fmt.Fprint(rw, string(b))
+		})
+	}
+}
+
+func MuxBranch(t *testing.T, mux *http.ServeMux, event *info.Event, commit types.Commit) {
+	t.Helper()
+
+	if event.HeadBranch == "" {
+		return
+	}
+
+	path := fmt.Sprintf("/repositories/%s/%s/refs/branches/%s", event.Organization, event.Repository, event.HeadBranch)
 	mux.HandleFunc(path, func(rw http.ResponseWriter, _ *http.Request) {
-		dircontents := map[string][]types.Commit{
-			"values": commits,
+		// Return the commit hash that this branch points to
+		branch := map[string]interface{}{
+			"name": event.HeadBranch,
+			"target": map[string]interface{}{
+				"hash": commit.Hash,
+			},
 		}
-		b, _ := json.Marshal(dircontents)
+		b, _ := json.Marshal(branch)
 		fmt.Fprint(rw, string(b))
 	})
 }
