Merge pull request #488 from kmdrn7/fix/missing-user-id

jenkins-x-bot · web-flow · commit 205d0b5d04e4 · 2025-07-31T07:19:57.000+01:00
fix: add missing user id for stash
diff --git a/scm/driver/stash/pr.go b/scm/driver/stash/pr.go
@@ -428,6 +428,7 @@ func convertPullRequest(from *pullRequest) *scm.PullRequest {
 		Created:   time.Unix(from.CreatedDate/1000, 0),
 		Updated:   time.Unix(from.UpdatedDate/1000, 0),
 		Author: scm.User{
+			ID:     from.Author.User.ID,
 			Login:  from.Author.User.Slug,
 			Name:   from.Author.User.DisplayName,
 			Email:  from.Author.User.EmailAddress,
diff --git a/scm/driver/stash/testdata/commit.json.golden b/scm/driver/stash/testdata/commit.json.golden
@@ -2,13 +2,15 @@
     "Sha": "131cb13f4aed12e725177bc4b7c28db67839bf9f",
     "Message": "update files",
     "Author": {
+        "ID": 1,
         "Name": "Jane Citizen",
         "Email": "jane@example.com",
         "Date": "2018-07-04T09:01:42-07:00",
         "Login": "jcitizen",
         "Avatar": "https://www.gravatar.com/avatar/9e26471d35a78862c17e467d87cddedf.jpg"
     },
     "Committer": {
+        "ID": 1,
         "Name": "Jane Citizen",
         "Email": "jane@example.com",
         "Date": "2018-07-04T09:01:42-07:00",
diff --git a/scm/driver/stash/testdata/pr.json.golden b/scm/driver/stash/testdata/pr.json.golden
@@ -42,13 +42,15 @@
   "Closed": false,
   "Merged": false,
   "Author": {
+    "ID": 1,
     "Login": "jcitizen",
     "Name": "Jane Citizen",
     "Email": "jane@example.com",
     "Avatar": "https://www.gravatar.com/avatar/9e26471d35a78862c17e467d87cddedf.jpg"
   },
   "Reviewers": [
     {
+      "ID": 115026,
       "Login": "tom",
       "Name": "Tom",
       "Email": "tom@example.com",
diff --git a/scm/driver/stash/testdata/prs.json.golden b/scm/driver/stash/testdata/prs.json.golden
@@ -43,6 +43,7 @@
     "Merged": false,
     "State": "open",
     "Author": {
+      "ID": 1,
       "Login": "jcitizen",
       "Name": "Jane Citizen",
       "Email": "jane@example.com",
diff --git a/scm/driver/stash/testdata/user.json.golden b/scm/driver/stash/testdata/user.json.golden
@@ -1,4 +1,5 @@
 {
+    "ID": 1,
     "Login": "jcitizen",
     "Name": "Jane Citizen",
     "Email": "jane@example.com",
diff --git a/scm/driver/stash/testdata/webhooks/pr_approved.json.golden b/scm/driver/stash/testdata/webhooks/pr_approved.json.golden
@@ -64,13 +64,15 @@
       }
     },
     "Author": {
+      "ID": 1,
       "Login": "admin",
       "Name": "Administrator",
       "Email": "admin@example.com",
       "Avatar": "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61.jpg"
     },
     "Reviewers": [
       {
+        "ID": 2,
         "Login": "user",
         "Name": "User",
         "Email": "user@example.com",
@@ -83,6 +85,7 @@
   "Review": {
     "State": "APPROVED",
     "Author": {
+      "ID": 2,
       "Login": "user",
       "Name": "User",
       "Email": "user@example.com",
diff --git a/scm/driver/stash/testdata/webhooks/pr_comment.json.golden b/scm/driver/stash/testdata/webhooks/pr_comment.json.golden
@@ -67,6 +67,7 @@
     "State": "open",
     "MergeSha": "",
     "Author": {
+      "ID": 1,
       "Login": "admin",
       "Name": "Administrator",
       "Email": "admin@example.com",
@@ -83,6 +84,7 @@
     "ID": 62,
     "Body": "I am a PR comment",
     "Author": {
+      "ID": 1,
       "Login": "admin",
       "Name": "Administrator",
       "Email": "admin@example.com",
@@ -96,6 +98,7 @@
     "Updated": "2017-09-19T02:21:06+01:00"
   },
   "Sender": {
+    "ID": 1,
     "Login": "admin",
     "Name": "Administrator",
     "Email": "admin@example.com",
diff --git a/scm/driver/stash/testdata/webhooks/pr_declined.json.golden b/scm/driver/stash/testdata/webhooks/pr_declined.json.golden
@@ -64,6 +64,7 @@
       }
     },
     "Author": {
+      "ID": 1,
       "Login": "jcitizen",
       "Name": "Jane Citizen",
       "Email": "jane@example.com",
@@ -73,6 +74,7 @@
     "Updated": "2018-07-05T12:30:48-07:00"
   },
   "Sender": {
+    "ID": 1,
     "Login": "jcitizen",
     "Name": "Jane Citizen",
     "Email": "jane@example.com",
diff --git a/scm/driver/stash/testdata/webhooks/pr_deleted.json b/scm/driver/stash/testdata/webhooks/pr_deleted.json
@@ -4,7 +4,7 @@
     "actor": {
         "name": "jcitizen",
         "emailAddress": "jane@example.com",
-        "id": 1,
+        "id": 0,
         "displayName": "Jane Citizen",
         "active": true,
         "slug": "jcitizen",
@@ -70,7 +70,7 @@
             "user": {
                 "name": "jcitizen",
                 "emailAddress": "jane@example.com",
-                "id": 1,
+                "id": 0,
                 "displayName": "Jane Citizen",
                 "active": true,
                 "slug": "jcitizen",
diff --git a/scm/driver/stash/testdata/webhooks/pr_merged.json.golden b/scm/driver/stash/testdata/webhooks/pr_merged.json.golden
@@ -64,6 +64,7 @@
       }
     },
     "Author": {
+      "ID": 1,
       "Login": "jcitizen",
       "Name": "Jane Citizen",
       "Email": "jane@example.com",
@@ -73,6 +74,7 @@
     "Updated": "2018-07-05T12:33:20-07:00"
   },
   "Sender": {
+    "ID": 1,
     "Login": "jcitizen",
     "Name": "Jane Citizen",
     "Email": "jane@example.com",
diff --git a/scm/driver/stash/testdata/webhooks/pr_modified.json.golden b/scm/driver/stash/testdata/webhooks/pr_modified.json.golden
@@ -64,6 +64,7 @@
       }
     },
     "Author": {
+      "ID": 110653,
       "Login": "admin",
       "Name": "Administrator",
       "Email": "example@atlassian.com",
@@ -73,6 +74,7 @@
     "Updated": "2018-04-23T20:15:30-04:00"
   },
   "Sender": {
+    "ID": 110653,
     "Login": "pathompson",
     "Name": "Administrator",
     "Email": "example@atlassian.com",
diff --git a/scm/driver/stash/testdata/webhooks/pr_needs_work.json.golden b/scm/driver/stash/testdata/webhooks/pr_needs_work.json.golden
@@ -64,13 +64,15 @@
       }
     },
     "Author": {
+      "ID": 1,
       "Login": "admin",
       "Name": "Administrator",
       "Email": "admin@example.com",
       "Avatar": "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61.jpg"
     },
     "Reviewers": [
       {
+        "ID": 2,
         "Login": "user",
         "Name": "User",
         "Email": "user@example.com",
@@ -83,6 +85,7 @@
   "Review": {
     "State": "CHANGES_REQUESTED",
     "Author": {
+      "ID": 2,
       "Login": "user",
       "Name": "User",
       "Email": "user@example.com",
diff --git a/scm/driver/stash/testdata/webhooks/pr_open.json.golden b/scm/driver/stash/testdata/webhooks/pr_open.json.golden
@@ -64,6 +64,7 @@
       }
     },
     "Author": {
+      "ID": 1,
       "Login": "jcitizen",
       "Name": "Jane Citizen",
       "Email": "jane@example.com",
@@ -73,6 +74,7 @@
     "Updated": "2018-07-05T12:21:30-07:00"
   },
   "Sender": {
+    "ID": 1,
     "Login": "jcitizen",
     "Name": "Jane Citizen",
     "Email": "jane@example.com",
diff --git a/scm/driver/stash/testdata/webhooks/pr_ref_updated.json.golden b/scm/driver/stash/testdata/webhooks/pr_ref_updated.json.golden
@@ -64,6 +64,7 @@
       }
     },
     "Author": {
+      "ID": 1,
       "Login": "jcitizen",
       "Name": "Jane Citizen",
       "Email": "jane@example.com",
@@ -73,6 +74,7 @@
     "Updated": "2018-07-05T12:21:30-07:00"
   },
   "Sender": {
+    "ID": 1,
     "Login": "jcitizen",
     "Name": "Jane Citizen",
     "Email": "jane@example.com",
diff --git a/scm/driver/stash/testdata/webhooks/pr_unapproved.json.golden b/scm/driver/stash/testdata/webhooks/pr_unapproved.json.golden
@@ -64,13 +64,15 @@
       }
     },
     "Author": {
+      "ID": 1,
       "Login": "admin",
       "Name": "Administrator",
       "Email": "admin@example.com",
       "Avatar": "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61.jpg"
     },
     "Reviewers": [
       {
+        "ID": 2,
         "Login": "user",
         "Name": "User",
         "Email": "user@example.com",
@@ -83,6 +85,7 @@
   "Review": {
     "State": "DISMISSED",
     "Author": {
+      "ID": 2,
       "Login": "user",
       "Name": "User",
       "Email": "user@example.com",
diff --git a/scm/driver/stash/testdata/webhooks/push.json.golden b/scm/driver/stash/testdata/webhooks/push.json.golden
@@ -19,13 +19,15 @@
         "Sha": "823b2230a56056231c9425d63758fa87078a66b4",
         "Message": "",
         "Author": {
+            "ID": 1,
             "Name": "Jane Citizen",
             "Email": "jane@example.com",
             "Date": "2018-07-05T18:22:00Z",
             "Login": "jcitizen",
             "Avatar": "https://www.gravatar.com/avatar/9e26471d35a78862c17e467d87cddedf.jpg"
         },
         "Committer": {
+            "ID": 1,
             "Name": "Jane Citizen",
             "Email": "jane@example.com",
             "Date": "2018-07-05T18:22:00Z",
@@ -35,6 +37,7 @@
         "Link": ""
     },
     "Sender": {
+        "ID": 1,
         "Login": "jcitizen",
         "Name": "Jane Citizen",
         "Email": "jane@example.com",
diff --git a/scm/driver/stash/testdata/webhooks/push_branch_create.json.golden b/scm/driver/stash/testdata/webhooks/push_branch_create.json.golden
@@ -19,13 +19,15 @@
         "Sha": "208b0a5c05eddadad01f2aed8802fe0c3b3eaf5e",
         "Message": "",
         "Author": {
+            "ID": 1,
             "Name": "Jane Citizen",
             "Email": "jane@example.com",
             "Date": "2018-07-05T18:24:15Z",
             "Login": "jcitizen",
             "Avatar": "https://www.gravatar.com/avatar/9e26471d35a78862c17e467d87cddedf.jpg"
         },
         "Committer": {
+            "ID": 1,
             "Name": "Jane Citizen",
             "Email": "jane@example.com",
             "Date": "2018-07-05T18:24:15Z",
@@ -35,6 +37,7 @@
         "Link": ""
     },
     "Sender": {
+        "ID": 1,
         "Login": "jcitizen",
         "Name": "Jane Citizen",
         "Email": "jane@example.com",
diff --git a/scm/driver/stash/testdata/webhooks/push_branch_delete.json.golden b/scm/driver/stash/testdata/webhooks/push_branch_delete.json.golden
@@ -19,6 +19,7 @@
     },
     "Action": "deleted",
     "Sender": {
+        "ID": 1,
         "Login": "jcitizen",
         "Name": "Jane Citizen",
         "Email": "jane@example.com",
diff --git a/scm/driver/stash/testdata/webhooks/push_tag_create.json.golden b/scm/driver/stash/testdata/webhooks/push_tag_create.json.golden
@@ -19,6 +19,7 @@
     },
     "Action": "created",
     "Sender": {
+        "ID": 1,
         "Login": "jcitizen",
         "Name": "Jane Citizen",
         "Email": "jane@example.com",
diff --git a/scm/driver/stash/testdata/webhooks/push_tag_delete.json.golden b/scm/driver/stash/testdata/webhooks/push_tag_delete.json.golden
@@ -19,6 +19,7 @@
     },
     "Action": "deleted",
     "Sender": {
+        "ID": 1,
         "Login": "jcitizen",
         "Name": "Jane Citizen",
         "Email": "jane@example.com",
diff --git a/scm/driver/stash/user.go b/scm/driver/stash/user.go
@@ -86,6 +86,7 @@ func convertUser(from *user) *scm.User {
 		return nil
 	}
 	return &scm.User{
+		ID:     from.ID,
 		Avatar: avatarLink(from.EmailAddress),
 		Login:  from.Slug,
 		Name:   from.DisplayName,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "ID": 1,`
`2`	`3`	`"Login": "jcitizen",`
`3`	`4`	`"Name": "Jane Citizen",`
`4`	`5`	`"Email": "[email protected]",`