Merge pull request #489 from kmdrn7/feat/hook-pr-deleted-stash

feat: handle webhook event pr:deleted for stash

Author: jenkins-x-bot

.golangci.yml

@@ -109,6 +109,6 @@ issues:
     - cmd/docs
 
 run:
-  timeout: 30m
+  timeout: 4h
 # golangci.com configuration
 # https://github.com/golangci/golangci/wiki/Configuration

.lighthouse/jenkins-x/lint.yaml

@@ -8,6 +8,7 @@ spec:
     tasks:
     - name: go-scm-lint
       resources: {}
+      timeout: 24h
       taskSpec:
         metadata: {}
         stepTemplate:
@@ -23,5 +24,5 @@ spec:
           resources: {}
   podTemplate: {}
   serviceAccountName: tekton-bot
-  timeout: 30m0s
+  timeout: 24h
 status: {}

.lighthouse/jenkins-x/pullrequest.yaml

@@ -7,6 +7,7 @@ spec:
   pipelineSpec:
     tasks:
     - name: from-build-pack
+      timeout: 24h
       resources: {}
       taskSpec:
         metadata: {}

.lighthouse/jenkins-x/release.yaml

@@ -6,6 +6,7 @@ spec:
   pipelineSpec:
     tasks:
     - name: from-build-pack
+      timeout: 24h
       taskSpec:
         stepTemplate:
           image: uses:jenkins-x/jx3-pipeline-catalog/tasks/go/release.yaml@versionStream

scm/driver/stash/testdata/webhooks/pr_deleted.json.golden

@@ -1 +1,81 @@
-{}
+{
+  "Action": "deleted",
+  "Repo": {
+    "ID": "1",
+    "Namespace": "PRJ",
+    "Name": "my-repo",
+    "FullName": "PRJ/my-repo",
+    "Perm": null,
+    "Branch": "master",
+    "Private": true,
+    "Clone": "",
+    "CloneSSH": "",
+    "Link": "",
+    "Created": "0001-01-01T00:00:00Z",
+    "Updated": "0001-01-01T00:00:00Z"
+  },
+  "PullRequest": {
+    "Number": 2,
+    "Title": "added LICENSE",
+    "Body": "added BSD license text",
+    "Sha": "b9eaed50a03c073b20dfa82e5e753d295e7f0e56",
+    "Ref": "refs/pull-requests/2/from",
+    "Source": "develop",
+    "Target": "master",
+    "Fork": "PRJ/my-repo",
+    "Link": "",
+    "Closed": true,
+    "Merged": false,
+    "State": "declined",
+    "Base": {
+      "Ref": "master",
+      "Sha": "823b2230a56056231c9425d63758fa87078a66b4",
+      "Repo": {
+        "ID": "1",
+        "Namespace": "PRJ",
+        "Name": "my-repo",
+        "FullName": "PRJ/my-repo",
+        "Perm": null,
+        "Branch": "master",
+        "Private": true,
+        "Clone": "",
+        "CloneSSH": "",
+        "Link": "",
+        "Created": "0001-01-01T00:00:00Z",
+        "Updated": "0001-01-01T00:00:00Z"
+      }
+    },
+    "Head": {
+      "Ref": "develop",
+      "Sha": "b9eaed50a03c073b20dfa82e5e753d295e7f0e56",
+      "Repo": {
+        "ID": "1",
+        "Namespace": "PRJ",
+        "Name": "my-repo",
+        "FullName": "PRJ/my-repo",
+        "Perm": null,
+        "Branch": "master",
+        "Private": true,
+        "Clone": "",
+        "CloneSSH": "",
+        "Link": "",
+        "Created": "0001-01-01T00:00:00Z",
+        "Updated": "0001-01-01T00:00:00Z"
+      }
+    },
+    "Author": {
+      "Login": "jcitizen",
+      "Name": "Jane Citizen",
+      "Email": "[email protected]",
+      "Avatar": "https://www.gravatar.com/avatar/9e26471d35a78862c17e467d87cddedf.jpg"
+    },
+    "Created": "2018-07-05T12:21:30-07:00",
+    "Updated": "2018-07-05T12:30:48-07:00"
+  },
+  "Sender": {
+    "Login": "jcitizen",
+    "Name": "Jane Citizen",
+    "Email": "[email protected]",
+    "Avatar": "https://www.gravatar.com/avatar/9e26471d35a78862c17e467d87cddedf.jpg"
+  }
+}

scm/driver/stash/webhook.go

@@ -46,7 +46,7 @@ func (s *webhookService) Parse(req *http.Request, fn scm.SecretFunc) (scm.Webhoo
 	switch event {
 	case "repo:refs_changed":
 		hook, err = s.parsePushHook(data, guid)
-	case "pr:opened", "pr:declined", "pr:merged", "pr:from_ref_updated", "pr:modified":
+	case "pr:opened", "pr:declined", "pr:deleted", "pr:merged", "pr:from_ref_updated", "pr:modified":
 		hook, err = s.parsePullRequest(data)
 	case "pr:comment:added", "pr:comment:edited":
 		hook, err = s.parsePullRequestComment(data, guid)
@@ -114,6 +114,8 @@ func (s *webhookService) parsePullRequest(data []byte) (scm.Webhook, error) {
 		dst.Action = scm.ActionOpen
 	case "pr:declined":
 		dst.Action = scm.ActionClose
+	case "pr:deleted":
+		dst.Action = scm.ActionDelete
 	case "pr:merged":
 		dst.Action = scm.ActionMerge
 	case "pr:from_ref_updated":

scm/driver/stash/webhook_test.go

@@ -123,6 +123,14 @@ func TestWebhooks(t *testing.T) {
 			after:  "testdata/webhooks/pr_declined.json.golden",
 			obj:    new(scm.PullRequestHook),
 		},
+		// pull request deleted
+		{
+			sig:    "71295b197fa25f4356d2fb9965df3f2379d903d7",
+			event:  "pr:deleted",
+			before: "testdata/webhooks/pr_deleted.json",
+			after:  "testdata/webhooks/pr_deleted.json.golden",
+			obj:    new(scm.PullRequestHook),
+		},
 		// pull request comment
 		{
 			sig:    "71295b197fa25f4356d2fb9965df3f2379d903d7",