Merge pull request #230 from rutvijmehta-harness/master

bradrydzewski · web-flow · commit b29a0d2b0f30 · 2022-11-10T09:07:57.000-05:00
Add Actor UUID to push and branch create events for Bitbucket
diff --git a/scm/driver/bitbucket/testdata/webhooks/push.json.golden b/scm/driver/bitbucket/testdata/webhooks/push.json.golden
@@ -56,6 +56,7 @@
         }
     ],
     "Sender": {
+        "ID": "{87bb15eb-47c1-49b3-9f16-ca824a2979a4}",
         "Login": "brydzewski",
         "Name": "Brad Rydzewski",
         "Email": "",
diff --git a/scm/driver/bitbucket/testdata/webhooks/push_branch_create.json.golden b/scm/driver/bitbucket/testdata/webhooks/push_branch_create.json.golden
@@ -74,6 +74,7 @@
         }
     ],
     "Sender": {
+        "ID": "{87bb15eb-47c1-49b3-9f16-ca824a2979a4}",
         "Login": "brydzewski",
         "Name": "Brad Rydzewski",
         "Email": "",
diff --git a/scm/driver/bitbucket/testdata/webhooks/push_tag_create.json.golden b/scm/driver/bitbucket/testdata/webhooks/push_tag_create.json.golden
@@ -34,6 +34,7 @@
         "Link": "https://bitbucket.org/brydzewski/foo/commits/141977fedf5cf35aa290ac87d4b5177ac4cd9de1"
     },
     "Sender": {
+        "ID": "{87bb15eb-47c1-49b3-9f16-ca824a2979a4}",
         "Login": "brydzewski",
         "Name": "Brad Rydzewski",
         "Email": "",
diff --git a/scm/driver/bitbucket/webhook.go b/scm/driver/bitbucket/webhook.go
@@ -657,6 +657,7 @@ func convertPushHook(src *pushHook) *scm.PushHook {
 			Link:      src.Repository.Links.HTML.Href,
 		},
 		Sender: scm.User{
+			ID:     src.Actor.UUID,
 			Login:  src.Actor.Username,
 			Name:   src.Actor.DisplayName,
 			Avatar: src.Actor.Links.Avatar.Href,
@@ -689,6 +690,7 @@ func convertBranchCreateHook(src *pushHook) *scm.BranchHook {
 			Link:      src.Repository.Links.HTML.Href,
 		},
 		Sender: scm.User{
+			ID:     src.Actor.UUID,
 			Login:  src.Actor.Username,
 			Name:   src.Actor.DisplayName,
 			Avatar: src.Actor.Links.Avatar.Href,

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@`
`56`	`56`	`}`
`57`	`57`	`],`
`58`	`58`	`"Sender": {`
	`59`	`+ "ID": "{87bb15eb-47c1-49b3-9f16-ca824a2979a4}",`
`59`	`60`	`"Login": "brydzewski",`
`60`	`61`	`"Name": "Brad Rydzewski",`
`61`	`62`	`"Email": "",`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@`
`74`	`74`	`}`
`75`	`75`	`],`
`76`	`76`	`"Sender": {`
	`77`	`+ "ID": "{87bb15eb-47c1-49b3-9f16-ca824a2979a4}",`
`77`	`78`	`"Login": "brydzewski",`
`78`	`79`	`"Name": "Brad Rydzewski",`
`79`	`80`	`"Email": "",`