.travis.yml

@@ -1,16 +1,16 @@
 language: go
 go:
-    - 1.12.1
-    - tip
+  - 1.13.15
+  - tip
 matrix:
   allow_failures:
     - go: tip
 
 notifications:
-    email:
-        recipients: dean.karn@gmail.com
-        on_success: change
-        on_failure: always
+  email:
+    recipients: dean.karn@gmail.com
+    on_success: change
+    on_failure: always
 
 before_install:
   - go get -u github.com/go-playground/overalls
@@ -26,9 +26,9 @@ before_script:
   - go get -t ./...
 
 script:
- - make test
+  - make test
 
 after_success: |
-  [ $TRAVIS_GO_VERSION = 1.11.2 ] &&
+  [ $TRAVIS_GO_VERSION = 1.13.15 ] &&
   overalls -project="github.com/go-playground/webhooks" -covermode=count -ignore=.git,_examples,testdata -debug &&
   goveralls -coverprofile=overalls.coverprofile -service travis-ci -repotoken $COVERALLS_TOKEN

README.md

@@ -1,6 +1,6 @@
 Library webhooks
 ================
-<img align="right" src="https://raw.githubusercontent.com/go-playground/webhooks/v5/logo.png">![Project status](https://img.shields.io/badge/version-5.8.0-green.svg)
+<img align="right" src="https://raw.githubusercontent.com/go-playground/webhooks/v5/logo.png">![Project status](https://img.shields.io/badge/version-5.17.0-green.svg)
 [![Build Status](https://travis-ci.org/go-playground/webhooks.svg?branch=v5)](https://travis-ci.org/go-playground/webhooks)
 [![Coverage Status](https://coveralls.io/repos/go-playground/webhooks/badge.svg?branch=v5&service=github)](https://coveralls.io/github/go-playground/webhooks?branch=v5)
 [![Go Report Card](https://goreportcard.com/badge/go-playground/webhooks)](https://goreportcard.com/report/go-playground/webhooks)

bitbucket-server/bitbucketserver.go

@@ -32,11 +32,12 @@ const (
 	RepositoryCommentEditedEvent    Event = "repo:comment:edited"
 	RepositoryCommentDeletedEvent   Event = "repo:comment:deleted"
 
-	PullRequestOpenedEvent   Event = "pr:opened"
-	PullRequestModifiedEvent Event = "pr:modified"
-	PullRequestMergedEvent   Event = "pr:merged"
-	PullRequestDeclinedEvent Event = "pr:declined"
-	PullRequestDeletedEvent  Event = "pr:deleted"
+	PullRequestOpenedEvent               Event = "pr:opened"
+	PullRequestFromReferenceUpdatedEvent Event = "pr:from_ref_updated"
+	PullRequestModifiedEvent             Event = "pr:modified"
+	PullRequestMergedEvent               Event = "pr:merged"
+	PullRequestDeclinedEvent             Event = "pr:declined"
+	PullRequestDeletedEvent              Event = "pr:deleted"
 
 	PullRequestReviewerUpdatedEvent    Event = "pr:reviewer:updated"
 	PullRequestReviewerApprovedEvent   Event = "pr:reviewer:approved"
@@ -168,6 +169,10 @@ func (hook *Webhook) Parse(r *http.Request, events ...Event) (interface{}, error
 		var pl PullRequestOpenedPayload
 		err = json.Unmarshal([]byte(payload), &pl)
 		return pl, err
+	case PullRequestFromReferenceUpdatedEvent:
+		var pl PullRequestFromReferenceUpdatedPayload
+		err = json.Unmarshal([]byte(payload), &pl)
+		return pl, err
 	case PullRequestModifiedEvent:
 		var pl PullRequestModifiedPayload
 		err = json.Unmarshal([]byte(payload), &pl)

bitbucket-server/payload.go

@@ -66,6 +66,14 @@ type PullRequestOpenedPayload struct {
 	PullRequest PullRequest `json:"pullRequest"`
 }
 
+type PullRequestFromReferenceUpdatedPayload struct {
+	Date             Date        `json:"date"`
+	EventKey         Event       `json:"eventKey"`
+	Actor            User        `json:"actor"`
+	PullRequest      PullRequest `json:"pullRequest"`
+	PreviousFromHash string      `json:"previousFromHash"`
+}
+
 type PullRequestModifiedPayload struct {
 	Date                Date                   `json:"date"`
 	EventKey            Event                  `json:"eventKey"`

bitbucket/payload.go

@@ -348,8 +348,9 @@ type PullRequestCommentDeletedPayload struct {
 // Owner is the common Bitbucket Owner Sub Entity
 type Owner struct {
 	Type        string `json:"type"`
-	Username    string `json:"username"`
+	NickName    string `json:"nickname"`
 	DisplayName string `json:"display_name"`
+	AccountId   string `json:"account_id"`
 	UUID        string `json:"uuid"`
 	Links       struct {
 		Self struct {

github/github.go

@@ -28,42 +28,46 @@ type Event string
 
 // GitHub hook types
 const (
-	CheckRunEvent                 Event = "check_run"
-	CheckSuiteEvent               Event = "check_suite"
-	CommitCommentEvent            Event = "commit_comment"
-	CreateEvent                   Event = "create"
-	DeleteEvent                   Event = "delete"
-	DeploymentEvent               Event = "deployment"
-	DeploymentStatusEvent         Event = "deployment_status"
-	ForkEvent                     Event = "fork"
-	GollumEvent                   Event = "gollum"
-	InstallationEvent             Event = "installation"
-	InstallationRepositoriesEvent Event = "installation_repositories"
-	IntegrationInstallationEvent  Event = "integration_installation"
-	IssueCommentEvent             Event = "issue_comment"
-	IssuesEvent                   Event = "issues"
-	LabelEvent                    Event = "label"
-	MemberEvent                   Event = "member"
-	MembershipEvent               Event = "membership"
-	MilestoneEvent                Event = "milestone"
-	OrganizationEvent             Event = "organization"
-	OrgBlockEvent                 Event = "org_block"
-	PageBuildEvent                Event = "page_build"
-	PingEvent                     Event = "ping"
-	ProjectCardEvent              Event = "project_card"
-	ProjectColumnEvent            Event = "project_column"
-	ProjectEvent                  Event = "project"
-	PublicEvent                   Event = "public"
-	PullRequestEvent              Event = "pull_request"
-	PullRequestReviewEvent        Event = "pull_request_review"
-	PullRequestReviewCommentEvent Event = "pull_request_review_comment"
-	PushEvent                     Event = "push"
-	ReleaseEvent                  Event = "release"
-	RepositoryEvent               Event = "repository"
-	StatusEvent                   Event = "status"
-	TeamEvent                     Event = "team"
-	TeamAddEvent                  Event = "team_add"
-	WatchEvent                    Event = "watch"
+	CheckRunEvent                            Event = "check_run"
+	CheckSuiteEvent                          Event = "check_suite"
+	CommitCommentEvent                       Event = "commit_comment"
+	CreateEvent                              Event = "create"
+	DeleteEvent                              Event = "delete"
+	DeploymentEvent                          Event = "deployment"
+	DeploymentStatusEvent                    Event = "deployment_status"
+	ForkEvent                                Event = "fork"
+	GollumEvent                              Event = "gollum"
+	InstallationEvent                        Event = "installation"
+	InstallationRepositoriesEvent            Event = "installation_repositories"
+	IntegrationInstallationEvent             Event = "integration_installation"
+	IntegrationInstallationRepositoriesEvent Event = "integration_installation_repositories"
+	IssueCommentEvent                        Event = "issue_comment"
+	IssuesEvent                              Event = "issues"
+	LabelEvent                               Event = "label"
+	MemberEvent                              Event = "member"
+	MembershipEvent                          Event = "membership"
+	MilestoneEvent                           Event = "milestone"
+	MetaEvent                                Event = "meta"
+	OrganizationEvent                        Event = "organization"
+	OrgBlockEvent                            Event = "org_block"
+	PageBuildEvent                           Event = "page_build"
+	PingEvent                                Event = "ping"
+	ProjectCardEvent                         Event = "project_card"
+	ProjectColumnEvent                       Event = "project_column"
+	ProjectEvent                             Event = "project"
+	PublicEvent                              Event = "public"
+	PullRequestEvent                         Event = "pull_request"
+	PullRequestReviewEvent                   Event = "pull_request_review"
+	PullRequestReviewCommentEvent            Event = "pull_request_review_comment"
+	PushEvent                                Event = "push"
+	ReleaseEvent                             Event = "release"
+	RepositoryEvent                          Event = "repository"
+	RepositoryVulnerabilityAlertEvent        Event = "repository_vulnerability_alert"
+	SecurityAdvisoryEvent                    Event = "security_advisory"
+	StatusEvent                              Event = "status"
+	TeamEvent                                Event = "team"
+	TeamAddEvent                             Event = "team_add"
+	WatchEvent                               Event = "watch"
 )
 
 // EventSubtype defines a GitHub Hook Event subtype
@@ -204,7 +208,7 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error)
 		var pl InstallationPayload
 		err = json.Unmarshal([]byte(payload), &pl)
 		return pl, err
-	case InstallationRepositoriesEvent:
+	case InstallationRepositoriesEvent, IntegrationInstallationRepositoriesEvent:
 		var pl InstallationRepositoriesPayload
 		err = json.Unmarshal([]byte(payload), &pl)
 		return pl, err
@@ -228,6 +232,10 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error)
 		var pl MembershipPayload
 		err = json.Unmarshal([]byte(payload), &pl)
 		return pl, err
+	case MetaEvent:
+		var pl MetaPayload
+		err = json.Unmarshal([]byte(payload), &pl)
+		return pl, err
 	case MilestoneEvent:
 		var pl MilestonePayload
 		err = json.Unmarshal([]byte(payload), &pl)
@@ -288,6 +296,14 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error)
 		var pl RepositoryPayload
 		err = json.Unmarshal([]byte(payload), &pl)
 		return pl, err
+	case RepositoryVulnerabilityAlertEvent:
+		var pl RepositoryVulnerabilityAlertPayload
+		err = json.Unmarshal([]byte(payload), &pl)
+		return pl, err
+	case SecurityAdvisoryEvent:
+		var pl SecurityAdvisoryPayload
+		err = json.Unmarshal([]byte(payload), &pl)
+		return pl, err
 	case StatusEvent:
 		var pl StatusPayload
 		err = json.Unmarshal([]byte(payload), &pl)

github/github_test.go

@@ -253,6 +253,16 @@ func TestWebhooks(t *testing.T) {
 				"X-Hub-Signature": []string{"sha1=bb2769f05f1a11af3a1edf8f9fac11bae7402a1e"},
 			},
 		},
+		{
+			name:     "IntegrationInstallationRepositoriesEvent",
+			event:    IntegrationInstallationRepositoriesEvent,
+			typ:      InstallationRepositoriesPayload{},
+			filename: "../testdata/github/integration-installation-repositories.json",
+			headers: http.Header{
+				"X-Github-Event":  []string{"integration_installation_repositories"},
+				"X-Hub-Signature": []string{"sha1=2f00a982574188342c2894eb9d1b1e93434687fb"},
+			},
+		},
 		{
 			name:     "IssueCommentEvent",
 			event:    IssueCommentEvent,
@@ -263,6 +273,16 @@ func TestWebhooks(t *testing.T) {
 				"X-Hub-Signature": []string{"sha1=e724c9f811fcf5f511aac32e4251b08ab1a0fd87"},
 			},
 		},
+		{
+			name:     "PullRequestIssueCommentEvent",
+			event:    IssueCommentEvent,
+			typ:      IssueCommentPayload{},
+			filename: "../testdata/github/pull-request-issue-comment.json",
+			headers: http.Header{
+				"X-Github-Event":  []string{"issue_comment"},
+				"X-Hub-Signature": []string{"sha1=6c969b99ef881b5c98b2dbfc66a34465fcf0e7d4"},
+			},
+		},
 		{
 			name:     "IssuesEvent",
 			event:    IssuesEvent,
@@ -360,7 +380,7 @@ func TestWebhooks(t *testing.T) {
 			filename: "../testdata/github/project-card.json",
 			headers: http.Header{
 				"X-Github-Event":  []string{"project_card"},
-				"X-Hub-Signature": []string{"sha1=495dec0d6449d16b71f2ddcd37d595cb9b04b1d8"},
+				"X-Hub-Signature": []string{"sha1=f5ed1572b04f0e03c8d5f5e3f7fa63737bef76d7"},
 			},
 		},
 		{
@@ -400,7 +420,7 @@ func TestWebhooks(t *testing.T) {
 			filename: "../testdata/github/pull-request.json",
 			headers: http.Header{
 				"X-Github-Event":  []string{"pull_request"},
-				"X-Hub-Signature": []string{"sha1=35712c8d2bc197b7d07621dcf20d2fb44620508f"},
+				"X-Hub-Signature": []string{"sha1=88972f972db301178aa13dafaf112d26416a15e6"},
 			},
 		},
 		{
@@ -453,6 +473,26 @@ func TestWebhooks(t *testing.T) {
 				"X-Hub-Signature": []string{"sha1=df442a8af41edd2d42ccdd997938d1d111b0f94e"},
 			},
 		},
+		{
+			name:     "RepositoryVulnerabilityAlertEvent",
+			event:    RepositoryVulnerabilityAlertEvent,
+			typ:      RepositoryVulnerabilityAlertPayload{},
+			filename: "../testdata/github/repository-vulnerability-alert.json",
+			headers: http.Header{
+				"X-Github-Event":  []string{"repository_vulnerability_alert"},
+				"X-Hub-Signature": []string{"sha1=c42c0649e7e06413bcd756763edbab48dff400db"},
+			},
+		},
+		{
+			name:     "SecurityAdvisoryEvent",
+			event:    SecurityAdvisoryEvent,
+			typ:      SecurityAdvisoryPayload{},
+			filename: "../testdata/github/security-advisory.json",
+			headers: http.Header{
+				"X-Github-Event":  []string{"security_advisory"},
+				"X-Hub-Signature": []string{"sha1=6a71f24fa69f55469843a91dc3a5c3e29714a565"},
+			},
+		},
 		{
 			name:     "StatusEvent",
 			event:    StatusEvent,