diff --git a/go.mod b/go.mod index 611a6917..a416af7f 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/drone/envsubst v1.0.1 github.com/drone/go-license v1.0.2 github.com/drone/go-login v1.0.4-0.20190311170324-2a4df4f242a2 - github.com/drone/go-scm v1.5.1-0.20190714160251-dee92a80f783 + github.com/drone/go-scm v1.5.1-0.20190718235211-75d6480d5332 github.com/drone/signal v1.0.0 github.com/dustin/go-humanize v1.0.0 github.com/ghodss/yaml v1.0.0 diff --git a/go.sum b/go.sum index 5c8caf25..91aa4a0b 100644 --- a/go.sum +++ b/go.sum @@ -109,6 +109,8 @@ github.com/drone/go-scm v1.5.0 h1:Hn3bFYsUgOEUCx2wt2II9CxkTfev2h+tPheuYHp7ehg= github.com/drone/go-scm v1.5.0/go.mod h1:YT4FxQ3U/ltdCrBJR9B0tRpJ1bYA/PM3NyaLE/rYIvw= github.com/drone/go-scm v1.5.1-0.20190714160251-dee92a80f783 h1:dA3FngN241oZKI+PAjMdKX22nT8giYMlOY0JIt/qH/Y= github.com/drone/go-scm v1.5.1-0.20190714160251-dee92a80f783/go.mod h1:YT4FxQ3U/ltdCrBJR9B0tRpJ1bYA/PM3NyaLE/rYIvw= +github.com/drone/go-scm v1.5.1-0.20190718235211-75d6480d5332 h1:QdYrRquj9e0sidvgjwYGdK4OB0WyQY6j5msjZ9sLUX8= +github.com/drone/go-scm v1.5.1-0.20190718235211-75d6480d5332/go.mod h1:YT4FxQ3U/ltdCrBJR9B0tRpJ1bYA/PM3NyaLE/rYIvw= github.com/drone/signal v1.0.0 h1:NrnM2M/4yAuU/tXs6RP1a1ZfxnaHwYkd0kJurA1p6uI= github.com/drone/signal v1.0.0/go.mod h1:S8t92eFT0g4WUgEc/LxG+LCuiskpMNsG0ajAMGnyZpc= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= @@ -160,8 +162,6 @@ github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uP github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-retryablehttp v0.0.0-20180718195005-e651d75abec6 h1:qCv4319q2q7XKn0MQbi8p37hsJ+9Xo8e6yojA73JVxk= github.com/hashicorp/go-retryablehttp v0.0.0-20180718195005-e651d75abec6/go.mod h1:fXcdFsQoipQa7mwORhKad5jmDCeSy/RCGzWA08PO0lM= -github.com/hashicorp/go-rootcerts v1.0.0 h1:ueI78wUjYExhCvMLow4icJnayNNFRgy0d9EGs/a1T44= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/nomad v0.0.0-20190125003214-134391155854 h1:L7WhLZt2ory/kQWxqkMwOiBpIoa4BWoadN7yx8LHEtk= diff --git a/service/hook/hook.go b/service/hook/hook.go index 176aaa01..eb464191 100644 --- a/service/hook/hook.go +++ b/service/hook/hook.go @@ -49,6 +49,7 @@ func (s *service) Create(ctx context.Context, user *core.User, repo *core.Reposi Secret: repo.Signer, Events: scm.HookEvents{ Branch: true, + Deployment: true, PullRequest: true, Push: true, Tag: true, diff --git a/service/hook/hook_test.go b/service/hook/hook_test.go index f92fb403..10bf069b 100644 --- a/service/hook/hook_test.go +++ b/service/hook/hook_test.go @@ -8,9 +8,9 @@ import ( "context" "testing" + "github.com/drone/drone/core" "github.com/drone/drone/mock" "github.com/drone/drone/mock/mockscm" - "github.com/drone/drone/core" "github.com/drone/go-scm/scm" "github.com/golang/mock/gomock" @@ -37,6 +37,7 @@ func TestCreate(t *testing.T) { Secret: "abc123", Events: scm.HookEvents{ Branch: true, + Deployment: true, PullRequest: true, Push: true, Tag: true, diff --git a/service/hook/parser/parse.go b/service/hook/parser/parse.go index 7bc67c2a..dcaf04cf 100644 --- a/service/hook/parser/parse.go +++ b/service/hook/parser/parse.go @@ -251,6 +251,7 @@ func (p *parser) Parse(req *http.Request, secretFunc func(string) string) (*core Timestamp: v.PullRequest.Created.Unix(), Title: v.PullRequest.Title, Message: v.PullRequest.Body, + Before: v.PullRequest.Base.Sha, After: v.PullRequest.Sha, Ref: v.PullRequest.Ref, Fork: v.PullRequest.Fork,