Merge pull request #264 from drone/abhinav/CODE-727

drone · Aug 31, 2023 · e2d6b14 · e2d6b14
2 parents 8764ac0 + 13e99fa
commit e2d6b14
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
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
@@ -18,8 +18,8 @@
     "Body": "",
     "Sha": "f74f3d2a88d1b7cb19ff3bf069aa423763d341ef",
     "Ref": "",
-    "Source": "13",
-    "Target": "13",
+    "Source": "b",
+    "Target": "main",
     "Fork": "fork",
     "Link": "http://localhost:3000/git/kmpySmUISimoRrJL6NL73w/myOrg/myProject/aba.git",
     "Closed": false,

diff --git a/scm/driver/harness/testdata/webhooks/pull_request_opened.json.golden b/scm/driver/harness/testdata/webhooks/pull_request_opened.json.golden
@@ -18,8 +18,8 @@
     "Body": "",
     "Sha": "d74b1ebfe520ac01b209dd9085f005884cc9f4cd",
     "Ref": "",
-    "Source": "13",
-    "Target": "13",
+    "Source": "b",
+    "Target": "main",
     "Fork": "fork",
     "Link": "http://localhost:3000/git/kmpySmUISimoRrJL6NL73w/myOrg/myProject/aba.git",
     "Closed": false,

diff --git a/scm/driver/harness/testdata/webhooks/pull_request_reopened.json.golden b/scm/driver/harness/testdata/webhooks/pull_request_reopened.json.golden
@@ -18,8 +18,8 @@
     "Body": "",
     "Sha": "f74f3d2a88d1b7cb19ff3bf069aa423763d341ef",
     "Ref": "",
-    "Source": "13",
-    "Target": "13",
+    "Source": "b",
+    "Target": "main",
     "Fork": "fork",
     "Link": "http://localhost:3000/git/kmpySmUISimoRrJL6NL73w/myOrg/myProject/aba.git",
     "Closed": false,

diff --git a/scm/driver/harness/webhook.go b/scm/driver/harness/webhook.go
@@ -7,7 +7,6 @@ package harness
 import (
 	"crypto/sha256"
 	"encoding/json"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -192,8 +191,8 @@ func convertPullRequestHook(dst *pullRequestHook) *scm.PullRequestHook {
 			Number: dst.PullReq.Number,
 			Title:  dst.PullReq.Title,
 			Closed: dst.PullReq.State != "open",
-			Source: fmt.Sprintf("%d", dst.PullReq.SourceRepoID),
-			Target: fmt.Sprintf("%d", dst.PullReq.TargetRepoID),
+			Source: dst.PullReq.SourceBranch,
+			Target: dst.PullReq.TargetBranch,
 			Fork:   "fork",
 			Link:   dst.Ref.Repo.GitURL,
 			Sha:    dst.Commit.Sha,