diff --git a/.circleci/config.yml b/.circleci/config.yml index ed522bee6..c4b0feb58 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,66 +1,32 @@ -common: - godel-cache: - key: &godel-cache-key v1-godel-cache-{{ checksum "godelw" }}-{{ checksum "godel/config/godel.yml" }} - <<: &restore-godel-cache - restore_cache: - keys: - - *godel-cache-key - <<: &save-godel-cache - save_cache: - key: *godel-cache-key - paths: - - ~/.godel +owner-repo: &owner-repo + owner-repo: palantir/go-githubapp - vendor-cache: - key: &vendor-cache-key v1-vendor-cache-{{ checksum "Gopkg.lock" }} - <<: &restore-vendor-cache - restore_cache: - keys: - - *vendor-cache-key - <<: &save-vendor-cache - save_cache: - key: *vendor-cache-key - paths: - - vendor +excutor: &executor + executor: + name: go/darwin-linux-no-cgo + version: 1.14-java-11-t41 + <<: *owner-repo - test-results: - dir: &results-dir /tmp/test-results - <<: &store-results - store_test_results: - path: *results-dir - <<: &store-artifacts - store_artifacts: - path: *results-dir - destination: test-results +version: 2.1 -### Jobs ### +orbs: + go: palantir/go@0.0.18 + godel: palantir/godel@0.0.18 -version: 2 -jobs: - verify: - working_directory: /go/src/github.com/palantir/go-githubapp - environment: - TESTS_DIR: *results-dir - docker: - - image: circleci/golang:1.13.4-stretch - steps: - - checkout - - *restore-godel-cache - - run: ./godelw version - - *save-godel-cache - - *restore-vendor-cache - - run: ./godelw run-dep -- ensure -vendor-only - - *save-vendor-cache - - run: mkdir -p "${TESTS_DIR}" - - run: ./godelw verify --apply=false --junit-output="$TESTS_DIR/$CIRCLE_PROJECT_REPONAME-tests.xml" - - *store-results - - *store-artifacts - -### Workflows ### +all-tags-filter: &all-tags-filter + filters: + tags: + only: /.*/ workflows: version: 2 - build: + verify-test: jobs: - - verify: - filters: { tags: { only: /.*/ } } + - godel/verify: + name: verify + <<: *executor + <<: *all-tags-filter + - godel/test: + name: test + <<: *executor + <<: *all-tags-filter diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 0316d3c04..000000000 --- a/Gopkg.lock +++ /dev/null @@ -1,238 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:52a8efd8a7ddb4a3e0144541474335359f49836de8daf56b6ba0dd9c047d3d9b" - name = "github.com/alexedwards/scs" - packages = [ - ".", - "stores/cookiestore", - ] - pruneopts = "NUT" - revision = "cfcbf41460ffe695c7d52159fbff3393c646c8f0" - version = "v1.4.1" - -[[projects]] - branch = "master" - digest = "1:dd49560573b3eeb2993a036b2dfebf301b7ed2c9220a77322b0747f0257cebdc" - name = "github.com/bluekeyes/hatpear" - packages = ["."] - pruneopts = "NUT" - revision = "ffb42d5bb417aa8e12b3b7ff73d028b915dafa10" - -[[projects]] - digest = "1:865288d7763eb3e45c4ba1bfde3537f50b30b7b827d32177fd80416e959b6c8d" - name = "github.com/bradleyfalzon/ghinstallation" - packages = ["."] - pruneopts = "NUT" - revision = "7bdf9f8bf3828df62ed87398508beee1a22a34b1" - version = "v0.1.3" - -[[projects]] - digest = "1:7a6852b35eb5bbc184561443762d225116ae630c26a7c4d90546619f1e7d2ad2" - name = "github.com/dgrijalva/jwt-go" - packages = ["."] - pruneopts = "NUT" - revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" - version = "v3.2.0" - -[[projects]] - digest = "1:91099c6f78b1e7bdf9ed06eb4cb7f017174293a3689d76b995a06f4c8d64a7f0" - name = "github.com/google/go-github" - packages = ["github"] - pruneopts = "NUT" - revision = "9686ff0746200cf521ce225525b421e13b4eac1a" - version = "v28.1.1" - -[[projects]] - digest = "1:a63cff6b5d8b95638bfe300385d93b2a6d9d687734b863da8e09dc834510a690" - name = "github.com/google/go-querystring" - packages = ["query"] - pruneopts = "NUT" - revision = "44c6ddd0a2342c386950e880b658017258da92fc" - version = "v1.0.0" - -[[projects]] - branch = "master" - digest = "1:a2b4fa8b538f6e42d0f38cbdef92e771072d7a64a97ff1512da95554ab2680a1" - name = "github.com/gregjones/httpcache" - packages = ["."] - pruneopts = "NUT" - revision = "901d90724c7919163f472a9812253fb26761123d" - -[[projects]] - digest = "1:ed860d2b2c1d066d36a89c982eefc7d019badd534f60e87ab65d3d94f0797ef0" - name = "github.com/hashicorp/golang-lru" - packages = [ - ".", - "simplelru", - ] - pruneopts = "NUT" - revision = "7f827b33c0f158ec5dfbba01bb0b14a4541fd81d" - version = "v0.5.3" - -[[projects]] - branch = "develop" - digest = "1:46ddf952419f5c8e972c60ad76794b6af1ac9a3e292908a114605a4be2515cff" - name = "github.com/palantir/go-baseapp" - packages = [ - "baseapp", - "pkg/errfmt", - ] - pruneopts = "NUT" - revision = "803ee911331685c77ef3087f8ed2b0feedac2771" - -[[projects]] - digest = "1:14715f705ff5dfe0ffd6571d7d201dd8e921030f8070321a79380d8ca4ec1a24" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "NUT" - revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4" - version = "v0.8.1" - -[[projects]] - branch = "master" - digest = "1:45226a195e0a8e8cb87bd1e1689bb85268ad59a423dd95ce4ed2d2381cf2b759" - name = "github.com/rcrowley/go-metrics" - packages = ["."] - pruneopts = "NUT" - revision = "cac0b30c2563378d434b5af411844adff8e32960" - -[[projects]] - digest = "1:0975c74a2cd70df6c2ae353c6283a25ce759dda7e1e706e5c07458baf3faca22" - name = "github.com/rs/xid" - packages = ["."] - pruneopts = "NUT" - revision = "15d26544def341f036c5f8dca987a4cbe575032c" - version = "v1.2.1" - -[[projects]] - digest = "1:ad98d64701633b49aa1df6d52a3c6426b2c5ddd6790fffff5f6c9a05b20e1537" - name = "github.com/rs/zerolog" - packages = [ - ".", - "hlog", - "internal/cbor", - "internal/json", - "log", - ] - pruneopts = "NUT" - revision = "7592fcbe604741a8d6044390c09d70c01569e1b3" - version = "v1.16.0" - -[[projects]] - branch = "master" - digest = "1:a42ecf585dcd53dbad216f9283092c5de9b25c3e1cf3cae8fb38de64d7061b4e" - name = "github.com/shurcooL/githubv4" - packages = ["."] - pruneopts = "NUT" - revision = "6d1ea27df5210159a4fb51d926b09feffed1bc77" - -[[projects]] - branch = "master" - digest = "1:ae48f0f40520744c5e6c603b61a16cfe0e4c778360fd53c7c8e2eeaa14b283c6" - name = "github.com/shurcooL/graphql" - packages = [ - ".", - "ident", - "internal/jsonutil", - ] - pruneopts = "NUT" - revision = "d48a9a75455f6af30244670bc0c9d0e38e7392b5" - -[[projects]] - digest = "1:f23222558887a5919f8e9021ecb205395de463f031dd0c049e6e8e547b57c3f4" - name = "github.com/zenazn/goji" - packages = ["web/mutil"] - pruneopts = "NUT" - revision = "64eb34159fe53473206c2b3e70fe396a639452f2" - version = "v1.0" - -[[projects]] - digest = "1:6fdeb16154fb0202be42be33e6f891dd768fe391dbc23cc8e18599c536e4c37f" - name = "goji.io" - packages = [ - ".", - "internal", - "pat", - "pattern", - ] - pruneopts = "NUT" - revision = "490b001d03d16a116d7c44d95d216c69a1aae798" - version = "v2.0.2" - -[[projects]] - branch = "master" - digest = "1:9ff9e02726d2ea057650cc827f1f808ee3ee15aba08f2d68800aa50d7a4e937a" - name = "golang.org/x/crypto" - packages = [ - "cast5", - "internal/subtle", - "nacl/secretbox", - "openpgp", - "openpgp/armor", - "openpgp/elgamal", - "openpgp/errors", - "openpgp/packet", - "openpgp/s2k", - "poly1305", - "salsa20/salsa", - ] - pruneopts = "NUT" - revision = "8986dd9e96cf0a6f74da406c005ba3df38527c04" - -[[projects]] - branch = "master" - digest = "1:7ccb2dbb79f60b4e530c7dc3a0b3681b3869cf7ea91c645735e4dd4e6e3264fd" - name = "golang.org/x/net" - packages = ["context/ctxhttp"] - pruneopts = "NUT" - revision = "fe3aa8a4527195a6057b3fad46619d7d090e99b5" - -[[projects]] - branch = "master" - digest = "1:f3a2e6d7423b8c19cdb2203cda9672900cc43012ea69f30ff6874dd453f44aec" - name = "golang.org/x/oauth2" - packages = [ - ".", - "internal", - ] - pruneopts = "NUT" - revision = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33" - -[[projects]] - branch = "master" - digest = "1:95abab3e07422980e85e253e49eb75c05c1dee6e84b50cb0d3353747ef8099eb" - name = "golang.org/x/sys" - packages = ["cpu"] - pruneopts = "NUT" - revision = "f43be2a4598cf3a47be9f94f0c28197ed9eae611" - -[[projects]] - digest = "1:accc3bfe4e404aa53ac3621470e7cf9fce1efe48f0fabcfe6d12a72579d9d91f" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "NUT" - revision = "f221b8435cfb71e54062f6c6e99e9ade30b124d5" - version = "v2.2.4" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/alexedwards/scs", - "github.com/bradleyfalzon/ghinstallation", - "github.com/google/go-github/github", - "github.com/gregjones/httpcache", - "github.com/hashicorp/golang-lru", - "github.com/palantir/go-baseapp/baseapp", - "github.com/pkg/errors", - "github.com/rcrowley/go-metrics", - "github.com/rs/zerolog", - "github.com/shurcooL/githubv4", - "goji.io/pat", - "golang.org/x/oauth2", - "gopkg.in/yaml.v2", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 774d39ee0..000000000 --- a/Gopkg.toml +++ /dev/null @@ -1,13 +0,0 @@ -ignored = [ - "google.golang.org/appengine/urlfetch", - "github.com/golang/protobuf/proto" -] - -[[constraint]] -name = "github.com/bradleyfalzon/ghinstallation" -version = "<1.0.0" - -[prune] - non-go = true - go-tests = true - unused-packages = true diff --git a/example/config.go b/example/config.go index 5f769b52e..5987976e8 100644 --- a/example/config.go +++ b/example/config.go @@ -18,10 +18,9 @@ import ( "io/ioutil" "github.com/palantir/go-baseapp/baseapp" + "github.com/palantir/go-githubapp/githubapp" "github.com/pkg/errors" "gopkg.in/yaml.v2" - - "github.com/palantir/go-githubapp/githubapp" ) type Config struct { diff --git a/example/issue_comment.go b/example/issue_comment.go index 07e5fae19..26c507b59 100644 --- a/example/issue_comment.go +++ b/example/issue_comment.go @@ -20,11 +20,10 @@ import ( "fmt" "strings" - "github.com/google/go-github/github" + "github.com/google/go-github/v30/github" + "github.com/palantir/go-githubapp/githubapp" "github.com/pkg/errors" "github.com/rs/zerolog" - - "github.com/palantir/go-githubapp/githubapp" ) type PRCommentHandler struct { diff --git a/example/main.go b/example/main.go index dad49e437..596c54aad 100644 --- a/example/main.go +++ b/example/main.go @@ -19,10 +19,9 @@ import ( "github.com/gregjones/httpcache" "github.com/palantir/go-baseapp/baseapp" + "github.com/palantir/go-githubapp/githubapp" "github.com/rs/zerolog" "goji.io/pat" - - "github.com/palantir/go-githubapp/githubapp" ) func main() { diff --git a/githubapp/caching_client_creator.go b/githubapp/caching_client_creator.go index 443808fe5..30df077cd 100644 --- a/githubapp/caching_client_creator.go +++ b/githubapp/caching_client_creator.go @@ -17,7 +17,7 @@ package githubapp import ( "fmt" - "github.com/google/go-github/github" + "github.com/google/go-github/v30/github" lru "github.com/hashicorp/golang-lru" "github.com/pkg/errors" "github.com/shurcooL/githubv4" diff --git a/githubapp/client_creator.go b/githubapp/client_creator.go index 6625b65ed..6ad516ec4 100644 --- a/githubapp/client_creator.go +++ b/githubapp/client_creator.go @@ -23,7 +23,7 @@ import ( "strings" "github.com/bradleyfalzon/ghinstallation" - "github.com/google/go-github/github" + "github.com/google/go-github/v30/github" "github.com/gregjones/httpcache" "github.com/pkg/errors" "github.com/shurcooL/githubv4" @@ -96,7 +96,7 @@ const installationKey = key("installationID") // NewClientCreator returns a ClientCreator that creates a GitHub client for // installations of the app specified by the provided arguments. -func NewClientCreator(v3BaseURL, v4BaseURL string, integrationID int, privKeyBytes []byte, opts ...ClientOption) ClientCreator { +func NewClientCreator(v3BaseURL, v4BaseURL string, integrationID int64, privKeyBytes []byte, opts ...ClientOption) ClientCreator { cc := &clientCreator{ v3BaseURL: v3BaseURL, v4BaseURL: v4BaseURL, @@ -121,7 +121,7 @@ func NewClientCreator(v3BaseURL, v4BaseURL string, integrationID int, privKeyByt type clientCreator struct { v3BaseURL string v4BaseURL string - integrationID int + integrationID int64 privKeyBytes []byte userAgent string middleware []ClientMiddleware @@ -202,7 +202,7 @@ func (c *clientCreator) NewAppV4Client() (*githubv4.Client, error) { func (c *clientCreator) NewInstallationClient(installationID int64) (*github.Client, error) { base := &http.Client{Transport: http.DefaultTransport} - installation, transportError := newInstallation(c.integrationID, int(installationID), c.privKeyBytes, c.v3BaseURL) + installation, transportError := newInstallation(c.integrationID, installationID, c.privKeyBytes, c.v3BaseURL) middleware := []ClientMiddleware{installation} if c.cacheFunc != nil { @@ -221,7 +221,7 @@ func (c *clientCreator) NewInstallationClient(installationID int64) (*github.Cli func (c *clientCreator) NewInstallationV4Client(installationID int64) (*githubv4.Client, error) { base := &http.Client{Transport: http.DefaultTransport} - installation, transportError := newInstallation(c.integrationID, int(installationID), c.privKeyBytes, c.v3BaseURL) + installation, transportError := newInstallation(c.integrationID, installationID, c.privKeyBytes, c.v3BaseURL) // The v4 API primarily uses POST requests (except for introspection queries) // which we cannot cache, so don't construct the middleware @@ -295,7 +295,7 @@ func applyMiddleware(base *http.Client, middleware [][]ClientMiddleware) { } } -func newAppInstallation(integrationID int, privKeyBytes []byte, v3BaseURL string) (ClientMiddleware, *error) { +func newAppInstallation(integrationID int64, privKeyBytes []byte, v3BaseURL string) (ClientMiddleware, *error) { var transportError error installation := func(next http.RoundTripper) http.RoundTripper { itr, err := ghinstallation.NewAppsTransport(next, integrationID, privKeyBytes) @@ -310,7 +310,7 @@ func newAppInstallation(integrationID int, privKeyBytes []byte, v3BaseURL string return installation, &transportError } -func newInstallation(integrationID, installationID int, privKeyBytes []byte, v3BaseURL string) (ClientMiddleware, *error) { +func newInstallation(integrationID, installationID int64, privKeyBytes []byte, v3BaseURL string) (ClientMiddleware, *error) { var transportError error installation := func(next http.RoundTripper) http.RoundTripper { itr, err := ghinstallation.New(next, integrationID, installationID, privKeyBytes) diff --git a/githubapp/config.go b/githubapp/config.go index 5892447ac..5e5e5eaa6 100644 --- a/githubapp/config.go +++ b/githubapp/config.go @@ -25,7 +25,7 @@ type Config struct { V4APIURL string `yaml:"v4_api_url" json:"v4ApiUrl"` App struct { - IntegrationID int `yaml:"integration_id" json:"integrationId"` + IntegrationID int64 `yaml:"integration_id" json:"integrationId"` WebhookSecret string `yaml:"webhook_secret" json:"webhookSecret"` PrivateKey string `yaml:"private_key" json:"privateKey"` } `yaml:"app" json:"app"` @@ -58,9 +58,9 @@ func setStringFromEnv(key, prefix string, value *string) { } } -func setIntFromEnv(key, prefix string, value *int) { +func setIntFromEnv(key, prefix string, value *int64) { if v, ok := os.LookupEnv(prefix + key); ok { - if i, err := strconv.Atoi(v); err == nil { + if i, err := strconv.ParseInt(v, 10, 0); err == nil { *value = i } } diff --git a/githubapp/context.go b/githubapp/context.go index 388db94f7..2df63904b 100644 --- a/githubapp/context.go +++ b/githubapp/context.go @@ -17,7 +17,7 @@ package githubapp import ( "context" - "github.com/google/go-github/github" + "github.com/google/go-github/v30/github" "github.com/rs/zerolog" ) diff --git a/githubapp/context_test.go b/githubapp/context_test.go index d39d84a50..deba05836 100644 --- a/githubapp/context_test.go +++ b/githubapp/context_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "github.com/google/go-github/github" + "github.com/google/go-github/v30/github" "github.com/rs/zerolog" ) diff --git a/githubapp/dispatcher.go b/githubapp/dispatcher.go index 6d5719d9c..cf28b9937 100644 --- a/githubapp/dispatcher.go +++ b/githubapp/dispatcher.go @@ -19,7 +19,7 @@ import ( "fmt" "net/http" - "github.com/google/go-github/github" + "github.com/google/go-github/v30/github" "github.com/pkg/errors" "github.com/rs/zerolog" ) diff --git a/githubapp/installations.go b/githubapp/installations.go index db8e70293..d96d027ad 100644 --- a/githubapp/installations.go +++ b/githubapp/installations.go @@ -19,7 +19,7 @@ import ( "fmt" "net/http" - "github.com/google/go-github/github" + "github.com/google/go-github/v30/github" "github.com/pkg/errors" ) diff --git a/go.mod b/go.mod new file mode 100644 index 000000000..db1d4a955 --- /dev/null +++ b/go.mod @@ -0,0 +1,21 @@ +module github.com/palantir/go-githubapp + +go 1.13 + +require ( + github.com/alexedwards/scs v1.4.1 + github.com/bradleyfalzon/ghinstallation v1.1.1 + github.com/google/go-github/v29 v29.0.3 // indirect + github.com/google/go-github/v30 v30.1.0 + github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 + github.com/hashicorp/golang-lru v0.5.4 + github.com/palantir/go-baseapp v0.2.0 + github.com/pkg/errors v0.9.1 + github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 + github.com/rs/zerolog v1.18.0 + github.com/shurcooL/githubv4 v0.0.0-20191127044304-8f68eb5628d0 + github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect + goji.io v2.0.2+incompatible + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d + gopkg.in/yaml.v2 v2.2.8 +) diff --git a/go.sum b/go.sum new file mode 100644 index 000000000..59b473b8e --- /dev/null +++ b/go.sum @@ -0,0 +1,98 @@ +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/DataDog/datadog-go v0.0.0-20180330214955-e67964b4021a/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/alexedwards/scs v1.4.1 h1:/5L5a07IlqApODcEfZyMsu8Smd1S7Q4nBjEyKxIRTp0= +github.com/alexedwards/scs v1.4.1/go.mod h1:JRIFiXthhMSivuGbxpzUa0/hT5rz2hpyw61Bmd+S1bg= +github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= +github.com/bluekeyes/hatpear v0.0.0-20180714193905-ffb42d5bb417 h1:8rYOiy08UqIuWFJrC+d6xKFbcRXlxacWKzi1Ttt2sPc= +github.com/bluekeyes/hatpear v0.0.0-20180714193905-ffb42d5bb417/go.mod h1:D+WOahrNtu6OK0KiVoXY9h5j7IcEs5LYke+zJkMBsKg= +github.com/bradleyfalzon/ghinstallation v1.1.1 h1:pmBXkxgM1WeF8QYvDLT5kuQiHMcmf+X015GI0KM/E3I= +github.com/bradleyfalzon/ghinstallation v1.1.1/go.mod h1:vyCmHTciHx/uuyN82Zc3rXN3X2KTK8nUTCrTMwAhcug= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da/go.mod h1:+rmNIXRvYMqLQeR4DHyTvs6y0MEMymTz4vyFpFkKTPs= +github.com/crewjam/saml v0.3.2-0.20191206212704-861266e3a689/go.mod h1:fxbjgoFRea91JEzfcATb14uB+XPW1H88n0feRzehDeg= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9/go.mod h1:GgB8SF9nRG+GqaDtLcwJZsQFhcogVCJ79j4EdT0c2V4= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-github/v29 v29.0.2/go.mod h1:CHKiKKPHJ0REzfwc14QMklvtHwCveD0PxlMjLlzAM5E= +github.com/google/go-github/v29 v29.0.3 h1:IktKCTwU//aFHnpA+2SLIi7Oo9uhAzgsdZNbcAqhgdc= +github.com/google/go-github/v29 v29.0.3/go.mod h1:CHKiKKPHJ0REzfwc14QMklvtHwCveD0PxlMjLlzAM5E= +github.com/google/go-github/v30 v30.1.0 h1:VLDx+UolQICEOKu2m4uAoMti1SxuEBAl7RSEG16L+Oo= +github.com/google/go-github/v30 v30.1.0/go.mod h1:n8jBpHl45a/rlBUtRJMOG4GhNADUQFEufcolZ95JfU8= +github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/palantir/go-baseapp v0.2.0 h1:EruWj7lBB7koSLuUjWRvNoIXdmowmLGj+rqiuoTnjgs= +github.com/palantir/go-baseapp v0.2.0/go.mod h1:7rEjgYzWbHLLuY+mV2iJthxTddEc6aO+kFYsjDKNmEs= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rcrowley/go-metrics v0.0.0-20180503174638-e2704e165165/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ= +github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.9.1/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= +github.com/rs/zerolog v1.18.0 h1:CbAm3kP2Tptby1i9sYy2MGRg0uxIN9cyDb59Ys7W8z8= +github.com/rs/zerolog v1.18.0/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= +github.com/russellhaering/goxmldsig v0.0.0-20180430223755-7acd5e4a6ef7/go.mod h1:Oz4y6ImuOQZxynhbSXk7btjEfNBtGlj2dcaOvXl2FSM= +github.com/shurcooL/githubv4 v0.0.0-20191127044304-8f68eb5628d0 h1:T9uus1QvcPgeLShS30YOnnzk3r9Vvygp45muhlrufgY= +github.com/shurcooL/githubv4 v0.0.0-20191127044304-8f68eb5628d0/go.mod h1:hAF0iLZy4td2EX+/8Tw+4nodhlMrwN3HupfaXj3zkGo= +github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f h1:tygelZueB1EtXkPI6mQ4o9DQ0+FKW41hTbunoXZCTqk= +github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f/go.mod h1:AuYgA5Kyo4c7HfUmvRGs/6rGlMMV/6B1bVnB9JxJEEg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +github.com/zenazn/goji v0.9.1-0.20160507202103-64eb34159fe5 h1:mXV20Aj/BdWrlVzIn1kXFa+Tq62INlUi0cFFlztTaK0= +github.com/zenazn/goji v0.9.1-0.20160507202103-64eb34159fe5/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +goji.io v2.0.0+incompatible/go.mod h1:sbqFwrtqZACxLBTQcdgVjFh54yGVCvwq8+w49MVMMIk= +goji.io v2.0.2+incompatible h1:uIssv/elbKRLznFUy3Xj4+2Mz/qKhek/9aZQDUMae7c= +goji.io v2.0.2+incompatible/go.mod h1:sbqFwrtqZACxLBTQcdgVjFh54yGVCvwq8+w49MVMMIk= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= +golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc h1:c0o/qxkaO2LF5t6fQrT4b5hzyggAkLLlCUjqfRxd8Q4= +golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69 h1:rOhMmluY6kLMhdnrivzec6lLgaVbMHMn2ISQXJeJ5EM= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/godel/config/godel.yml b/godel/config/godel.yml index 33deb7330..67bf94956 100644 --- a/godel/config/godel.yml +++ b/godel/config/godel.yml @@ -1,12 +1,14 @@ plugins: resolvers: - - https://palantir.bintray.com/releases/{{GroupPath}}/{{Product}}/{{Version}}/{{Product}}-{{Version}}-{{OS}}-{{Arch}}.tgz + - "https://palantir.bintray.com/releases/{{GroupPath}}/{{Product}}/{{Version}}/{{Product}}-{{Version}}-{{OS}}-{{Arch}}.tgz" plugins: - locator: - id: "com.palantir.godel-dep-plugin:dep-plugin:1.1.0" + id: com.palantir.godel-mod-plugin:mod-plugin:1.0.1 checksums: - darwin-amd64: 946b0def510a7e94b46bb635a67f00c05243505e2a2ef9b0b7dab45b0437be1f - linux-amd64: cc2729e7f25c0121f841e237238c11514ee4c1376c458a1c4997ee86de17b209 + darwin-amd64: df22922bacfe4e4e7c255607a0aace176205f04ae001f3746276fcfab1780e01 + linux-amd64: a2697b3d504bb37c2fd8831a66c7014927a6d94e4dfb9765b4764354370a1ab6 +environment: + GO111MODULE: "on" exclude: names: - "\\..+" diff --git a/oauth2/github.go b/oauth2/github.go index 93513efb7..b447dbca5 100644 --- a/oauth2/github.go +++ b/oauth2/github.go @@ -17,9 +17,8 @@ package oauth2 import ( "strings" - "golang.org/x/oauth2" - "github.com/palantir/go-githubapp/githubapp" + "golang.org/x/oauth2" ) const (