From 88aeebe06a4bfe7179debfceddfefb5cae7c9a4a Mon Sep 17 00:00:00 2001 From: Abhinav Singh Date: Mon, 9 Oct 2023 14:27:39 -0700 Subject: [PATCH 1/5] fix: ref should have pullreq instead of pull for gitness --- scm/driver/harness/pr.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/driver/harness/pr.go b/scm/driver/harness/pr.go index 6e0266a0d..9b5e05724 100644 --- a/scm/driver/harness/pr.go +++ b/scm/driver/harness/pr.go @@ -182,7 +182,7 @@ func convertPullRequest(src *pr) *scm.PullRequest { Email: src.Author.Email, }, Fork: "fork", - Ref: fmt.Sprintf("refs/pull/%d/head", src.Number), + Ref: fmt.Sprintf("refs/pullreq/%d/head", src.Number), Closed: src.State == "closed", } } From fd890b41d6ebb2537b48febb3644b6230afa8f13 Mon Sep 17 00:00:00 2001 From: Abhinav Singh Date: Mon, 9 Oct 2023 14:34:46 -0700 Subject: [PATCH 2/5] fix test --- scm/driver/harness/testdata/pr.json.golden | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/driver/harness/testdata/pr.json.golden b/scm/driver/harness/testdata/pr.json.golden index 224b66050..5c4a83864 100644 --- a/scm/driver/harness/testdata/pr.json.golden +++ b/scm/driver/harness/testdata/pr.json.golden @@ -3,7 +3,7 @@ "Title": "pull title", "Body": "pull description", "Sha": "", - "Ref": "refs/pull/1/head", + "Ref": "refs/pullreq/1/head", "Source": "bla", "Target": "main", "Fork": "fork", From be2b4a6bf302fcf04ba6426e4bd6227f36a44c1a Mon Sep 17 00:00:00 2001 From: Abhinav Singh Date: Wed, 11 Oct 2023 00:22:28 -0700 Subject: [PATCH 3/5] feat: add more parse data in harness webhook parsiing --- scm/driver/harness/webhook.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scm/driver/harness/webhook.go b/scm/driver/harness/webhook.go index 1aa2d45fb..ba6613809 100644 --- a/scm/driver/harness/webhook.go +++ b/scm/driver/harness/webhook.go @@ -196,6 +196,11 @@ func convertPullRequestHook(dst *pullRequestHook) *scm.PullRequestHook { Fork: "fork", Link: dst.Ref.Repo.GitURL, Sha: dst.Commit.Sha, + Ref: dst.Ref.Name, + Author: scm.User{ + Name: dst.Commit.Committer.Identity.Name, + Email: dst.Commit.Committer.Identity.Email, + }, }, Repo: scm.Repository{ ID: dst.Repo.UID, From a2e57a59f1d5baf39d842eb0df1d666d5de1894e Mon Sep 17 00:00:00 2001 From: Abhinav Singh Date: Wed, 11 Oct 2023 01:43:30 -0700 Subject: [PATCH 4/5] feat: add more parse data in harness webhook parsiing --- scm/driver/harness/webhook.go | 1 + 1 file changed, 1 insertion(+) diff --git a/scm/driver/harness/webhook.go b/scm/driver/harness/webhook.go index ba6613809..cc077a6ca 100644 --- a/scm/driver/harness/webhook.go +++ b/scm/driver/harness/webhook.go @@ -206,6 +206,7 @@ func convertPullRequestHook(dst *pullRequestHook) *scm.PullRequestHook { ID: dst.Repo.UID, Branch: dst.Repo.DefaultBranch, Link: dst.Repo.GitURL, + Clone: dst.Repo.GitURL, }, Sender: scm.User{ Email: dst.Principal.Email, From 9ac99d90f19886b6d2d575193156656ec58466e9 Mon Sep 17 00:00:00 2001 From: Abhinav Singh Date: Wed, 11 Oct 2023 03:37:28 -0700 Subject: [PATCH 5/5] fix tests --- .../webhooks/pull_request_branch_updated.json.golden | 8 ++++---- .../testdata/webhooks/pull_request_opened.json.golden | 8 ++++---- .../testdata/webhooks/pull_request_reopened.json.golden | 8 ++++---- 3 files changed, 12 insertions(+), 12 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 index 9a768dde2..6be31bb70 100644 --- a/scm/driver/harness/testdata/webhooks/pull_request_branch_updated.json.golden +++ b/scm/driver/harness/testdata/webhooks/pull_request_branch_updated.json.golden @@ -6,7 +6,7 @@ "Name": "", "Branch": "main", "Private": false, - "Clone": "", + "Clone": "http://localhost:3000/git/kmpySmUISimoRrJL6NL73w/myOrg/myProject/aba.git", "CloneSSH": "", "Link": "http://localhost:3000/git/kmpySmUISimoRrJL6NL73w/myOrg/myProject/aba.git", "Created": "0001-01-01T00:00:00Z", @@ -17,7 +17,7 @@ "Title": "aw", "Body": "", "Sha": "f74f3d2a88d1b7cb19ff3bf069aa423763d341ef", - "Ref": "", + "Ref": "refs/heads/b", "Source": "b", "Target": "main", "Fork": "fork", @@ -26,8 +26,8 @@ "Merged": false, "Author": { "Login": "", - "Name": "", - "Email": "", + "Name": "Admin", + "Email": "admin@harness.io", "Avatar": "" }, "Created": "0001-01-01T00:00:00Z", diff --git a/scm/driver/harness/testdata/webhooks/pull_request_opened.json.golden b/scm/driver/harness/testdata/webhooks/pull_request_opened.json.golden index e45f24bc5..2928bf6a1 100644 --- a/scm/driver/harness/testdata/webhooks/pull_request_opened.json.golden +++ b/scm/driver/harness/testdata/webhooks/pull_request_opened.json.golden @@ -6,7 +6,7 @@ "Name": "", "Branch": "main", "Private": false, - "Clone": "", + "Clone": "http://localhost:3000/git/kmpySmUISimoRrJL6NL73w/myOrg/myProject/aba.git", "CloneSSH": "", "Link": "http://localhost:3000/git/kmpySmUISimoRrJL6NL73w/myOrg/myProject/aba.git", "Created": "0001-01-01T00:00:00Z", @@ -17,7 +17,7 @@ "Title": "aw", "Body": "", "Sha": "d74b1ebfe520ac01b209dd9085f005884cc9f4cd", - "Ref": "", + "Ref": "refs/heads/b", "Source": "b", "Target": "main", "Fork": "fork", @@ -26,8 +26,8 @@ "Merged": false, "Author": { "Login": "", - "Name": "", - "Email": "", + "Name": "Admin", + "Email": "admin@harness.io", "Avatar": "" }, "Created": "0001-01-01T00:00:00Z", diff --git a/scm/driver/harness/testdata/webhooks/pull_request_reopened.json.golden b/scm/driver/harness/testdata/webhooks/pull_request_reopened.json.golden index bbea80558..03f8b54df 100644 --- a/scm/driver/harness/testdata/webhooks/pull_request_reopened.json.golden +++ b/scm/driver/harness/testdata/webhooks/pull_request_reopened.json.golden @@ -6,7 +6,7 @@ "Name": "", "Branch": "main", "Private": false, - "Clone": "", + "Clone": "http://localhost:3000/git/kmpySmUISimoRrJL6NL73w/myOrg/myProject/aba.git", "CloneSSH": "", "Link": "http://localhost:3000/git/kmpySmUISimoRrJL6NL73w/myOrg/myProject/aba.git", "Created": "0001-01-01T00:00:00Z", @@ -17,7 +17,7 @@ "Title": "aw", "Body": "", "Sha": "f74f3d2a88d1b7cb19ff3bf069aa423763d341ef", - "Ref": "", + "Ref": "refs/heads/b", "Source": "b", "Target": "main", "Fork": "fork", @@ -26,8 +26,8 @@ "Merged": false, "Author": { "Login": "", - "Name": "", - "Email": "", + "Name": "Admin", + "Email": "admin@harness.io", "Avatar": "" }, "Created": "0001-01-01T00:00:00Z",