From 94e1a9b6261066d485929b0fa2634f51071c4d15 Mon Sep 17 00:00:00 2001 From: krrrr38 Date: Tue, 31 Jan 2023 12:15:43 +0900 Subject: [PATCH] fix(deps): update module github.com/google/go-github/v49 to v50 --- e2e/e2e.go | 2 +- e2e/github.go | 2 +- e2e/go.mod | 6 +++++- e2e/go.sum | 19 +++++++++++++++++-- e2e/main.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- .../controllers/events/events_controller.go | 2 +- .../events/events_controller_e2e_test.go | 2 +- .../events/github_request_validator.go | 2 +- server/events/apply_command_runner_test.go | 2 +- server/events/command_runner.go | 2 +- server/events/command_runner_test.go | 2 +- server/events/event_parser.go | 2 +- server/events/event_parser_test.go | 2 +- .../ptr_to_github_issuecommentevent.go | 2 +- .../matchers/ptr_to_github_pullrequest.go | 2 +- .../ptr_to_github_pullrequestevent.go | 2 +- .../matchers/ptr_to_github_repository.go | 2 +- server/events/mocks/mock_event_parsing.go | 2 +- .../events/mocks/mock_github_pull_getter.go | 2 +- server/events/vcs/github_client.go | 4 ++-- server/events/vcs/github_credentials.go | 2 +- server/events/vcs/instrumented_client.go | 2 +- .../matchers/ptr_to_github_pullrequest.go | 2 +- .../mocks/mock_github_pull_request_getter.go | 2 +- server/events/vcs/testdata/fixtures.go | 2 +- testdrive/github.go | 2 +- testdrive/testdrive.go | 2 +- 29 files changed, 51 insertions(+), 32 deletions(-) diff --git a/e2e/e2e.go b/e2e/e2e.go index 1f1719392f..38230ac955 100644 --- a/e2e/e2e.go +++ b/e2e/e2e.go @@ -20,7 +20,7 @@ import ( "os/exec" "time" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" ) type E2ETester struct { diff --git a/e2e/github.go b/e2e/github.go index 37593baf4a..2fa87456d8 100644 --- a/e2e/github.go +++ b/e2e/github.go @@ -16,7 +16,7 @@ package main import ( "context" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" ) type GithubClient struct { diff --git a/e2e/go.mod b/e2e/go.mod index 3415d63c76..793dcef958 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -3,12 +3,16 @@ module github.com/runatlantis/atlantis/e2e go 1.19 require ( - github.com/google/go-github/v49 v49.1.0 + github.com/google/go-github/v50 v50.0.0 github.com/hashicorp/go-multierror v1.1.1 ) require ( + github.com/golang/protobuf v1.3.2 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect golang.org/x/crypto v0.1.0 // indirect + golang.org/x/net v0.1.0 // indirect + golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be // indirect + google.golang.org/appengine v1.6.7 // indirect ) diff --git a/e2e/go.sum b/e2e/go.sum index 7c1de8d47f..7d89303e9b 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -1,7 +1,10 @@ +github.com/golang/protobuf v1.3.1/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.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-github/v49 v49.1.0 h1:LFkMgawGQ8dfzWLH/rNE0b3u1D3n6/dw7ZmrN3b+YFY= -github.com/google/go-github/v49 v49.1.0/go.mod h1:MUUzHPrhGniB6vUKa27y37likpipzG+BXXJbG04J334= +github.com/google/go-github/v50 v50.0.0 h1:gdO1AeuSZZK4iYWwVbjni7zg8PIQhp7QfmPunr016Jk= +github.com/google/go-github/v50 v50.0.0/go.mod h1:Ev4Tre8QoKiolvbpOSG3FIi4Mlon3S2Nt9W5JYqKiwA= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -9,6 +12,18 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= diff --git a/e2e/main.go b/e2e/main.go index 81c01488a4..930dd16310 100644 --- a/e2e/main.go +++ b/e2e/main.go @@ -21,7 +21,7 @@ import ( "fmt" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" multierror "github.com/hashicorp/go-multierror" ) diff --git a/go.mod b/go.mod index a8f9889ccd..40f20b57d6 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/go-redis/redis/v9 v9.0.0-rc.2 github.com/go-test/deep v1.1.0 github.com/golang-jwt/jwt/v4 v4.4.3 - github.com/google/go-github/v49 v49.1.0 + github.com/google/go-github/v50 v50.0.0 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 diff --git a/go.sum b/go.sum index e757bf8911..dfbaa69527 100644 --- a/go.sum +++ b/go.sum @@ -189,8 +189,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-github/v45 v45.2.0 h1:5oRLszbrkvxDDqBCNj2hjDZMKmvexaZ1xw/FCD+K3FI= github.com/google/go-github/v45 v45.2.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMenWWTrd8jrta28= -github.com/google/go-github/v49 v49.1.0 h1:LFkMgawGQ8dfzWLH/rNE0b3u1D3n6/dw7ZmrN3b+YFY= -github.com/google/go-github/v49 v49.1.0/go.mod h1:MUUzHPrhGniB6vUKa27y37likpipzG+BXXJbG04J334= +github.com/google/go-github/v50 v50.0.0 h1:gdO1AeuSZZK4iYWwVbjni7zg8PIQhp7QfmPunr016Jk= +github.com/google/go-github/v50 v50.0.0/go.mod h1:Ev4Tre8QoKiolvbpOSG3FIi4Mlon3S2Nt9W5JYqKiwA= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= diff --git a/server/controllers/events/events_controller.go b/server/controllers/events/events_controller.go index cac313b874..34fcf05f33 100644 --- a/server/controllers/events/events_controller.go +++ b/server/controllers/events/events_controller.go @@ -19,7 +19,7 @@ import ( "net/http" "strings" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" "github.com/mcdafydd/go-azuredevops/azuredevops" "github.com/microcosm-cc/bluemonday" "github.com/pkg/errors" diff --git a/server/controllers/events/events_controller_e2e_test.go b/server/controllers/events/events_controller_e2e_test.go index c00abec00a..19dc70c076 100644 --- a/server/controllers/events/events_controller_e2e_test.go +++ b/server/controllers/events/events_controller_e2e_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" "github.com/hashicorp/go-version" . "github.com/petergtz/pegomock" diff --git a/server/controllers/events/github_request_validator.go b/server/controllers/events/github_request_validator.go index 38fab2ce2e..05cf68c12e 100644 --- a/server/controllers/events/github_request_validator.go +++ b/server/controllers/events/github_request_validator.go @@ -19,7 +19,7 @@ import ( "io" "net/http" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" ) //go:generate pegomock generate -m --package mocks -o mocks/mock_github_request_validator.go GithubRequestValidator diff --git a/server/events/apply_command_runner_test.go b/server/events/apply_command_runner_test.go index f6ff1a21de..5d461d2db8 100644 --- a/server/events/apply_command_runner_test.go +++ b/server/events/apply_command_runner_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" . "github.com/petergtz/pegomock" "github.com/runatlantis/atlantis/server/core/db" "github.com/runatlantis/atlantis/server/core/locking" diff --git a/server/events/command_runner.go b/server/events/command_runner.go index c9925b4dc5..9e8bfc77fa 100644 --- a/server/events/command_runner.go +++ b/server/events/command_runner.go @@ -17,7 +17,7 @@ import ( "fmt" "strconv" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" "github.com/mcdafydd/go-azuredevops/azuredevops" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/core/config/valid" diff --git a/server/events/command_runner_test.go b/server/events/command_runner_test.go index b30bbd91c8..0e33276832 100644 --- a/server/events/command_runner_test.go +++ b/server/events/command_runner_test.go @@ -28,7 +28,7 @@ import ( "github.com/runatlantis/atlantis/server/logging" "github.com/runatlantis/atlantis/server/metrics" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" . "github.com/petergtz/pegomock" lockingmocks "github.com/runatlantis/atlantis/server/core/locking/mocks" "github.com/runatlantis/atlantis/server/events" diff --git a/server/events/event_parser.go b/server/events/event_parser.go index a4f3c55bee..08f1330dce 100644 --- a/server/events/event_parser.go +++ b/server/events/event_parser.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/go-playground/validator/v10" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" "github.com/mcdafydd/go-azuredevops/azuredevops" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events/command" diff --git a/server/events/event_parser_test.go b/server/events/event_parser_test.go index 7062f4961a..4675807d53 100644 --- a/server/events/event_parser_test.go +++ b/server/events/event_parser_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" "github.com/mcdafydd/go-azuredevops/azuredevops" "github.com/mohae/deepcopy" "github.com/runatlantis/atlantis/server/events" diff --git a/server/events/mocks/matchers/ptr_to_github_issuecommentevent.go b/server/events/mocks/matchers/ptr_to_github_issuecommentevent.go index a3dd4fe25a..b8029aea03 100644 --- a/server/events/mocks/matchers/ptr_to_github_issuecommentevent.go +++ b/server/events/mocks/matchers/ptr_to_github_issuecommentevent.go @@ -5,7 +5,7 @@ import ( "github.com/petergtz/pegomock" "reflect" - github "github.com/google/go-github/v49/github" + github "github.com/google/go-github/v50/github" ) func AnyPtrToGithubIssueCommentEvent() *github.IssueCommentEvent { diff --git a/server/events/mocks/matchers/ptr_to_github_pullrequest.go b/server/events/mocks/matchers/ptr_to_github_pullrequest.go index 67d19fbaa9..f0debd2389 100644 --- a/server/events/mocks/matchers/ptr_to_github_pullrequest.go +++ b/server/events/mocks/matchers/ptr_to_github_pullrequest.go @@ -5,7 +5,7 @@ import ( "github.com/petergtz/pegomock" "reflect" - github "github.com/google/go-github/v49/github" + github "github.com/google/go-github/v50/github" ) func AnyPtrToGithubPullRequest() *github.PullRequest { diff --git a/server/events/mocks/matchers/ptr_to_github_pullrequestevent.go b/server/events/mocks/matchers/ptr_to_github_pullrequestevent.go index 2c5b8f0368..0542bf45fd 100644 --- a/server/events/mocks/matchers/ptr_to_github_pullrequestevent.go +++ b/server/events/mocks/matchers/ptr_to_github_pullrequestevent.go @@ -5,7 +5,7 @@ import ( "github.com/petergtz/pegomock" "reflect" - github "github.com/google/go-github/v49/github" + github "github.com/google/go-github/v50/github" ) func AnyPtrToGithubPullRequestEvent() *github.PullRequestEvent { diff --git a/server/events/mocks/matchers/ptr_to_github_repository.go b/server/events/mocks/matchers/ptr_to_github_repository.go index d1fe8c0e72..627f21244c 100644 --- a/server/events/mocks/matchers/ptr_to_github_repository.go +++ b/server/events/mocks/matchers/ptr_to_github_repository.go @@ -5,7 +5,7 @@ import ( "github.com/petergtz/pegomock" "reflect" - github "github.com/google/go-github/v49/github" + github "github.com/google/go-github/v50/github" ) func AnyPtrToGithubRepository() *github.Repository { diff --git a/server/events/mocks/mock_event_parsing.go b/server/events/mocks/mock_event_parsing.go index 93a4bc347d..3f80b81c8d 100644 --- a/server/events/mocks/mock_event_parsing.go +++ b/server/events/mocks/mock_event_parsing.go @@ -4,7 +4,7 @@ package mocks import ( - github "github.com/google/go-github/v49/github" + github "github.com/google/go-github/v50/github" azuredevops "github.com/mcdafydd/go-azuredevops/azuredevops" pegomock "github.com/petergtz/pegomock" models "github.com/runatlantis/atlantis/server/events/models" diff --git a/server/events/mocks/mock_github_pull_getter.go b/server/events/mocks/mock_github_pull_getter.go index b00daf031c..fac8766b34 100644 --- a/server/events/mocks/mock_github_pull_getter.go +++ b/server/events/mocks/mock_github_pull_getter.go @@ -4,7 +4,7 @@ package mocks import ( - github "github.com/google/go-github/v49/github" + github "github.com/google/go-github/v50/github" pegomock "github.com/petergtz/pegomock" models "github.com/runatlantis/atlantis/server/events/models" "reflect" diff --git a/server/events/vcs/github_client.go b/server/events/vcs/github_client.go index 40a293a4cb..7287913436 100644 --- a/server/events/vcs/github_client.go +++ b/server/events/vcs/github_client.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events/command" "github.com/runatlantis/atlantis/server/events/models" @@ -330,7 +330,7 @@ func (g *GithubClient) PullIsApproved(repo models.Repo, pull models.PullRequest) return models.ApprovalStatus{ IsApproved: true, ApprovedBy: *review.User.Login, - Date: *review.SubmittedAt, + Date: review.SubmittedAt.Time, }, nil } } diff --git a/server/events/vcs/github_credentials.go b/server/events/vcs/github_credentials.go index f1044517ea..8e4e0b2a96 100644 --- a/server/events/vcs/github_credentials.go +++ b/server/events/vcs/github_credentials.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/bradleyfalzon/ghinstallation/v2" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" "github.com/pkg/errors" ) diff --git a/server/events/vcs/instrumented_client.go b/server/events/vcs/instrumented_client.go index 78dc1ef1cc..e09ab6c257 100644 --- a/server/events/vcs/instrumented_client.go +++ b/server/events/vcs/instrumented_client.go @@ -4,7 +4,7 @@ import ( "fmt" "strconv" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/logging" "github.com/runatlantis/atlantis/server/metrics" diff --git a/server/events/vcs/mocks/matchers/ptr_to_github_pullrequest.go b/server/events/vcs/mocks/matchers/ptr_to_github_pullrequest.go index 67d19fbaa9..f0debd2389 100644 --- a/server/events/vcs/mocks/matchers/ptr_to_github_pullrequest.go +++ b/server/events/vcs/mocks/matchers/ptr_to_github_pullrequest.go @@ -5,7 +5,7 @@ import ( "github.com/petergtz/pegomock" "reflect" - github "github.com/google/go-github/v49/github" + github "github.com/google/go-github/v50/github" ) func AnyPtrToGithubPullRequest() *github.PullRequest { diff --git a/server/events/vcs/mocks/mock_github_pull_request_getter.go b/server/events/vcs/mocks/mock_github_pull_request_getter.go index 103b68f1ce..35ca767e8f 100644 --- a/server/events/vcs/mocks/mock_github_pull_request_getter.go +++ b/server/events/vcs/mocks/mock_github_pull_request_getter.go @@ -4,7 +4,7 @@ package mocks import ( - github "github.com/google/go-github/v49/github" + github "github.com/google/go-github/v50/github" pegomock "github.com/petergtz/pegomock" models "github.com/runatlantis/atlantis/server/events/models" "reflect" diff --git a/server/events/vcs/testdata/fixtures.go b/server/events/vcs/testdata/fixtures.go index 21195babe6..2aabdce142 100644 --- a/server/events/vcs/testdata/fixtures.go +++ b/server/events/vcs/testdata/fixtures.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/golang-jwt/jwt/v4" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" "github.com/mcdafydd/go-azuredevops/azuredevops" ) diff --git a/testdrive/github.go b/testdrive/github.go index 3b3bbde195..cc5c8fe2bd 100644 --- a/testdrive/github.go +++ b/testdrive/github.go @@ -18,7 +18,7 @@ import ( "strings" "time" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" ) var githubUsername string diff --git a/testdrive/testdrive.go b/testdrive/testdrive.go index bb3515a860..a1c999b4c9 100644 --- a/testdrive/testdrive.go +++ b/testdrive/testdrive.go @@ -31,7 +31,7 @@ import ( "time" "github.com/briandowns/spinner" - "github.com/google/go-github/v49/github" + "github.com/google/go-github/v50/github" "github.com/mitchellh/colorstring" "github.com/pkg/errors" )