diff --git a/azuredevops/azuredevops.go b/azuredevops/azuredevops.go index 408b34a..8bb0ddf 100644 --- a/azuredevops/azuredevops.go +++ b/azuredevops/azuredevops.go @@ -8,7 +8,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" ) @@ -43,7 +42,7 @@ func New() (*Webhook, error) { // Parse verifies and parses the events specified and returns the payload object or an error func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) { defer func() { - _, _ = io.Copy(ioutil.Discard, r.Body) + _, _ = io.Copy(io.Discard, r.Body) _ = r.Body.Close() }() @@ -51,7 +50,7 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) return nil, ErrInvalidHTTPMethod } - payload, err := ioutil.ReadAll(r.Body) + payload, err := io.ReadAll(r.Body) if err != nil || len(payload) == 0 { return nil, ErrParsingPayload } diff --git a/bitbucket-server/bitbucketserver.go b/bitbucket-server/bitbucketserver.go index 7b02d39..b47801a 100644 --- a/bitbucket-server/bitbucketserver.go +++ b/bitbucket-server/bitbucketserver.go @@ -8,7 +8,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" ) @@ -86,7 +85,7 @@ func New(options ...Option) (*Webhook, error) { func (hook *Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) { defer func() { - _, _ = io.Copy(ioutil.Discard, r.Body) + _, _ = io.Copy(io.Discard, r.Body) _ = r.Body.Close() }() @@ -121,7 +120,7 @@ func (hook *Webhook) Parse(r *http.Request, events ...Event) (interface{}, error return DiagnosticsPingPayload{}, nil } - payload, err := ioutil.ReadAll(r.Body) + payload, err := io.ReadAll(r.Body) if err != nil || len(payload) == 0 { return nil, ErrParsingPayload } diff --git a/bitbucket/bitbucket.go b/bitbucket/bitbucket.go index 2d1344e..48e23db 100644 --- a/bitbucket/bitbucket.go +++ b/bitbucket/bitbucket.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" ) @@ -81,7 +80,7 @@ func New(options ...Option) (*Webhook, error) { // Parse verifies and parses the events specified and returns the payload object or an error func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) { defer func() { - _, _ = io.Copy(ioutil.Discard, r.Body) + _, _ = io.Copy(io.Discard, r.Body) _ = r.Body.Close() }() @@ -120,7 +119,7 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) return nil, ErrEventNotFound } - payload, err := ioutil.ReadAll(r.Body) + payload, err := io.ReadAll(r.Body) if err != nil || len(payload) == 0 { return nil, ErrParsingPayload } diff --git a/docker/docker.go b/docker/docker.go index 2894d78..8e6254d 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -9,7 +9,6 @@ import ( "encoding/json" "errors" "io" - "io/ioutil" "net/http" ) @@ -69,7 +68,7 @@ func New() (*Webhook, error) { // Parse verifies and parses the events specified and returns the payload object or an error func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) { defer func() { - _, _ = io.Copy(ioutil.Discard, r.Body) + _, _ = io.Copy(io.Discard, r.Body) _ = r.Body.Close() }() @@ -77,7 +76,7 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) return nil, ErrInvalidHTTPMethod } - payload, err := ioutil.ReadAll(r.Body) + payload, err := io.ReadAll(r.Body) if err != nil || len(payload) == 0 { return nil, ErrParsingPayload } diff --git a/gitea/gitea.go b/gitea/gitea.go index 8c80357..9f10ea5 100644 --- a/gitea/gitea.go +++ b/gitea/gitea.go @@ -8,7 +8,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" ) @@ -85,7 +84,7 @@ func New(options ...Option) (*Webhook, error) { // Parse verifies and parses the events specified and returns the payload object or an error func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) { defer func() { - _, _ = io.Copy(ioutil.Discard, r.Body) + _, _ = io.Copy(io.Discard, r.Body) _ = r.Body.Close() }() @@ -115,7 +114,7 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) return nil, ErrEventNotFound } - payload, err := ioutil.ReadAll(r.Body) + payload, err := io.ReadAll(r.Body) if err != nil || len(payload) == 0 { return nil, ErrParsingPayload } diff --git a/github/github.go b/github/github.go index 2578556..11b5351 100644 --- a/github/github.go +++ b/github/github.go @@ -8,7 +8,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" ) @@ -124,7 +123,7 @@ func New(options ...Option) (*Webhook, error) { // Parse verifies and parses the events specified and returns the payload object or an error func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) { defer func() { - _, _ = io.Copy(ioutil.Discard, r.Body) + _, _ = io.Copy(io.Discard, r.Body) _ = r.Body.Close() }() @@ -153,7 +152,7 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) return nil, ErrEventNotFound } - payload, err := ioutil.ReadAll(r.Body) + payload, err := io.ReadAll(r.Body) if err != nil || len(payload) == 0 { return nil, ErrParsingPayload } diff --git a/gitlab/gitlab.go b/gitlab/gitlab.go index a6bb11e..50663b4 100644 --- a/gitlab/gitlab.go +++ b/gitlab/gitlab.go @@ -7,7 +7,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" ) @@ -25,43 +24,43 @@ var ( // GitLab hook types const ( - PushEvents Event = "Push Hook" - TagEvents Event = "Tag Push Hook" - IssuesEvents Event = "Issue Hook" - ConfidentialIssuesEvents Event = "Confidential Issue Hook" - CommentEvents Event = "Note Hook" - ConfidentialCommentEvents Event = "Confidential Note Hook" - MergeRequestEvents Event = "Merge Request Hook" - WikiPageEvents Event = "Wiki Page Hook" - PipelineEvents Event = "Pipeline Hook" - BuildEvents Event = "Build Hook" - JobEvents Event = "Job Hook" - DeploymentEvents Event = "Deployment Hook" - SystemHookEvents Event = "System Hook" - objectPush string = "push" - objectTag string = "tag_push" - objectMergeRequest string = "merge_request" - objectBuild string = "build" - eventProjectCreate string = "project_create" - eventProjectDestroy string = "project_destroy" - eventProjectRename string = "project_rename" - eventProjectTransfer string = "project_transfer" - eventProjectUpdate string = "project_update" - eventUserAddToTeam string = "user_add_to_team" - eventUserRemoveFromTeam string = "user_remove_from_team" - eventUserUpdateForTeam string = "user_update_for_team" - eventUserCreate string = "user_create" - eventUserDestroy string = "user_destroy" - eventUserFailedLogin string = "user_failed_login" - eventUserRename string = "user_rename" - eventKeyCreate string = "key_create" - eventKeyDestroy string = "key_destroy" - eventGroupCreate string = "group_create" - eventGroupDestroy string = "group_destroy" - eventGroupRename string = "group_rename" - eventUserAddToGroup string = "user_add_to_group" - eventUserRemoveFromGroup string = "user_remove_from_group" - eventUserUpdateForGroup string = "user_update_for_group" + PushEvents Event = "Push Hook" + TagEvents Event = "Tag Push Hook" + IssuesEvents Event = "Issue Hook" + ConfidentialIssuesEvents Event = "Confidential Issue Hook" + CommentEvents Event = "Note Hook" + ConfidentialCommentEvents Event = "Confidential Note Hook" + MergeRequestEvents Event = "Merge Request Hook" + WikiPageEvents Event = "Wiki Page Hook" + PipelineEvents Event = "Pipeline Hook" + BuildEvents Event = "Build Hook" + JobEvents Event = "Job Hook" + DeploymentEvents Event = "Deployment Hook" + SystemHookEvents Event = "System Hook" + objectPush string = "push" + objectTag string = "tag_push" + objectMergeRequest string = "merge_request" + objectBuild string = "build" + eventProjectCreate string = "project_create" + eventProjectDestroy string = "project_destroy" + eventProjectRename string = "project_rename" + eventProjectTransfer string = "project_transfer" + eventProjectUpdate string = "project_update" + eventUserAddToTeam string = "user_add_to_team" + eventUserRemoveFromTeam string = "user_remove_from_team" + eventUserUpdateForTeam string = "user_update_for_team" + eventUserCreate string = "user_create" + eventUserDestroy string = "user_destroy" + eventUserFailedLogin string = "user_failed_login" + eventUserRename string = "user_rename" + eventKeyCreate string = "key_create" + eventKeyDestroy string = "key_destroy" + eventGroupCreate string = "group_create" + eventGroupDestroy string = "group_destroy" + eventGroupRename string = "group_rename" + eventUserAddToGroup string = "user_add_to_group" + eventUserRemoveFromGroup string = "user_remove_from_group" + eventUserUpdateForGroup string = "user_update_for_group" ) // Option is a configuration option for the webhook @@ -105,7 +104,7 @@ func New(options ...Option) (*Webhook, error) { // Parse verifies and parses the events specified and returns the payload object or an error func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) { defer func() { - _, _ = io.Copy(ioutil.Discard, r.Body) + _, _ = io.Copy(io.Discard, r.Body) _ = r.Body.Close() }() @@ -131,7 +130,7 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) gitLabEvent := Event(event) - payload, err := ioutil.ReadAll(r.Body) + payload, err := io.ReadAll(r.Body) if err != nil || len(payload) == 0 { return nil, ErrParsingPayload } diff --git a/go.mod b/go.mod index 89b485e..bb0fa5a 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,14 @@ module github.com/go-playground/webhooks/v6 -go 1.15 +go 1.17 require ( github.com/gogits/go-gogs-client v0.0.0-20200905025246-8bb8a50cb355 github.com/stretchr/testify v1.6.1 ) + +require ( + github.com/davecgh/go-spew v1.1.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect +) diff --git a/gogs/gogs.go b/gogs/gogs.go index 9575c22..40fdd27 100644 --- a/gogs/gogs.go +++ b/gogs/gogs.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" "crypto/hmac" @@ -77,7 +76,7 @@ func New(options ...Option) (*Webhook, error) { // Parse verifies and parses the events specified and returns the payload object or an error func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) { defer func() { - _, _ = io.Copy(ioutil.Discard, r.Body) + _, _ = io.Copy(io.Discard, r.Body) _ = r.Body.Close() }() @@ -107,7 +106,7 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error) return nil, ErrEventNotFound } - payload, err := ioutil.ReadAll(r.Body) + payload, err := io.ReadAll(r.Body) if err != nil || len(payload) == 0 { return nil, ErrParsingPayload }