Merge branch 'main' of github.com:terramate-io/terramate into i4k-sen…

…d-reviewers-id Signed-off-by: i4k <[email protected]>
terramate-io · Dec 20, 2024 · 7e5a8cd · 7e5a8cd
2 parents 7543a08 + 218cc71
commit 7e5a8cd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/cmd/terramate/cli/cloud.go b/cmd/terramate/cli/cloud.go
@@ -1057,6 +1057,7 @@ func (c *cli) newBitbucketReviewRequest(pr *bitbucket.PR) *cloud.ReviewRequest {
 			uniqueReviewers[participant.User.DisplayName] = cloud.Reviewer{
 				Login:     participant.User.DisplayName,
 				AvatarURL: participant.User.Links.Avatar.Href,
+				ID:        participant.User.UUID,
 			}
 		}
 

diff --git a/e2etests/cloud/run_cloud_sync_preview_test.go b/e2etests/cloud/run_cloud_sync_preview_test.go
@@ -157,6 +157,7 @@ func TestCLIRunWithCloudSyncPreview(t *testing.T) {
 						UpdatedAt:   updatedAt,
 						PushedAt:    &pushedAt,
 						Author: cloud.Author{
+							ID:        "1",
 							Login:     "octocat",
 							AvatarURL: "https://github.com/images/error/octocat_happy.gif",
 						},
@@ -254,6 +255,7 @@ func TestCLIRunWithCloudSyncPreview(t *testing.T) {
 						UpdatedAt:   updatedAt,
 						PushedAt:    &pushedAt,
 						Author: cloud.Author{
+							ID:        "1",
 							Login:     "octocat",
 							AvatarURL: "https://github.com/images/error/octocat_happy.gif",
 						},
@@ -316,13 +318,17 @@ func TestCLIRunWithCloudSyncPreview(t *testing.T) {
 						Description: "Please pull these awesome changes in!",
 						URL:         "https://github.com/octocat/Hello-World/pull/1347",
 						Labels:      []cloud.Label{{Name: "bug", Color: "f29513", Description: "Something isn't working"}},
-						Author:      cloud.Author{Login: "octocat", AvatarURL: "https://github.com/images/error/octocat_happy.gif"},
-						Status:      "open",
-						CreatedAt:   createdAt,
-						UpdatedAt:   updatedAt,
-						PushedAt:    &pushedAt,
-						Branch:      "new-topic",
-						BaseBranch:  "master",
+						Author: cloud.Author{
+							ID:        "1",
+							Login:     "octocat",
+							AvatarURL: "https://github.com/images/error/octocat_happy.gif",
+						},
+						Status:     "open",
+						CreatedAt:  createdAt,
+						UpdatedAt:  updatedAt,
+						PushedAt:   &pushedAt,
+						Branch:     "new-topic",
+						BaseBranch: "master",
 					},
 					StackPreviews: []*cloudstore.StackPreview{
 						{

diff --git a/e2etests/cloud/run_script_cloud_preview_test.go b/e2etests/cloud/run_script_cloud_preview_test.go
@@ -189,6 +189,7 @@ func TestScriptRunWithCloudSyncPreview(t *testing.T) {
 						UpdatedAt:   updatedAt,
 						PushedAt:    &pushedAt,
 						Author: cloud.Author{
+							ID:        "1",
 							Login:     "octocat",
 							AvatarURL: "https://github.com/images/error/octocat_happy.gif",
 						},
@@ -295,6 +296,7 @@ func TestScriptRunWithCloudSyncPreview(t *testing.T) {
 						UpdatedAt:   updatedAt,
 						PushedAt:    &pushedAt,
 						Author: cloud.Author{
+							ID:        "1",
 							Login:     "octocat",
 							AvatarURL: "https://github.com/images/error/octocat_happy.gif",
 						},