diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 0000000..405103a --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,16 @@ +run: + tests: false + skip-dirs: + - _examples + +linters: + enable: + - vet + - vetshadow + - golint + - megacheck + - ineffassign + - misspell + - errcheck + - goconst + - gofmt diff --git a/.travis.yml b/.travis.yml index d7960f3..149cd16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,17 +16,12 @@ 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 - - ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v6 before_script: - - go get -t ./... + - go mod download script: + - make lint - make test after_success: | diff --git a/Makefile b/Makefile index 080316c..f07d215 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,17 @@ -GOCMD=go +GOPATH=$(shell go env GOPATH) linters-install: - @gometalinter --version >/dev/null 2>&1 || { \ - echo "installing linting tools..."; \ - $(GOCMD) get github.com/alecthomas/gometalinter; \ - gometalinter --install; \ + @echo "+ $@" + @$(GOPATH)/bin/golangci-lint --version >/dev/null 2>&1 || { \ + echo "Install golangci-lint..."; \ + 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 - gometalinter --vendor --disable-all --enable=vet --enable=vetshadow --enable=golint --enable=megacheck --enable=ineffassign --enable=misspell --enable=errcheck --enable=goconst ./... + @echo "+ $@" + $(GOPATH)/bin/golangci-lint run ./... test: - $(GOCMD) test -cover -race ./... + GO111MODULE=on go test -cover -race ./... -.PHONY: test lint linters-install \ No newline at end of file +.PHONY: test lint linters-install diff --git a/README.md b/README.md index 2124a49..7d4ccd3 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Library 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=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.v6?status.svg)](https://godoc.org/gopkg.in/go-playground/webhooks.v6) +[![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.v6 +go get -u github.com/go-playground/webhooks/v6 ``` Then import the package into your own code. - import "gopkg.in/go-playground/webhooks.v6" + import "github.com/go-playground/webhooks/v6" Usage and Documentation ------ -Please see http://godoc.org/gopkg.in/go-playground/webhooks.v6 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.v6/github" + "github.com/go-playground/webhooks/v6/github" ) const ( diff --git a/_examples/multiple-handlers/main.go b/_examples/multiple-handlers/main.go index 24df01a..8fa577b 100644 --- a/_examples/multiple-handlers/main.go +++ b/_examples/multiple-handlers/main.go @@ -5,7 +5,7 @@ import ( "net/http" - "gopkg.in/go-playground/webhooks.v6/github" + "github.com/go-playground/webhooks/v6/github" ) const ( diff --git a/_examples/single-handler/main.go b/_examples/single-handler/main.go index 8a804cc..f9da55c 100644 --- a/_examples/single-handler/main.go +++ b/_examples/single-handler/main.go @@ -5,7 +5,7 @@ import ( "net/http" - "gopkg.in/go-playground/webhooks.v6/github" + "github.com/go-playground/webhooks/v6/github" ) const ( diff --git a/bitbucket-server/payload.go b/bitbucket-server/payload.go index 9cf46c4..20f7e8d 100644 --- a/bitbucket-server/payload.go +++ b/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"` diff --git a/bitbucket/payload.go b/bitbucket/payload.go index 3edbe52..762ba68 100644 --- a/bitbucket/payload.go +++ b/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 { diff --git a/docker/docker.go b/docker/docker.go index 84de0ec..2894d78 100644 --- a/docker/docker.go +++ b/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 diff --git a/github/payload.go b/github/payload.go index 3e5e4c6..32cc994 100644 --- a/github/payload.go +++ b/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"` diff --git a/gitlab/payload.go b/gitlab/payload.go index 0690022..9e78206 100644 --- a/gitlab/payload.go +++ b/gitlab/payload.go @@ -257,7 +257,7 @@ 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"` @@ -363,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"` diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..89b485e --- /dev/null +++ b/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 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..08b0c3d --- /dev/null +++ b/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=