refactor: GetCommitInfo func in Bitbucket Data Center

This patch refactors GetCommitInfo in Bitucket DataCenter using
jenkins-x/go-scm

Signed-off-by: PuneetPunamiya <ppunamiy@redhat.com>

Author: PuneetPunamiya

pkg/provider/bitbucketdatacenter/bitbucketdatacenter.go

@@ -13,7 +13,6 @@ import (
 	"github.com/jenkins-x/go-scm/scm"
 	"github.com/jenkins-x/go-scm/scm/driver/stash"
 	"github.com/jenkins-x/go-scm/scm/transport/oauth2"
-	"github.com/mitchellh/mapstructure"
 	"github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/v1alpha1"
 	"github.com/openshift-pipelines/pipelines-as-code/pkg/changedfiles"
 	"github.com/openshift-pipelines/pipelines-as-code/pkg/events"
@@ -315,31 +314,21 @@ func (v *Provider) SetClient(ctx context.Context, run *params.Run, event *info.E
 }
 
 func (v *Provider) GetCommitInfo(_ context.Context, event *info.Event) error {
-	localVarOptionals := map[string]any{}
-	resp, err := v.Client.DefaultApi.GetCommit(v.projectKey, event.Repository, event.SHA, localVarOptionals)
-	if err != nil {
-		return err
-	}
-	commitInfo := bbv1.Commit{}
-	err = mapstructure.Decode(resp.Values, &commitInfo)
+	OrgAndRepo := fmt.Sprintf("%s/%s", event.Organization, event.Repository)
+	commit, _, err := v.ScmClient.Git.FindCommit(context.Background(), OrgAndRepo, event.SHA)
 	if err != nil {
 		return err
 	}
-	event.SHATitle = sanitizeTitle(commitInfo.Message)
+	event.SHATitle = sanitizeTitle(commit.Message)
 	event.SHAURL = fmt.Sprintf("%s/projects/%s/repos/%s/commits/%s", v.baseURL, v.projectKey, event.Repository, event.SHA)
 
-	resp, err = v.Client.DefaultApi.GetDefaultBranch(v.projectKey, event.Repository)
-	if err != nil {
-		return err
-	}
-	branchInfo := &bbv1.Branch{}
-	err = mapstructure.Decode(resp.Values, branchInfo)
+	ref, _, err := v.ScmClient.Git.GetDefaultBranch(context.Background(), OrgAndRepo)
 	if err != nil {
 		return err
 	}
 
-	v.defaultBranchLatestCommit = branchInfo.LatestCommit
-	event.DefaultBranch = branchInfo.DisplayID
+	v.defaultBranchLatestCommit = ref.Sha
+	event.DefaultBranch = ref.Name
 	return nil
 }
 

pkg/provider/bitbucketdatacenter/bitbucketdatacenter_test.go

@@ -21,7 +21,7 @@ import (
 	"github.com/openshift-pipelines/pipelines-as-code/pkg/provider"
 	bbtest "github.com/openshift-pipelines/pipelines-as-code/pkg/provider/bitbucketdatacenter/test"
 
-	bbv1 "github.com/gfleury/go-bitbucket-v1"
+	"github.com/jenkins-x/go-scm/scm"
 	"go.uber.org/zap"
 	zapobserver "go.uber.org/zap/zaptest/observer"
 	"gotest.tools/v3/assert"
@@ -384,7 +384,7 @@ func TestGetCommitInfo(t *testing.T) {
 	tests := []struct {
 		name          string
 		event         *info.Event
-		commit        bbv1.Commit
+		commit        scm.Commit
 		defaultBranch string
 		latestCommit  string
 	}{
@@ -396,7 +396,7 @@ func TestGetCommitInfo(t *testing.T) {
 				SHA:          "sha",
 			},
 			defaultBranch: "branchmain",
-			commit: bbv1.Commit{
+			commit: scm.Commit{
 				Message: "hello moto",
 			},
 			latestCommit: "latestcommit",
@@ -406,11 +406,11 @@ func TestGetCommitInfo(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			ctx, _ := rtesting.SetupFakeContext(t)
-			bbclient, _, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient(ctx)
+			_, scmClient, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient(ctx)
 			bbtest.MuxCommitInfo(t, mux, tt.event, tt.commit)
 			bbtest.MuxDefaultBranch(t, mux, tt.event, tt.defaultBranch, tt.latestCommit)
 			defer tearDown()
-			v := &Provider{Client: bbclient, baseURL: tURL, projectKey: tt.event.Organization}
+			v := &Provider{ScmClient: scmClient, baseURL: tURL, projectKey: tt.event.Organization}
 			err := v.GetCommitInfo(ctx, tt.event)
 			assert.NilError(t, err)
 			assert.Equal(t, tt.defaultBranch, tt.event.DefaultBranch)

pkg/provider/bitbucketdatacenter/test/test.go

@@ -141,7 +141,7 @@ func MuxDirContent(t *testing.T, mux *http.ServeMux, event *info.Event, testDir,
 	MuxFiles(t, mux, event, event.HeadBranch, targetDirName, filecontents, wantFilesErr)
 }
 
-func MuxCommitInfo(t *testing.T, mux *http.ServeMux, event *info.Event, commit bbv1.Commit) {
+func MuxCommitInfo(t *testing.T, mux *http.ServeMux, event *info.Event, commit scm.Commit) {
 	path := fmt.Sprintf("/projects/%s/repos/%s/commits/%s", event.Organization, event.Repository, event.SHA)
 
 	mux.HandleFunc(path, func(rw http.ResponseWriter, _ *http.Request) {