feat: add pr link as coming from new webhook (#290)

drone · Dec 20, 2023 · 93042b7 · 93042b7
1 parent 2877ffa
commit 93042b7
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 13 deletions.
diff --git a/scm/driver/harness/testdata/webhooks/pull_request_branch_updated.json b/scm/driver/harness/testdata/webhooks/pull_request_branch_updated.json
@@ -34,7 +34,8 @@
             "type": "user",
             "created": 1675390885380,
             "updated": 1675390885380
-        }
+        },
+        "pr_url": "http://localhost:3000/codeowners/asdsad/pulls/14"
     },
     "target_ref": {
         "name": "refs/heads/main",

diff --git a/scm/driver/harness/testdata/webhooks/pull_request_branch_updated.json.golden b/scm/driver/harness/testdata/webhooks/pull_request_branch_updated.json.golden
@@ -21,7 +21,7 @@
     "Source": "b",
     "Target": "main",
     "Fork": "fork",
-    "Link": "http://localhost:3000/git/kmpySmUISimoRrJL6NL73w/myOrg/myProject/aba.git",
+    "Link": "http://localhost:3000/codeowners/asdsad/pulls/14",
     "Closed": false,
     "Merged": false,
     "Author": {

diff --git a/scm/driver/harness/testdata/webhooks/pull_request_closed.json b/scm/driver/harness/testdata/webhooks/pull_request_closed.json
@@ -33,7 +33,8 @@
       "type": "user",
       "created": 1696332021613,
       "updated": 1696332021613
-    }
+    },
+    "pr_url": "http://localhost:3000/codeowners/asdsad/pulls/14"
   },
   "target_ref": {
     "name": "refs/heads/main",

diff --git a/scm/driver/harness/testdata/webhooks/pull_request_closed.json.golden b/scm/driver/harness/testdata/webhooks/pull_request_closed.json.golden
@@ -21,7 +21,7 @@
     "Source": "asdxsa",
     "Target": "main",
     "Fork": "fork",
-    "Link": "http://localhost:3000/git/codeowners/asdsad.git",
+    "Link": "http://localhost:3000/codeowners/asdsad/pulls/14",
     "Closed": true,
     "Merged": false,
     "Author": {

diff --git a/scm/driver/harness/testdata/webhooks/pull_request_comment_created.json b/scm/driver/harness/testdata/webhooks/pull_request_comment_created.json
@@ -34,7 +34,8 @@
       "type": "user",
       "created": 1675390885380,
       "updated": 1675390885380
-    }
+    },
+    "pr_url": "http://localhost:3000/codeowners/asdsad/pulls/14"
   },
   "target_ref": {
     "name": "refs/heads/main",

diff --git a/scm/driver/harness/testdata/webhooks/pull_request_comment_created.json.golden b/scm/driver/harness/testdata/webhooks/pull_request_comment_created.json.golden
@@ -20,7 +20,7 @@
     "Source": "pr2",
     "Target": "main",
     "Fork": "fork",
-    "Link": "http://localhost:3000/git/asd/demo.git",
+    "Link": "http://localhost:3000/codeowners/asdsad/pulls/14",
     "Closed": false,
     "Merged": false,
     "Author": {

diff --git a/scm/driver/harness/testdata/webhooks/pull_request_merged.json b/scm/driver/harness/testdata/webhooks/pull_request_merged.json
@@ -34,7 +34,8 @@
       "type": "user",
       "created": 1696332021613,
       "updated": 1696332021613
-    }
+    },
+    "pr_url": "http://localhost:3000/codeowners/asdsad/pulls/14"
   },
   "target_ref": {
     "name": "refs/heads/main",

diff --git a/scm/driver/harness/testdata/webhooks/pull_request_merged.json.golden b/scm/driver/harness/testdata/webhooks/pull_request_merged.json.golden
@@ -21,7 +21,7 @@
     "Source": "xas",
     "Target": "main",
     "Fork": "fork",
-    "Link": "http://localhost:3000/git/codeowners/asdsad.git",
+    "Link": "http://localhost:3000/codeowners/asdsad/pulls/14",
     "Closed": true,
     "Merged": true,
     "Author": {

diff --git a/scm/driver/harness/testdata/webhooks/pull_request_opened.json b/scm/driver/harness/testdata/webhooks/pull_request_opened.json
@@ -34,7 +34,8 @@
         "type": "user",
         "created": 1675390885380,
         "updated": 1675390885380
-      }
+      },
+    "pr_url": "http://localhost:3000/codeowners/asdsad/pulls/14"
   },
   "target_ref": {
       "name": "refs/heads/main",

diff --git a/scm/driver/harness/testdata/webhooks/pull_request_opened.json.golden b/scm/driver/harness/testdata/webhooks/pull_request_opened.json.golden
@@ -21,7 +21,7 @@
     "Source": "b",
     "Target": "main",
     "Fork": "fork",
-    "Link": "http://localhost:3000/git/kmpySmUISimoRrJL6NL73w/myOrg/myProject/aba.git",
+    "Link": "http://localhost:3000/codeowners/asdsad/pulls/14",
     "Closed": false,
     "Merged": false,
     "Author": {

diff --git a/scm/driver/harness/testdata/webhooks/pull_request_reopened.json b/scm/driver/harness/testdata/webhooks/pull_request_reopened.json
@@ -34,7 +34,8 @@
       "type": "user",
       "created": 1675390885380,
       "updated": 1675390885380
-    }
+    },
+    "pr_url": "http://localhost:3000/codeowners/asdsad/pulls/14"
   },
   "target_ref": {
     "name": "refs/heads/main",

diff --git a/scm/driver/harness/testdata/webhooks/pull_request_reopened.json.golden b/scm/driver/harness/testdata/webhooks/pull_request_reopened.json.golden
@@ -21,7 +21,7 @@
     "Source": "b",
     "Target": "main",
     "Fork": "fork",
-    "Link": "http://localhost:3000/git/kmpySmUISimoRrJL6NL73w/myOrg/myProject/aba.git",
+    "Link": "http://localhost:3000/codeowners/asdsad/pulls/14",
     "Closed": false,
     "Merged": false,
     "Author": {

diff --git a/scm/driver/harness/webhook.go b/scm/driver/harness/webhook.go
@@ -128,6 +128,7 @@ type (
 		TargetBranch  string      `json:"target_branch"`
 		MergeStrategy interface{} `json:"merge_strategy"`
 		Author        principal   `json:"author"`
+		PrURL         string      `json:"pr_url"`
 	}
 	targetRef struct {
 		Name string `json:"name"`
@@ -277,7 +278,7 @@ func convertPullReq(pr pullReq, ref ref, commit hookCommit) scm.PullRequest {
 		Target: pr.TargetBranch,
 		Merged: pr.State == "merged",
 		Fork:   "fork",
-		Link:   ref.Repo.GitURL,
+		Link:   pr.PrURL,
 		Sha:    commit.Sha,
 		Ref:    ref.Name,
 		Author: convertUser(pr.Author),