Merge remote-tracking branch 'origin'

drone · Sep 2, 2020 · ac3585a · ac3585a
2 parents 802e265 + effdff0
commit ac3585a
Show file tree

Hide file tree

Showing 34 changed files with 352 additions and 17 deletions.
diff --git a/go.sum b/go.sum
@@ -1,4 +1,5 @@
 github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/h2non/gock v1.0.9 h1:17gCehSo8ZOgEsFKpQgqHiR7VLyjxdAG3lkhVvO9QZU=
 github.com/h2non/gock v1.0.9/go.mod h1:CZMcB0Lg5IWnr9bF79pPMg9WeV6WumxQiUJ1UvdO1iE=
diff --git a/scm/driver/bitbucket/pr.go b/scm/driver/bitbucket/pr.go
@@ -145,6 +145,7 @@ func convertPullRequest(from *pr) *scm.PullRequest {
 		Target: from.Destination.Branch.Name,
 		Fork:   from.Source.Repository.FullName,
 		Link:   from.Links.HTML.Href,
+		Diff:   from.Links.Diff.Href,
 		Closed: from.State != "OPEN",
 		Merged: from.State == "MERGED",
 		Head: scm.Reference{

diff --git a/scm/driver/bitbucket/testdata/pr.json.golden b/scm/driver/bitbucket/testdata/pr.json.golden
@@ -8,6 +8,7 @@
     "Target": "master",
     "Fork": "lachlanv/atlaskit",
     "Link": "https://bitbucket.org/atlassian/atlaskit/pull-requests/4982",
+    "Diff": "https://api.bitbucket.org/2.0/repositories/atlassian/atlaskit/diff/lachlanv/atlaskit:31c54529bd80%0D710db794f15b?from_pullrequest_id=4982",
     "Closed": false,
     "Merged": false,
     "Base": {

diff --git a/scm/driver/bitbucket/testdata/prs.json.golden b/scm/driver/bitbucket/testdata/prs.json.golden
@@ -9,6 +9,7 @@
     "Target": "master",
     "Fork": "lachlanv/atlaskit",
     "Link": "https://bitbucket.org/atlassian/atlaskit/pull-requests/4982",
+    "Diff": "https://api.bitbucket.org/2.0/repositories/atlassian/atlaskit/diff/lachlanv/atlaskit:31c54529bd80%0D710db794f15b?from_pullrequest_id=4982",
     "Closed": false,
     "Merged": false,
     "Base": {

diff --git a/scm/driver/bitbucket/testdata/webhooks/push.json.golden b/scm/driver/bitbucket/testdata/webhooks/push.json.golden
@@ -33,6 +33,27 @@
         },
         "Link": "https://bitbucket.org/brydzewski/foo/commits/141977fedf5cf35aa290ac87d4b5177ac4cd9de1"
     },
+    "Commits": [
+        {
+            "Sha": "141977fedf5cf35aa290ac87d4b5177ac4cd9de1",
+            "Message": "Update README\n",
+            "Author": {
+                "Name": "Brad Rydzewski",
+                "Email": "brad.rydzewski@gmail.com",
+                "Date": "2018-07-02T20:26:56Z",
+                "Login": "brydzewski",
+                "Avatar": "https://bitbucket.org/account/brydzewski/avatar/32/"
+            },
+            "Committer": {
+                "Name": "Brad Rydzewski",
+                "Email": "brad.rydzewski@gmail.com",
+                "Date": "2018-07-02T20:26:56Z",
+                "Login": "brydzewski",
+                "Avatar": "https://bitbucket.org/account/brydzewski/avatar/32/"
+            },
+            "Link": "https://bitbucket.org/brydzewski/foo/commits/141977fedf5cf35aa290ac87d4b5177ac4cd9de1"
+        }
+    ],
     "Sender": {
         "Login": "brydzewski",
         "Name": "Brad Rydzewski",

diff --git a/scm/driver/bitbucket/testdata/webhooks/push_branch_create.json.golden b/scm/driver/bitbucket/testdata/webhooks/push_branch_create.json.golden
@@ -32,6 +32,46 @@
         },
         "Link": "https://bitbucket.org/brydzewski/foo/commits/141977fedf5cf35aa290ac87d4b5177ac4cd9de1"
     },
+    "Commits": [
+        {
+            "Sha": "141977fedf5cf35aa290ac87d4b5177ac4cd9de1",
+            "Message": "Update README\n",
+            "Author": {
+                "Name": "Brad Rydzewski",
+                "Email": "brad.rydzewski@gmail.com",
+                "Date": "2018-07-02T20:26:56Z",
+                "Login": "brydzewski",
+                "Avatar": "https://bitbucket.org/account/brydzewski/avatar/32/"
+            },
+            "Committer": {
+                "Name": "Brad Rydzewski",
+                "Email": "brad.rydzewski@gmail.com",
+                "Date": "2018-07-02T20:26:56Z",
+                "Login": "brydzewski",
+                "Avatar": "https://bitbucket.org/account/brydzewski/avatar/32/"
+            },
+            "Link": "https://bitbucket.org/brydzewski/foo/commits/141977fedf5cf35aa290ac87d4b5177ac4cd9de1"
+        },
+        {
+            "Sha": "40e7580cf11311d84a6e5e97e2cbba6df1675750",
+            "Message": "initial commit\n",
+            "Author": {
+                "Name": "Brad Rydzewski",
+                "Email": "brad.rydzewski@gmail.com",
+                "Date": "2018-07-02T20:22:41Z",
+                "Login": "brydzewski",
+                "Avatar": "https://bitbucket.org/account/brydzewski/avatar/32/"
+            },
+            "Committer": {
+                "Name": "Brad Rydzewski",
+                "Email": "brad.rydzewski@gmail.com",
+                "Date": "2018-07-02T20:22:41Z",
+                "Login": "brydzewski",
+                "Avatar": "https://bitbucket.org/account/brydzewski/avatar/32/"
+            },
+            "Link": "https://bitbucket.org/brydzewski/foo/commits/40e7580cf11311d84a6e5e97e2cbba6df1675750"
+        }
+    ],
     "Sender": {
         "Login": "brydzewski",
         "Name": "Brad Rydzewski",

diff --git a/scm/driver/bitbucket/webhook.go b/scm/driver/bitbucket/webhook.go
@@ -389,6 +389,29 @@ type (
 
 func convertPushHook(src *pushHook) *scm.PushHook {
 	change := src.Push.Changes[0]
+	var commits []scm.Commit
+	for _, c := range change.Commits {
+		commits = append(commits,
+			scm.Commit{
+				Sha:     c.Hash,
+				Message: c.Message,
+				Link:    c.Links.HTML.Href,
+				Author: scm.Signature{
+					Login:  c.Author.User.Username,
+					Email:  extractEmail(c.Author.Raw),
+					Name:   c.Author.User.DisplayName,
+					Avatar: c.Author.User.Links.Avatar.Href,
+					Date:   c.Date,
+				},
+				Committer: scm.Signature{
+					Login:  c.Author.User.Username,
+					Email:  extractEmail(c.Author.Raw),
+					Name:   c.Author.User.DisplayName,
+					Avatar: c.Author.User.Links.Avatar.Href,
+					Date:   c.Date,
+				},
+			})
+	}
 	namespace, name := scm.Split(src.Repository.FullName)
 	dst := &scm.PushHook{
 		Ref:    scm.ExpandRef(change.New.Name, "refs/heads/"),
@@ -426,6 +449,7 @@ func convertPushHook(src *pushHook) *scm.PushHook {
 			Name:   src.Actor.DisplayName,
 			Avatar: src.Actor.Links.Avatar.Href,
 		},
+		Commits: commits,
 	}
 	if change.New.Type == "tag" {
 		dst.Ref = scm.ExpandRef(change.New.Name, "refs/tags/")

diff --git a/scm/driver/gitea/pr.go b/scm/driver/gitea/pr.go
@@ -91,6 +91,7 @@ type pr struct {
 	BaseRepo   repository `json:"base_repo"`
 	Base       reference  `json:"base"`
 	HTMLURL    string     `json:"html_url"`
+	DiffURL    string     `json:"diff_url"`
 	Mergeable  bool       `json:"mergeable"`
 	Merged     bool       `json:"merged"`
 	Created    time.Time  `json:"created_at"`
@@ -142,6 +143,7 @@ func convertPullRequest(src *pr) *scm.PullRequest {
 		Source:  src.Head.Name,
 		Target:  src.Base.Name,
 		Link:    src.HTMLURL,
+		Diff:    src.DiffURL,
 		Fork:    src.Base.Repo.FullName,
 		Ref:     fmt.Sprintf("refs/pull/%d/head", src.Number),
 		Closed:  src.State == "closed",

diff --git a/scm/driver/gitea/testdata/pr.json.golden b/scm/driver/gitea/testdata/pr.json.golden
@@ -8,6 +8,7 @@
     "Target": "master",
     "Fork": "jcitizen/my-repo",
     "Link": "https://try.gitea.io/jcitizen/my-repo/pulls/1",
+    "Diff": "https://try.gitea.io/jcitizen/my-repo/pulls/1.diff",
     "Closed": false,
     "Merged": false,
     "Author": {

diff --git a/scm/driver/gitea/testdata/prs.json.golden b/scm/driver/gitea/testdata/prs.json.golden
@@ -9,6 +9,7 @@
         "Target": "master",
         "Fork": "jcitizen/my-repo",
         "Link": "https://try.gitea.io/jcitizen/my-repo/pulls/1",
+        "Diff": "https://try.gitea.io/jcitizen/my-repo/pulls/1.diff",
         "Closed": false,
         "Merged": false,
         "Author": {

diff --git a/scm/driver/gitea/testdata/webhooks/push.json.golden b/scm/driver/gitea/testdata/webhooks/push.json.golden
@@ -33,6 +33,27 @@
     },
     "Link": "http://try.gitea.io/gogits/hello-world/compare/9836a96a253cce25d17988fcf41b8c4205cf779f...4522cbcefc20728a5b72b3a86af35e608622c514"
   },
+  "Commits": [
+    {
+      "Sha": "4522cbcefc20728a5b72b3a86af35e608622c514",
+      "Message": "Updated readme\n",
+      "Author": {
+        "Name": "Unknwon",
+        "Email": "noreply@gogs.io",
+        "Date": "2017-12-09T01:35:07Z",
+        "Login": "unknwon",
+        "Avatar": ""
+      },
+      "Committer": {
+        "Name": "Unknwon",
+        "Email": "noreply@gogs.io",
+        "Date": "2017-12-09T01:35:07Z",
+        "Login": "unknwon",
+        "Avatar": ""
+      },
+      "Link": "http://try.gitea.io/gogits/hello-world/commit/4522cbcefc20728a5b72b3a86af35e608622c514"
+    }
+  ],
   "Sender": {
     "Login": "unknwon",
     "Name": "",

diff --git a/scm/driver/gitea/webhook.go b/scm/driver/gitea/webhook.go
@@ -208,6 +208,28 @@ func convertBranchHook(dst *createHook, action scm.Action) *scm.BranchHook {
 
 func convertPushHook(dst *pushHook) *scm.PushHook {
 	if len(dst.Commits) > 0 {
+		var commits []scm.Commit
+		for _, c := range dst.Commits {
+			commits = append(commits,
+				scm.Commit{
+					Sha:     c.ID,
+					Message: c.Message,
+					Link:    c.URL,
+					Author: scm.Signature{
+						Login: c.Author.Username,
+						Email: c.Author.Email,
+						Name:  c.Author.Name,
+						Date:  c.Timestamp,
+					},
+					Committer: scm.Signature{
+						Login: c.Committer.Username,
+						Email: c.Committer.Email,
+						Name:  c.Committer.Name,
+						Date:  c.Timestamp,
+					},
+				})
+		}
+
 		return &scm.PushHook{
 			Ref:    dst.Ref,
 			Before: dst.Before,
@@ -228,8 +250,9 @@ func convertPushHook(dst *pushHook) *scm.PushHook {
 					Date:  dst.Commits[0].Timestamp,
 				},
 			},
-			Repo:   *convertRepository(&dst.Repository),
-			Sender: *convertUser(&dst.Sender),
+			Commits: commits,
+			Repo:    *convertRepository(&dst.Repository),
+			Sender:  *convertUser(&dst.Sender),
 		}
 	} else {
 		return &scm.PushHook{

diff --git a/scm/driver/github/pr.go b/scm/driver/github/pr.go
@@ -70,6 +70,7 @@ type pr struct {
 	Title   string `json:"title"`
 	Body    string `json:"body"`
 	DiffURL string `json:"diff_url"`
+	HTMLURL string `json:"html_url"`
 	User    struct {
 		Login     string `json:"login"`
 		AvatarURL string `json:"avatar_url"`
@@ -143,7 +144,8 @@ func convertPullRequest(from *pr) *scm.PullRequest {
 		Source: from.Head.Ref,
 		Target: from.Base.Ref,
 		Fork:   from.Head.Repo.FullName,
-		Link:   from.DiffURL,
+		Link:   from.HTMLURL,
+		Diff:   from.DiffURL,
 		Closed: from.State != "open",
 		Merged: from.MergedAt.String != "",
 		Head: scm.Reference{

diff --git a/scm/driver/github/testdata/pr.json.golden b/scm/driver/github/testdata/pr.json.golden
@@ -7,7 +7,8 @@
     "Source": "new-topic",
     "Target": "master",
     "Fork": "octocat/Hello-World",
-    "Link": "https://github.com/octocat/Hello-World/pull/1347.diff",
+    "Link": "https://github.com/octocat/Hello-World/pull/1347",
+    "Diff": "https://github.com/octocat/Hello-World/pull/1347.diff",
     "Closed": false,
     "Merged": true,
     "Base": {

diff --git a/scm/driver/github/testdata/pulls.json.golden b/scm/driver/github/testdata/pulls.json.golden
@@ -8,7 +8,8 @@
         "Source": "new-topic",
         "Target": "master",
         "Fork": "octocat/Hello-World",
-        "Link": "https://github.com/octocat/Hello-World/pull/1347.diff",
+        "Link": "https://github.com/octocat/Hello-World/pull/1347",
+        "Diff": "https://github.com/octocat/Hello-World/pull/1347.diff",
         "Closed": false,
         "Merged": true,
         "Base": {

diff --git a/scm/driver/github/testdata/webhooks/pr_closed.json.golden b/scm/driver/github/testdata/webhooks/pr_closed.json.golden
@@ -22,7 +22,8 @@
     "Source": "master",
     "Target": "bradrydzewski-patch-1",
     "Fork": "bradrydzewski/drone-test-go",
-    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
+    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1",
+    "Diff": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
     "Closed": true,
     "Merged": false,
     "Base": {

diff --git a/scm/driver/github/testdata/webhooks/pr_edited.json.golden b/scm/driver/github/testdata/webhooks/pr_edited.json.golden
@@ -22,7 +22,8 @@
     "Source": "master",
     "Target": "bradrydzewski-patch-1",
     "Fork": "bradrydzewski/drone-test-go",
-    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
+    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1",
+    "Diff": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
     "Closed": false,
     "Merged": false,
     "Base": {

diff --git a/scm/driver/github/testdata/webhooks/pr_labeled.json.golden b/scm/driver/github/testdata/webhooks/pr_labeled.json.golden
@@ -22,7 +22,8 @@
     "Source": "master",
     "Target": "bradrydzewski-patch-1",
     "Fork": "bradrydzewski/drone-test-go",
-    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
+    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1",
+    "Diff": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
     "Closed": false,
     "Merged": false,
     "Base": {

diff --git a/scm/driver/github/testdata/webhooks/pr_opened.json.golden b/scm/driver/github/testdata/webhooks/pr_opened.json.golden
@@ -22,7 +22,8 @@
     "Source": "master",
     "Target": "bradrydzewski-patch-1",
     "Fork": "bradrydzewski/drone-test-go",
-    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
+    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1",
+    "Diff": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
     "Closed": false,
     "Merged": false,
     "Base": {

diff --git a/scm/driver/github/testdata/webhooks/pr_reopened.json.golden b/scm/driver/github/testdata/webhooks/pr_reopened.json.golden
@@ -22,7 +22,8 @@
     "Source": "master",
     "Target": "bradrydzewski-patch-1",
     "Fork": "bradrydzewski/drone-test-go",
-    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
+    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1",
+    "Diff": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
     "Closed": false,
     "Merged": false,
     "Base": {

diff --git a/scm/driver/github/testdata/webhooks/pr_sync.json.golden b/scm/driver/github/testdata/webhooks/pr_sync.json.golden
@@ -22,7 +22,8 @@
     "Source": "master",
     "Target": "bradrydzewski-patch-1",
     "Fork": "bradrydzewski/drone-test-go",
-    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
+    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1",
+    "Diff": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
     "Closed": false,
     "Merged": false,
     "Base": {

diff --git a/scm/driver/github/testdata/webhooks/pr_unlabeled.json.golden b/scm/driver/github/testdata/webhooks/pr_unlabeled.json.golden
@@ -22,7 +22,8 @@
     "Source": "master",
     "Target": "bradrydzewski-patch-1",
     "Fork": "bradrydzewski/drone-test-go",
-    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
+    "Link": "https://github.com/bradrydzewski/drone-test-go/pull/1",
+    "Diff": "https://github.com/bradrydzewski/drone-test-go/pull/1.diff",
     "Closed": false,
     "Merged": false,
     "Base": {

diff --git a/scm/driver/github/testdata/webhooks/push.json.golden b/scm/driver/github/testdata/webhooks/push.json.golden
@@ -34,6 +34,27 @@
     },
     "Link": "https://github.com/Codertocat/Hello-World/compare/a10867b14bb7...000000000000"
   },
+  "Commits": [
+    {
+      "Sha": "199eddf46df50de8d02e99bf1c5fdb4101338224",
+      "Message": "Update README",
+      "Author": {
+        "Name": "Codertocat",
+        "Email": "21031067+Codertocat@users.noreply.github.com",
+        "Date": "2018-06-15T13:01:51-07:00",
+        "Login": "Codertocat",
+        "Avatar": ""
+      },
+      "Committer": {
+        "Name": "GitHub",
+        "Email": "noreply@github.com",
+        "Date": "2018-06-15T13:01:51-07:00",
+        "Login": "web-flow",
+        "Avatar": ""
+      },
+      "Link": "https://github.com/Codertocat/Hello-World/compare/199eddf46df50de8d02e99bf1c5fdb4101338224"
+    }
+  ],
   "Sender": {
     "Login": "Codertocat",
     "Name": "",