Merge pull request #107 from zrochler/gitlab-job-hook-build-payload

Add handling for job hooks with build payloads

.golangci.yml

@@ -0,0 +1,16 @@
+run:
+  tests: false
+  skip-dirs:
+    - _examples
+
+linters:
+  enable:
+    - vet
+    - vetshadow
+    - golint
+    - megacheck
+    - ineffassign
+    - misspell
+    - errcheck
+    - goconst
+    - gofmt

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-  - 1.13.15
+  - 1.15.6
   - tip
 matrix:
   allow_failures:
@@ -13,22 +13,16 @@ notifications:
     on_failure: always
 
 before_install:
-  - go get -u github.com/go-playground/overalls
   - go get -u github.com/mattn/goveralls
-  - go get -u golang.org/x/tools/cmd/cover
-  - mkdir -p $GOPATH/src/gopkg.in
-  - ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v2
-  - ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v3
-  - ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v4
-  - ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v5
 
 before_script:
-  - go get -t ./...
+  - go mod download
 
 script:
+  - make lint
   - make test
 
 after_success: |
-  [ $TRAVIS_GO_VERSION = 1.13.15 ] &&
+  [ $TRAVIS_GO_VERSION = 1.15.6 ] &&
-  overalls -project="github.com/go-playground/webhooks" -covermode=count -ignore=.git,_examples,testdata -debug &&
+  go test ./... -covermode=count -coverprofile=coverage.out &&
-  goveralls -coverprofile=overalls.coverprofile -service travis-ci -repotoken $COVERALLS_TOKEN
+  goveralls -coverprofile=coverage.out -service travis-ci -repotoken $COVERALLS_TOKEN

Makefile

@@ -1,17 +1,17 @@
-GOCMD=go
+GOPATH=$(shell go env GOPATH)
 
 linters-install:
-	@gometalinter --version >/dev/null 2>&1 || { \
+	@echo "+ $@"
-		echo "installing linting tools..."; \
+	@$(GOPATH)/bin/golangci-lint --version >/dev/null 2>&1 || { \
-		$(GOCMD) get github.com/alecthomas/gometalinter; \
+  		echo "Install golangci-lint..."; \
-		gometalinter --install; \
+		curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin; \
 	}
 
 lint: linters-install
-	@gofmt -l . >gofmt.test 2>&1 && if [ -s gofmt.test ]; then echo "Fix formatting using 'gofmt -s -w .' for:"; cat gofmt.test; exit 1; fi && rm gofmt.test
+	@echo "+ $@"
-	gometalinter --vendor --disable-all --enable=vet --enable=vetshadow --enable=golint --enable=megacheck --enable=ineffassign --enable=misspell --enable=errcheck --enable=goconst ./...
+	$(GOPATH)/bin/golangci-lint run ./...
 
 test:
-	$(GOCMD) test -cover -race ./...
+	GO111MODULE=on go test -cover -race ./...
 
-.PHONY: test lint linters-install
+.PHONY: test lint linters-install

README.md

@@ -1,10 +1,10 @@
 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.17.0-green.svg)
+<img align="right" src="https://raw.githubusercontent.com/go-playground/webhooks/v6/logo.png">![Project status](https://img.shields.io/badge/version-6.0.0-green.svg)
-[![Build Status](https://travis-ci.org/go-playground/webhooks.svg?branch=v5)](https://travis-ci.org/go-playground/webhooks)
+[![Build Status](https://travis-ci.org/go-playground/webhooks.svg?branch=v6)](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)
+[![Coverage Status](https://coveralls.io/repos/go-playground/webhooks/badge.svg?branch=v6&service=github)](https://coveralls.io/github/go-playground/webhooks?branch=v6)
 [![Go Report Card](https://goreportcard.com/badge/go-playground/webhooks)](https://goreportcard.com/report/go-playground/webhooks)
-[![GoDoc](https://godoc.org/gopkg.in/go-playground/webhooks.v5?status.svg)](https://godoc.org/gopkg.in/go-playground/webhooks.v5)
+[![GoDoc](https://godoc.org/github.com/go-playground/webhooks/v6?status.svg)](https://godoc.org/github.com/go-playground/webhooks/v6)
 ![License](https://img.shields.io/dub/l/vibe-d.svg)
 
 Library webhooks allows for easy receiving and parsing of GitHub, Bitbucket and GitLab Webhook Events
@@ -24,17 +24,17 @@ Installation
 Use go get.
 
 ```shell
-go get -u gopkg.in/go-playground/webhooks.v5
+go get -u github.com/go-playground/webhooks/v6
 ```
 
 Then import the package into your own code.
 
-	import "gopkg.in/go-playground/webhooks.v5"
+	import "github.com/go-playground/webhooks/v6"
 
 Usage and Documentation
 ------
 
-Please see http://godoc.org/gopkg.in/go-playground/webhooks.v5 for detailed usage docs.
+Please see http://godoc.org/github.com/go-playground/webhooks/v6 for detailed usage docs.
 
 ##### Examples:
 ```go
@@ -45,7 +45,7 @@ import (
 
 	"net/http"
 
-	"gopkg.in/go-playground/webhooks.v5/github"
+	"github.com/go-playground/webhooks/v6/github"
 )
 
 const (

_examples/multiple-handlers/main.go

@@ -5,7 +5,7 @@ import (
 
 	"net/http"
 
-	"gopkg.in/go-playground/webhooks.v5/github"
+	"github.com/go-playground/webhooks/v6/github"
 )
 
 const (

_examples/single-handler/main.go

@@ -5,7 +5,7 @@ import (
 
 	"net/http"
 
-	"gopkg.in/go-playground/webhooks.v5/github"
+	"github.com/go-playground/webhooks/v6/github"
 )
 
 const (

bitbucket-server/payload.go

@@ -147,7 +147,7 @@ type PullRequestCommentAddedPayload struct {
 	Actor           User        `json:"actor"`
 	PullRequest     PullRequest `json:"pullRequest"`
 	Comment         Comment     `json:"comment"`
-	CommentParentId uint64      `json:"commentParentId,omitempty"`
+	CommentParentID uint64      `json:"commentParentId,omitempty"`
 }
 
 type PullRequestCommentEditedPayload struct {
@@ -156,7 +156,7 @@ type PullRequestCommentEditedPayload struct {
 	Actor           User        `json:"actor"`
 	PullRequest     PullRequest `json:"pullRequest"`
 	Comment         Comment     `json:"comment"`
-	CommentParentId string      `json:"commentParentId,omitempty"`
+	CommentParentID string      `json:"commentParentId,omitempty"`
 	PreviousComment string      `json:"previousComment"`
 }
 
@@ -166,7 +166,7 @@ type PullRequestCommentDeletedPayload struct {
 	Actor           User        `json:"actor"`
 	PullRequest     PullRequest `json:"pullRequest"`
 	Comment         Comment     `json:"comment"`
-	CommentParentId uint64      `json:"commentParentId,omitempty"`
+	CommentParentID uint64      `json:"commentParentId,omitempty"`
 }
 
 // -----------------------
@@ -186,7 +186,7 @@ type Repository struct {
 	ID            uint64                 `json:"id"`
 	Slug          string                 `json:"slug"`
 	Name          string                 `json:"name"`
-	ScmId         string                 `json:"scmId"`
+	ScmID         string                 `json:"scmId"`
 	State         string                 `json:"state"`
 	StatusMessage string                 `json:"statusMessage"`
 	Forkable      bool                   `json:"forkable"`
@@ -229,7 +229,7 @@ type PullRequest struct {
 
 type RepositoryChange struct {
 	Reference   RepositoryReference `json:"ref"`
-	ReferenceId string              `json:"refId"`
+	ReferenceID string              `json:"refId"`
 	FromHash    string              `json:"fromHash"`
 	ToHash      string              `json:"toHash"`
 	Type        string              `json:"type"`
@@ -237,7 +237,7 @@ type RepositoryChange struct {
 
 type RepositoryReference struct {
 	ID           string     `json:"id"`
-	DisplayId    string     `json:"displayId"`
+	DisplayID    string     `json:"displayId"`
 	Type         string     `json:"type,omitempty"`
 	LatestCommit string     `json:"latestCommit,omitempty"`
 	Repository   Repository `json:"repository,omitempty"`

bitbucket/payload.go

@@ -350,7 +350,7 @@ type Owner struct {
 	Type        string `json:"type"`
 	NickName    string `json:"nickname"`
 	DisplayName string `json:"display_name"`
-	AccountId   string `json:"account_id"`
+	AccountID   string `json:"account_id"`
 	UUID        string `json:"uuid"`
 	Links       struct {
 		Self struct {

docker/docker.go

@@ -1,6 +1,6 @@
 package docker
 
-// this package recieves the Docker Hub Automated Build webhook
+// this package receives the Docker Hub Automated Build webhook
 // https://docs.docker.com/docker-hub/webhooks/
 // NOT the Docker Trusted Registry webhook
 // https://docs.docker.com/ee/dtr/user/create-and-manage-webhooks/
@@ -58,7 +58,6 @@ type BuildPayload struct {
 
 // Webhook instance contains all methods needed to process events
 type Webhook struct {
-	secret string
 }
 
 // New creates and returns a WebHook instance

github/payload.go

@@ -13,7 +13,7 @@ type CheckRunPayload struct {
 		Status      string    `json:"status"`
 		Conclusion  string    `json:"conclusion"`
 		URL         string    `json:"url"`
-		HtmlURL     string    `json:"html_url"`
+		HTMLURL     string    `json:"html_url"`
 		StarterAt   time.Time `json:"started_at"`
 		CompletedAt time.Time `json:"completed_at"`
 		Output      struct {
@@ -59,7 +59,7 @@ type CheckRunPayload struct {
 				Name        string `json:"name"`
 				Description string `json:"description"`
 				ExternalURL string `json:"external_url"`
-				HtmlURL     string `json:"html_url"`
+				HTMLURL     string `json:"html_url"`
 				CreatedAt   string `json:"created_at"`
 				UpdatedAt   string `json:"updated_at"`
 			} `json:"app"`
@@ -92,7 +92,7 @@ type CheckRunPayload struct {
 			Name        string `json:"name"`
 			Description string `json:"description"`
 			ExternalURL string `json:"external_url"`
-			HtmlURL     string `json:"html_url"`
+			HTMLURL     string `json:"html_url"`
 			CreatedAt   string `json:"created_at"`
 			UpdatedAt   string `json:"updated_at"`
 		} `json:"app"`
@@ -249,7 +249,7 @@ type CheckSuitePayload struct {
 			Name        string `json:"name"`
 			Description string `json:"description"`
 			ExternalURL string `json:"external_url"`
-			HtmlURL     string `json:"html_url"`
+			HTMLURL     string `json:"html_url"`
 			CreatedAt   string `json:"created_at"`
 			UpdatedAt   string `json:"updated_at"`
 		} `json:"app"`
@@ -2267,16 +2267,7 @@ type MembershipPayload struct {
 		Type              string `json:"type"`
 		SiteAdmin         bool   `json:"site_admin"`
 	} `json:"sender"`
-	Team struct {
+	Team         *Team `json:"team"`
-		Name            string `json:"name"`
-		ID              int64  `json:"id"`
-		NodeID          string `json:"node_id"`
-		Slug            string `json:"slug"`
-		Permission      string `json:"permission"`
-		URL             string `json:"url"`
-		MembersURL      string `json:"members_url"`
-		RepositoriesURL string `json:"repositories_url"`
-	} `json:"team"`
 	Organization struct {
 		Login            string `json:"login"`
 		ID               int64  `json:"id"`
@@ -5693,19 +5684,8 @@ type StatusPayload struct {
 
 // TeamPayload contains the information for GitHub's team hook event
 type TeamPayload struct {
-	Action string `json:"action"`
+	Action       string `json:"action"`
-	Team   struct {
+	Team         *Team  `json:"team"`
-		Name            string `json:"name"`
-		ID              int64  `json:"id"`
-		NodeID          string `json:"node_id"`
-		Slug            string `json:"slug"`
-		Description     string `json:"description"`
-		Privacy         string `json:"privacy"`
-		URL             string `json:"url"`
-		MembersURL      string `json:"members_url"`
-		RepositoriesURL string `json:"repositories_url"`
-		Permission      string `json:"permission"`
-	} `json:"team"`
 	Organization struct {
 		Login            string `json:"login"`
 		ID               int64  `json:"id"`
@@ -5744,17 +5724,7 @@ type TeamPayload struct {
 
 // TeamAddPayload contains the information for GitHub's team_add hook event
 type TeamAddPayload struct {
-	Team struct {
+	Team       *Team `json:"team"`
-		Name            string `json:"name"`
-		ID              int64  `json:"id"`
-		NodeID          string `json:"node_id"`
-		Slug            string `json:"slug"`
-		Description     string `json:"description"`
-		Permission      string `json:"permission"`
-		URL             string `json:"url"`
-		MembersURL      string `json:"members_url"`
-		RepositoriesURL string `json:"repositories_url"`
-	} `json:"team"`
 	Repository struct {
 		ID       int64  `json:"id"`
 		NodeID   string `json:"node_id"`
@@ -6126,3 +6096,16 @@ type Label struct {
 	Color   string `json:"color"`
 	Default bool   `json:"default"`
 }
+
+// Team contains GitHub's Team information
+type Team struct {
+	Name            string `json:"name"`
+	ID              int64  `json:"id"`
+	NodeID          string `json:"node_id"`
+	Slug            string `json:"slug"`
+	Permission      string `json:"permission"`
+	URL             string `json:"url"`
+	MembersURL      string `json:"members_url"`
+	RepositoriesURL string `json:"repositories_url"`
+	Parent          *Team  `json:"parent,omitempty"`
+}

gitlab/gitlab.go

@@ -38,6 +38,7 @@ const (
 	objectPush         string = "push"
 	objectTag          string = "tag_push"
 	objectMergeRequest string = "merge_request"
+	objectBuild        string = "build"
 )
 
 // Option is a configuration option for the webhook
@@ -173,9 +174,15 @@ func eventParsing(gitLabEvent Event, events []Event, payload []byte) (interface{
 		err := json.Unmarshal([]byte(payload), &pl)
 		return pl, err
 	case JobEvents:
-		var p1 JobEventPayload
+		var pl JobEventPayload
-		err := json.Unmarshal([]byte(payload), &p1)
+		err := json.Unmarshal([]byte(payload), &pl)
-		return p1, err
+		if err != nil {
+			return nil, err
+		}
+		if pl.ObjectKind == objectBuild {
+			return eventParsing(BuildEvents, events, payload)
+		}
+		return pl, nil
 
 	case SystemHookEvents:
 		var pl SystemHookPayload

gitlab/gitlab_test.go

@@ -231,15 +231,67 @@ func TestWebhooks(t *testing.T) {
 				"X-Gitlab-Event": []string{"Build Hook"},
 			},
 		},
+	}
+
+	for _, tt := range tests {
+		tc := tt
+		client := &http.Client{}
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+			payload, err := os.Open(tc.filename)
+			assert.NoError(err)
+			defer func() {
+				_ = payload.Close()
+			}()
+
+			var parseError error
+			var results interface{}
+			server := newServer(func(w http.ResponseWriter, r *http.Request) {
+				results, parseError = hook.Parse(r, tc.event)
+			})
+			defer server.Close()
+			req, err := http.NewRequest(http.MethodPost, server.URL+path, payload)
+			assert.NoError(err)
+			req.Header = tc.headers
+			req.Header.Set("Content-Type", "application/json")
+			req.Header.Set("X-Gitlab-Token", "sampleToken!")
+
+			resp, err := client.Do(req)
+			assert.NoError(err)
+			assert.Equal(http.StatusOK, resp.StatusCode)
+			assert.NoError(parseError)
+			assert.Equal(reflect.TypeOf(tc.typ), reflect.TypeOf(results))
+		})
+	}
+}
+
+func TestJobHooks(t *testing.T) {
+	assert := require.New(t)
+	tests := []struct {
+		name     string
+		events   []Event
+		typ      interface{}
+		filename string
+		headers  http.Header
+	}{
 		{
 			name:     "JobEvent",
-			event:    JobEvents,
+			events:   []Event{JobEvents},
 			typ:      JobEventPayload{},
 			filename: "../testdata/gitlab/job-event.json",
 			headers: http.Header{
 				"X-Gitlab-Event": []string{"Job Hook"},
 			},
 		},
+		{
+			name:     "JobEvent",
+			events:   []Event{JobEvents, BuildEvents},
+			typ:      BuildEventPayload{},
+			filename: "../testdata/gitlab/build-event.json",
+			headers: http.Header{
+				"X-Gitlab-Event": []string{"Job Hook"},
+			},
+		},
 	}
 
 	for _, tt := range tests {
@@ -256,7 +308,7 @@ func TestWebhooks(t *testing.T) {
 			var parseError error
 			var results interface{}
 			server := newServer(func(w http.ResponseWriter, r *http.Request) {
-				results, parseError = hook.Parse(r, tc.event)
+				results, parseError = hook.Parse(r, tc.events...)
 			})
 			defer server.Close()
 			req, err := http.NewRequest(http.MethodPost, server.URL+path, payload)

gitlab/payload.go

@@ -112,7 +112,8 @@ type PipelineEventPayload struct {
 	Project          Project                  `json:"project"`
 	Commit           Commit                   `json:"commit"`
 	ObjectAttributes PipelineObjectAttributes `json:"object_attributes"`
-	Jobs             []Job                    `json:"jobs"`
+	MergeRequest     MergeRequest             `json:"merge_request"`
+	Builds           []Build                  `json:"builds"`
 }
 
 // CommentEventPayload contains the information for GitLab's comment event
@@ -142,7 +143,7 @@ type BuildEventPayload struct {
 	BuildStatus       string      `json:"build_status"`
 	BuildStartedAt    customTime  `json:"build_started_at"`
 	BuildFinishedAt   customTime  `json:"build_finished_at"`
-	BuildDuration     int64       `json:"build_duration"`
+	BuildDuration     float64     `json:"build_duration"`
 	BuildAllowFailure bool        `json:"build_allow_failure"`
 	ProjectID         int64       `json:"project_id"`
 	ProjectName       string      `json:"project_name"`
@@ -153,25 +154,27 @@ type BuildEventPayload struct {
 
 // JobEventPayload contains the information for GitLab's Job status change
 type JobEventPayload struct {
-	ObjectKind       string      `json:"object_kind"`
+	ObjectKind         string      `json:"object_kind"`
-	Ref              string      `json:"ref"`
+	Ref                string      `json:"ref"`
-	Tag              bool        `json:"tag"`
+	Tag                bool        `json:"tag"`
-	BeforeSHA        string      `json:"before_sha"`
+	BeforeSHA          string      `json:"before_sha"`
-	SHA              string      `json:"sha"`
+	SHA                string      `json:"sha"`
-	JobID            int64       `json:"Job_id"`
+	BuildID            int64       `json:"build_id"`
-	JobName          string      `json:"Job_name"`
+	BuildName          string      `json:"build_name"`
-	JobStage         string      `json:"Job_stage"`
+	BuildStage         string      `json:"build_stage"`
-	JobStatus        string      `json:"Job_status"`
+	BuildStatus        string      `json:"build_status"`
-	JobStartedAt     customTime  `json:"Job_started_at"`
+	BuildStartedAt     customTime  `json:"build_started_at"`
-	JobFinishedAt    customTime  `json:"Job_finished_at"`
+	BuildFinishedAt    customTime  `json:"build_finished_at"`
-	JobDuration      int64       `json:"Job_duration"`
+	BuildDuration      float64     `json:"build_duration"`
-	Job              bool        `json:"Job"`
+	BuildAllowFailure  bool        `json:"build_allow_failure"`
-	JobFailureReason string      `json:"job_failure_reason"`
+	BuildFailureReason string      `json:"build_failure_reason"`
-	ProjectID        int64       `json:"project_id"`
+	PipelineID         int64       `json:"pipeline_id"`
-	ProjectName      string      `json:"project_name"`
+	ProjectID          int64       `json:"project_id"`
-	User             User        `json:"user"`
+	ProjectName        string      `json:"project_name"`
-	Commit           BuildCommit `json:"commit"`
+	User               User        `json:"user"`
-	Repository       Repository  `json:"repository"`
+	Commit             BuildCommit `json:"commit"`
+	Repository         Repository  `json:"repository"`
+	Runner             Runner      `json:"runner"`
 }
 
 // SystemHookPayload contains the ObjectKind to match with real hook events
@@ -197,8 +200,8 @@ type Issue struct {
 	IID         int64      `json:"iid"`
 }
 
-// Job contains all of the GitLab job information
+// Build contains all of the GitLab Build information
-type Job struct {
+type Build struct {
 	ID            int64         `json:"id"`
 	Stage         string        `json:"stage"`
 	Name          string        `json:"name"`
@@ -240,6 +243,7 @@ type Wiki struct {
 type Commit struct {
 	ID        string     `json:"id"`
 	Message   string     `json:"message"`
+	Title     string     `json:"title"`
 	Timestamp customTime `json:"timestamp"`
 	URL       string     `json:"url"`
 	Author    Author     `json:"author"`
@@ -253,10 +257,10 @@ type BuildCommit struct {
 	ID          int64      `json:"id"`
 	SHA         string     `json:"sha"`
 	Message     string     `json:"message"`
-	AuthorName  string     `json:"auuthor_name"`
+	AuthorName  string     `json:"author_name"`
 	AuthorEmail string     `json:"author_email"`
 	Status      string     `json:"status"`
-	Duration    int64      `json:"duration"`
+	Duration    float64    `json:"duration"`
 	StartedAt   customTime `json:"started_at"`
 	FinishedAt  customTime `json:"finished_at"`
 }
@@ -290,7 +294,7 @@ type Project struct {
 	Description       string `json:"description"`
 	WebURL            string `json:"web_url"`
 	AvatarURL         string `json:"avatar_url"`
-	GitSSSHURL        string `json:"git_ssh_url"`
+	GitSSHURL         string `json:"git_ssh_url"`
 	GitHTTPURL        string `json:"git_http_url"`
 	Namespace         string `json:"namespace"`
 	VisibilityLevel   int64  `json:"visibility_level"`
@@ -304,28 +308,40 @@ type Project struct {
 
 // Repository contains all of the GitLab repository information
 type Repository struct {
-	Name        string `json:"name"`
+	Name            string `json:"name"`
-	URL         string `json:"url"`
+	URL             string `json:"url"`
-	Description string `json:"description"`
+	Description     string `json:"description"`
-	Homepage    string `json:"homepage"`
+	Homepage        string `json:"homepage"`
+	GitSSHURL       string `json:"git_ssh_url"`
+	GitHTTPURL      string `json:"git_http_url"`
+	VisibilityLevel int64  `json:"visibility_level"`
 }
 
 // ObjectAttributes contains all of the GitLab object attributes information
 type ObjectAttributes struct {
 	ID               int64      `json:"id"`
 	Title            string     `json:"title"`
+	AssigneeIDS      []int64    `json:"assignee_ids"`
 	AssigneeID       int64      `json:"assignee_id"`
 	AuthorID         int64      `json:"author_id"`
 	ProjectID        int64      `json:"project_id"`
 	CreatedAt        customTime `json:"created_at"`
 	UpdatedAt        customTime `json:"updated_at"`
-	ChangePosition   Position   `json:"change_position"`
+	UpdatedByID      int64      `json:"updated_by_id"`
-	OriginalPosition Position   `json:"original_position"`
+	LastEditedAt     customTime `json:"last_edited_at"`
+	LastEditedByID   int64      `json:"last_edited_by_id"`
+	RelativePosition int64      `json:"relative_position"`
 	Position         Position   `json:"position"`
 	BranchName       string     `json:"branch_name"`
 	Description      string     `json:"description"`
 	MilestoneID      int64      `json:"milestone_id"`
 	State            string     `json:"state"`
+	StateID          int64      `json:"state_id"`
+	Confidential     bool       `json:"confidential"`
+	DiscussionLocked bool       `json:"discussion_locked"`
+	DueDate          customTime `json:"due_date"`
+	TimeEstimate     int64      `json:"time_estimate"`
+	TotalTimeSpent   int64      `json:"total_time_spent"`
 	IID              int64      `json:"iid"`
 	URL              string     `json:"url"`
 	Action           string     `json:"action"`
@@ -347,11 +363,11 @@ type ObjectAttributes struct {
 	Stages           []string   `json:"stages"`
 	Duration         int64      `json:"duration"`
 	Note             string     `json:"note"`
-	NotebookType     string     `json:"noteable_type"`
+	NotebookType     string     `json:"noteable_type"` // nolint:misspell
 	At               customTime `json:"attachment"`
 	LineCode         string     `json:"line_code"`
 	CommitID         string     `json:"commit_id"`
-	NoteableID       int64      `json:"noteable_id"`
+	NoteableID       int64      `json:"noteable_id"` // nolint: misspell
 	System           bool       `json:"system"`
 	WorkInProgress   bool       `json:"work_in_progress"`
 	StDiffs          []StDiff   `json:"st_diffs"`
@@ -374,6 +390,13 @@ type PipelineObjectAttributes struct {
 	CreatedAt  customTime `json:"created_at"`
 	FinishedAt customTime `json:"finished_at"`
 	Duration   int64      `json:"duration"`
+	Variables  []Variable `json:"variables"`
+}
+
+// Variable contains pipeline variables
+type Variable struct {
+	Key   string `json:"key"`
+	Value string `json:"value"`
 }
 
 // Position defines a specific location, identified by paths line numbers and
@@ -421,6 +444,7 @@ type MergeRequest struct {
 	LastCommit      LastCommit `json:"last_commit"`
 	WorkInProgress  bool       `json:"work_in_progress"`
 	Assignee        Assignee   `json:"assignee"`
+	URL             string     `json:"url"`
 }
 
 // Assignee contains all of the GitLab assignee information

go.mod

@@ -0,0 +1,8 @@
+module github.com/go-playground/webhooks/v6
+
+go 1.15
+
+require (
+	github.com/gogits/go-gogs-client v0.0.0-20200905025246-8bb8a50cb355
+	github.com/stretchr/testify v1.6.1
+)

go.sum

@@ -0,0 +1,13 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gogits/go-gogs-client v0.0.0-20200905025246-8bb8a50cb355 h1:HTVNOdTWO/gHYeFnr/HwpYwY6tgMcYd+Rgf1XrHnORY=
+github.com/gogits/go-gogs-client v0.0.0-20200905025246-8bb8a50cb355/go.mod h1:cY2AIrMgHm6oOHmR7jY+9TtjzSjQ3iG7tURJG3Y6XH0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

testdata/gitlab/job-event.json

@@ -1,42 +1,50 @@
 {
-    "object_kind": "job",
+  "object_kind": "build",
-    "ref": "gitlab-script-trigger",
+  "ref": "gitlab-script-trigger",
-    "tag": false,
+  "tag": false,
-    "before_sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
+  "before_sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
+  "sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
+  "build_id": 1977,
+  "build_name": "test",
+  "build_stage": "test",
+  "build_status": "created",
+  "build_started_at": null,
+  "build_finished_at": null,
+  "build_duration": null,
+  "build_allow_failure": false,
+  "build_failure_reason": "script_failure",
+  "pipeline_id": 2366,
+  "project_id": 380,
+  "project_name": "gitlab-org/gitlab-test",
+  "user": {
+    "id": 3,
+    "name": "User",
+    "email": "user@gitlab.com",
+    "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+  },
+  "commit": {
+    "id": 2366,
     "sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
-    "job_id": 1977,
+    "message": "test\n",
-    "job_name": "test",
+    "author_name": "User",
-    "job_stage": "test",
+    "author_email": "user@gitlab.com",
-    "job_status": "created",
+    "status": "created",
-    "job_started_at": null,
+    "duration": null,
-    "job_finished_at": null,
+    "started_at": null,
-    "job_duration": null,
+    "finished_at": null
-    "job_allow_failure": false,
+  },
-    "job_failure_reason": "script_failure",
+  "repository": {
-    "project_id": 380,
+    "name": "gitlab_test",
-    "project_name": "gitlab-org/gitlab-test",
+    "description": "Atque in sunt eos similique dolores voluptatem.",
-    "user": {
+    "homepage": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
-      "id": 3,
+    "git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
-      "name": "User",
+    "git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
-      "email": "user@gitlab.com"
+    "visibility_level": 20
-    },
+  },
-    "commit": {
+  "runner": {
-      "id": 2366,
+    "active": true,
-      "sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
+    "is_shared": false,
-      "message": "test\n",
+    "id": 380987,
-      "author_name": "User",
+    "description": "shared-runners-manager-6.gitlab.com"
-      "author_email": "user@gitlab.com",
-      "status": "created",
-      "duration": null,
-      "started_at": null,
-      "finished_at": null
-    },
-    "repository": {
-      "name": "gitlab_test",
-      "description": "Atque in sunt eos similique dolores voluptatem.",
-      "homepage": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
-      "git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
-      "git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
-      "visibility_level": 20
-    }
   }
+}

testdata/gitlab/pipeline-event.json

@@ -1,175 +1,194 @@
 {
-  "object_kind": "pipeline",
+   "object_kind": "pipeline",
-  "object_attributes":{
+   "object_attributes":{
-    "id": 31,
+      "id": 31,
-    "ref": "master",
+      "ref": "master",
-    "tag": false,
+      "tag": false,
-    "sha": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
+      "sha": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
-    "before_sha": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
+      "before_sha": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
-    "status": "success",
+      "source": "merge_request_event",
-    "stages":[
-      "build",
-      "test",
-      "deploy"
-    ],
-    "created_at": "2016-08-12 15:23:28 UTC",
-    "finished_at": "2016-08-12 15:26:29 UTC",
-    "duration": 63,
-    "variables": [
-      {
-        "key": "NESTOR_PROD_ENVIRONMENT",
-        "value": "us-west-1"
-      }
-    ]
-  },
-  "user":{
-    "name": "Administrator",
-    "username": "root",
-    "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
-  },
-  "project":{
-    "id": 1,
-    "name": "Gitlab Test",
-    "description": "Atque in sunt eos similique dolores voluptatem.",
-    "web_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
-    "avatar_url": null,
-    "git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
-    "git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
-    "namespace": "Gitlab Org",
-    "visibility_level": 20,
-    "path_with_namespace": "gitlab-org/gitlab-test",
-    "default_branch": "master"
-  },
-  "commit":{
-    "id": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
-    "message": "test\n",
-    "timestamp": "2016-08-12T17:23:21+02:00",
-    "url": "http://example.com/gitlab-org/gitlab-test/commit/bcbb5ec396a2c0f828686f14fac9b80b780504f2",
-    "author":{
-      "name": "User",
-      "email": "user@gitlab.com"
-    }
-  },
-  "jobs":[
-    {
-      "id": 380,
-      "stage": "deploy",
-      "name": "production",
-      "status": "skipped",
-      "created_at": "2016-08-12 15:23:28 UTC",
-      "started_at": null,
-      "finished_at": null,
-      "when": "manual",
-      "manual": true,
-      "user":{
-        "name": "Administrator",
-        "username": "root",
-        "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
-      },
-      "runner": null,
-      "artifacts_file":{
-        "filename": null,
-        "size": null
-      }
-    },
-    {
-      "id": 377,
-      "stage": "test",
-      "name": "test-image",
       "status": "success",
+      "stages":[
+         "build",
+         "test",
+         "deploy"
+      ],
       "created_at": "2016-08-12 15:23:28 UTC",
-      "started_at": "2016-08-12 15:26:12 UTC",
-      "finished_at": null,
-      "when": "on_success",
-      "manual": false,
-      "user":{
-        "name": "Administrator",
-        "username": "root",
-        "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
-      },
-      "runner": {
-        "id":380987,
-        "description":"shared-runners-manager-6.gitlab.com",
-        "active":true,
-        "is_shared":true
-      },
-      "artifacts_file":{
-        "filename": null,
-        "size": null
-      }
-    },
-    {
-      "id": 378,
-      "stage": "test",
-      "name": "test-build",
-      "status": "success",
-      "created_at": "2016-08-12 15:23:28 UTC",
-      "started_at": "2016-08-12 15:26:12 UTC",
       "finished_at": "2016-08-12 15:26:29 UTC",
-      "when": "on_success",
+      "duration": 63,
-      "manual": false,
+      "variables": [
-      "user":{
+        {
-        "name": "Administrator",
+          "key": "NESTOR_PROD_ENVIRONMENT",
-        "username": "root",
+          "value": "us-west-1"
-        "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+        }
-      },
+      ]
-      "runner": {
+   },
-        "id":380987,
+    "merge_request": {
-        "description":"shared-runners-manager-6.gitlab.com",
+      "id": 1,
-        "active":true,
+      "iid": 1,
-        "is_shared":true
+      "title": "Test",
-      },
+      "source_branch": "test",
-      "artifacts_file":{
+      "source_project_id": 1,
-        "filename": null,
+      "target_branch": "master",
-        "size": null
+      "target_project_id": 1,
+      "state": "opened",
+      "merge_status": "can_be_merged",
+      "url": "http://192.168.64.1:3005/gitlab-org/gitlab-test/merge_requests/1"
+   },
+   "user":{
+      "name": "Administrator",
+      "username": "root",
+      "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon",
+      "email": "user_email@gitlab.com"
+   },
+   "project":{
+      "id": 1,
+      "name": "Gitlab Test",
+      "description": "Atque in sunt eos similique dolores voluptatem.",
+      "web_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
+      "avatar_url": null,
+      "git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
+      "git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
+      "namespace": "Gitlab Org",
+      "visibility_level": 20,
+      "path_with_namespace": "gitlab-org/gitlab-test",
+      "default_branch": "master"
+   },
+   "commit":{
+      "id": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
+      "message": "test\n",
+      "timestamp": "2016-08-12T17:23:21+02:00",
+      "url": "http://example.com/gitlab-org/gitlab-test/commit/bcbb5ec396a2c0f828686f14fac9b80b780504f2",
+      "author":{
+         "name": "User",
+         "email": "user@gitlab.com"
       }
-    },
+   },
-    {
+   "builds":[
-      "id": 376,
+      {
-      "stage": "build",
+         "id": 380,
-      "name": "build-image",
+         "stage": "deploy",
-      "status": "success",
+         "name": "production",
-      "created_at": "2016-08-12 15:23:28 UTC",
+         "status": "skipped",
-      "started_at": "2016-08-12 15:24:56 UTC",
+         "created_at": "2016-08-12 15:23:28 UTC",
-      "finished_at": "2016-08-12 15:25:26 UTC",
+         "started_at": null,
-      "when": "on_success",
+         "finished_at": null,
-      "manual": false,
+         "when": "manual",
-      "user":{
+         "manual": true,
-        "name": "Administrator",
+         "allow_failure": false,
-        "username": "root",
+         "user":{
-        "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+            "name": "Administrator",
+            "username": "root",
+            "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+         },
+         "runner": null,
+         "artifacts_file":{
+            "filename": null,
+            "size": null
+         }
       },
-      "runner": {
+      {
-        "id":380987,
+         "id": 377,
-        "description":"shared-runners-manager-6.gitlab.com",
+         "stage": "test",
-        "active":true,
+         "name": "test-image",
-        "is_shared":true
+         "status": "success",
+         "created_at": "2016-08-12 15:23:28 UTC",
+         "started_at": "2016-08-12 15:26:12 UTC",
+         "finished_at": null,
+         "when": "on_success",
+         "manual": false,
+         "allow_failure": false,
+         "user":{
+            "name": "Administrator",
+            "username": "root",
+            "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+         },
+         "runner": {
+            "id":380987,
+            "description":"shared-runners-manager-6.gitlab.com",
+            "active":true,
+            "is_shared":true
+         },
+         "artifacts_file":{
+            "filename": null,
+            "size": null
+         }
       },
-      "artifacts_file":{
+      {
-        "filename": null,
+         "id": 378,
-        "size": null
+         "stage": "test",
+         "name": "test-build",
+         "status": "success",
+         "created_at": "2016-08-12 15:23:28 UTC",
+         "started_at": "2016-08-12 15:26:12 UTC",
+         "finished_at": "2016-08-12 15:26:29 UTC",
+         "when": "on_success",
+         "manual": false,
+         "allow_failure": false,
+         "user":{
+            "name": "Administrator",
+            "username": "root",
+            "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+         },
+         "runner": {
+            "id":380987,
+            "description":"shared-runners-manager-6.gitlab.com",
+            "active":true,
+            "is_shared":true
+         },
+         "artifacts_file":{
+            "filename": null,
+            "size": null
+         }
+      },
+      {
+         "id": 376,
+         "stage": "build",
+         "name": "build-image",
+         "status": "success",
+         "created_at": "2016-08-12 15:23:28 UTC",
+         "started_at": "2016-08-12 15:24:56 UTC",
+         "finished_at": "2016-08-12 15:25:26 UTC",
+         "when": "on_success",
+         "manual": false,
+         "allow_failure": false,
+         "user":{
+            "name": "Administrator",
+            "username": "root",
+            "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+         },
+         "runner": {
+            "id":380987,
+            "description":"shared-runners-manager-6.gitlab.com",
+            "active":true,
+            "is_shared":true
+         },
+         "artifacts_file":{
+            "filename": null,
+            "size": null
+         }
+      },
+      {
+         "id": 379,
+         "stage": "deploy",
+         "name": "staging",
+         "status": "created",
+         "created_at": "2016-08-12 15:23:28 UTC",
+         "started_at": null,
+         "finished_at": null,
+         "when": "on_success",
+         "manual": false,
+         "allow_failure": false,
+         "user":{
+            "name": "Administrator",
+            "username": "root",
+            "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+         },
+         "runner": null,
+         "artifacts_file":{
+            "filename": null,
+            "size": null
+         }
       }
-    },
+   ]
-    {
-      "id": 379,
-      "stage": "deploy",
-      "name": "staging",
-      "status": "created",
-      "created_at": "2016-08-12 15:23:28 UTC",
-      "started_at": null,
-      "finished_at": null,
-      "when": "on_success",
-      "manual": false,
-      "user":{
-        "name": "Administrator",
-        "username": "root",
-        "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
-      },
-      "runner": null,
-      "artifacts_file":{
-        "filename": null,
-        "size": null
-      }
-    }
-  ]
 }