Fix tag ref for Bitbucket Cloud (#1782)

Fix tag ref when using Bitbucket Cloud as the provider.
Also reverted changes to "old" change, as this would be a change in behavior

Co-authored-by: Conrad Dobbs <[email protected]>
Co-authored-by: Chmouel Boudjnah <[email protected]>

Author: 3 people

pkg/provider/bitbucketcloud/parse_payload.go

@@ -155,10 +155,14 @@ func (v *Provider) ParsePayload(ctx context.Context, run *params.Run, request *h
 		processedEvent.Repository = e.Repository.Name
 		processedEvent.SHA = e.Push.Changes[0].New.Target.Hash
 		processedEvent.URL = e.Repository.Links.HTML.HRef
-		processedEvent.BaseBranch = e.Push.Changes[0].New.Name
 		processedEvent.HeadBranch = e.Push.Changes[0].Old.Name
 		processedEvent.BaseURL = e.Push.Changes[0].New.Target.Links.HTML.HRef
 		processedEvent.HeadURL = e.Push.Changes[0].Old.Target.Links.HTML.HRef
+		if e.Push.Changes[0].New.Type == "tag" {
+			processedEvent.BaseBranch = fmt.Sprintf("refs/tags/%s", e.Push.Changes[0].New.Name)
+		} else {
+			processedEvent.BaseBranch = e.Push.Changes[0].New.Name
+		}
 		processedEvent.AccountID = e.Actor.AccountID
 		processedEvent.Sender = e.Actor.Nickname
 	default:

pkg/provider/bitbucketcloud/parse_payload_test.go

@@ -25,6 +25,7 @@ func TestParsePayload(t *testing.T) {
 		expectedEventType         string
 		expectedAccountID         string
 		expectedSHA               string
+		expectedRef               string
 		eventType                 string
 		sourceIP                  string
 		allowedConfig             map[string]map[string]string
@@ -34,10 +35,21 @@ func TestParsePayload(t *testing.T) {
 	}{
 		{
 			name:              "parse push request",
-			payloadEvent:      bbcloudtest.MakePushEvent("PushAccountID", "Barbie", "slighlyhashed"),
+			payloadEvent:      bbcloudtest.MakePushEvent("PushAccountID", "Barbie", "slighlyhashed", "branch"),
 			expectedSender:    "Barbie",
 			expectedAccountID: "PushAccountID",
 			expectedSHA:       "slighlyhashed",
+			expectedRef:       "mychange",
+			eventType:         "repo:push",
+			expectedEventType: triggertype.Push.String(),
+		},
+		{
+			name:              "parse push tag",
+			payloadEvent:      bbcloudtest.MakePushEvent("PushAccountID", "Barbie", "slighlyhashed", "tag"),
+			expectedSender:    "Barbie",
+			expectedAccountID: "PushAccountID",
+			expectedSHA:       "slighlyhashed",
+			expectedRef:       "refs/tags/mychange",
 			eventType:         "repo:push",
 			expectedEventType: triggertype.Push.String(),
 		},
@@ -253,6 +265,10 @@ func TestParsePayload(t *testing.T) {
 			assert.Equal(t, tt.expectedSender, got.Sender)
 			assert.Equal(t, tt.expectedSHA, got.SHA, "%s != %s", tt.expectedSHA, got.SHA)
 			assert.Equal(t, tt.expectedEventType, got.EventType, "%s != %s", tt.expectedEventType, got.EventType)
+
+			if tt.expectedRef != "" {
+				assert.Equal(t, tt.expectedRef, got.BaseBranch, tt.expectedRef, got.BaseBranch)
+			}
 			if tt.targetPipelinerun != "" {
 				assert.Equal(t, tt.targetPipelinerun, got.TargetTestPipelineRun, tt.targetPipelinerun, got.TargetTestPipelineRun)
 			}

pkg/provider/bitbucketcloud/test/bbcloudtest.go

@@ -280,7 +280,7 @@ func MakePREvent(accountid, nickname, sha, comment string) types.PullRequestEven
 	return pr
 }
 
-func MakePushEvent(accountid, nickname, sha string) types.PushRequestEvent {
+func MakePushEvent(accountid, nickname, sha, changeType string) types.PushRequestEvent {
 	if accountid == "" {
 		accountid = "countlady"
 	}
@@ -299,9 +299,11 @@ func MakePushEvent(accountid, nickname, sha string) types.PushRequestEvent {
 			Changes: []types.Change{
 				{
 					New: types.ChangeType{
+						Name: "mychange",
 						Target: types.Commit{
 							Hash: sha,
 						},
+						Type: changeType,
 					},
 					Old: types.ChangeType{
 						Target: types.Commit{

pkg/provider/bitbucketcloud/types/types.go

@@ -75,6 +75,7 @@ type PushRequestEvent struct {
 type ChangeType struct {
 	Name   string
 	Target Commit
+	Type   string
 }
 
 type Change struct {