From d4ea5db099e7c8097e105f763a792a82db151b7d Mon Sep 17 00:00:00 2001 From: Joe Kutner Date: Mon, 25 Oct 2021 09:05:02 -0500 Subject: [PATCH] Upgrade go-github to v39, and golang to 1.17 Signed-off-by: Joe Kutner --- .gitignore | 1 + Dockerfile | 2 +- go.mod | 30 +++++++++++++++++-- go.sum | 14 +++++---- registry/add-entry/add_entry.go | 2 +- registry/add-entry/add_entry_test.go | 2 +- registry/add-entry/cmd/main.go | 2 +- registry/compute-metadata/compute_metadata.go | 2 +- .../compute-metadata/compute_metadata_test.go | 2 +- .../index/wait_for_completion_test.go | 2 +- .../internal/services/mock_issues_service.go | 2 +- .../services/mock_organizations_service.go | 2 +- .../services/mock_repositories_service.go | 2 +- registry/internal/services/services.go | 2 +- registry/request-add-entry/cmd/main.go | 2 +- .../request-add-entry/request_add_entry.go | 2 +- .../request_add_entry_test.go | 2 +- registry/request-yank-entry/cmd/main.go | 2 +- .../request-yank-entry/request_yank_entry.go | 2 +- .../request_yank_entry_test.go | 2 +- registry/verify-namespace-owner/cmd/main.go | 2 +- .../verify_namespace_owner.go | 2 +- .../verify_namespace_owner_test.go | 2 +- registry/yank-entry/cmd/main.go | 2 +- registry/yank-entry/yank_entry.go | 2 +- registry/yank-entry/yank_entry_test.go | 2 +- 26 files changed, 60 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 1f68983..acf72c8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +.idea/ diff --git a/Dockerfile b/Dockerfile index 75e9f79..67fb4e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15 as build-stage +FROM golang:1.17 as build-stage RUN apt-get update && apt-get install -y --no-install-recommends upx diff --git a/go.mod b/go.mod index fa806f9..c43ba09 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/buildpacks/github-actions -go 1.15 +go 1.17 require ( github.com/buildpacks/libcnb v1.21.0 github.com/google/go-containerregistry v0.6.0 - github.com/google/go-github/v32 v32.1.0 + github.com/google/go-github/v39 v39.2.0 github.com/onsi/gomega v1.16.0 github.com/pelletier/go-toml v1.9.4 github.com/sclevine/spec v1.4.0 @@ -13,3 +13,29 @@ require ( golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c gopkg.in/retry.v1 v1.0.3 ) + +require ( + github.com/BurntSushi/toml v0.3.1 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/docker/cli v20.10.7+incompatible // indirect + github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/docker/docker v20.10.7+incompatible // indirect + github.com/docker/docker-credential-helpers v0.6.3 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-querystring v1.1.0 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.0.1 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/sirupsen/logrus v1.8.1 // indirect + github.com/stretchr/objx v0.2.0 // indirect + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect + golang.org/x/text v0.3.6 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.26.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect +) diff --git a/go.sum b/go.sum index 3c56d2c..421e0f3 100644 --- a/go.sum +++ b/go.sum @@ -365,10 +365,10 @@ github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-containerregistry v0.6.0 h1:niQ+8XD//kKgArIFwDVBXsWVWbde16LPdHMyNwSC8h4= github.com/google/go-containerregistry v0.6.0/go.mod h1:euCCtNbZ6tKqi1E72vwDj2xZcN5ttKpZLfa/wSo5iLw= -github.com/google/go-github/v32 v32.1.0 h1:GWkQOdXqviCPx7Q7Fj+KyPoGm4SwHRh8rheoPhd27II= -github.com/google/go-github/v32 v32.1.0/go.mod h1:rIEpZD9CTDQwDK9GDrtMTycQNA4JU3qBsCizh3q2WCI= -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/google/go-github/v39 v39.2.0 h1:rNNM311XtPOz5rDdsJXAp2o8F67X9FnROXTvto3aSnQ= +github.com/google/go-github/v39 v39.2.0/go.mod h1:C1s8C5aCC9L+JXIYpJM5GYytdX52vC1bLvHEF1IhBrE= +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/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -739,8 +739,9 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -936,8 +937,9 @@ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644 h1:CA1DEQ4NdKphKeL70tvsWNdT5oFh1lOjihRcEDROi0I= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/registry/add-entry/add_entry.go b/registry/add-entry/add_entry.go index 374cfbc..e9638c0 100644 --- a/registry/add-entry/add_entry.go +++ b/registry/add-entry/add_entry.go @@ -21,7 +21,7 @@ import ( "fmt" "net/http" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" "gopkg.in/retry.v1" "github.com/buildpacks/github-actions/internal/toolkit" diff --git a/registry/add-entry/add_entry_test.go b/registry/add-entry/add_entry_test.go index 705f95e..f3d4543 100644 --- a/registry/add-entry/add_entry_test.go +++ b/registry/add-entry/add_entry_test.go @@ -23,7 +23,7 @@ import ( "path/filepath" "testing" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" . "github.com/onsi/gomega" "github.com/sclevine/spec" "github.com/sclevine/spec/report" diff --git a/registry/add-entry/cmd/main.go b/registry/add-entry/cmd/main.go index e089771..0cd57fa 100644 --- a/registry/add-entry/cmd/main.go +++ b/registry/add-entry/cmd/main.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" "golang.org/x/oauth2" "gopkg.in/retry.v1" diff --git a/registry/compute-metadata/compute_metadata.go b/registry/compute-metadata/compute_metadata.go index 47d2074..f687053 100644 --- a/registry/compute-metadata/compute_metadata.go +++ b/registry/compute-metadata/compute_metadata.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" "github.com/pelletier/go-toml" "github.com/buildpacks/github-actions/internal/toolkit" diff --git a/registry/compute-metadata/compute_metadata_test.go b/registry/compute-metadata/compute_metadata_test.go index 6b2db3e..e56089e 100644 --- a/registry/compute-metadata/compute_metadata_test.go +++ b/registry/compute-metadata/compute_metadata_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" . "github.com/onsi/gomega" "github.com/pelletier/go-toml" "github.com/sclevine/spec" diff --git a/registry/internal/index/wait_for_completion_test.go b/registry/internal/index/wait_for_completion_test.go index 138d002..2e727c7 100644 --- a/registry/internal/index/wait_for_completion_test.go +++ b/registry/internal/index/wait_for_completion_test.go @@ -19,7 +19,7 @@ package index_test import ( "testing" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" . "github.com/onsi/gomega" "github.com/sclevine/spec" "github.com/sclevine/spec/report" diff --git a/registry/internal/services/mock_issues_service.go b/registry/internal/services/mock_issues_service.go index 7e272ba..334513d 100644 --- a/registry/internal/services/mock_issues_service.go +++ b/registry/internal/services/mock_issues_service.go @@ -5,7 +5,7 @@ package services import ( context "context" - github "github.com/google/go-github/v32/github" + github "github.com/google/go-github/v39/github" mock "github.com/stretchr/testify/mock" ) diff --git a/registry/internal/services/mock_organizations_service.go b/registry/internal/services/mock_organizations_service.go index 1ba458a..ba0badd 100644 --- a/registry/internal/services/mock_organizations_service.go +++ b/registry/internal/services/mock_organizations_service.go @@ -5,7 +5,7 @@ package services import ( context "context" - github "github.com/google/go-github/v32/github" + github "github.com/google/go-github/v39/github" mock "github.com/stretchr/testify/mock" ) diff --git a/registry/internal/services/mock_repositories_service.go b/registry/internal/services/mock_repositories_service.go index 3722f0d..c6c7995 100644 --- a/registry/internal/services/mock_repositories_service.go +++ b/registry/internal/services/mock_repositories_service.go @@ -5,7 +5,7 @@ package services import ( context "context" - github "github.com/google/go-github/v32/github" + github "github.com/google/go-github/v39/github" mock "github.com/stretchr/testify/mock" ) diff --git a/registry/internal/services/services.go b/registry/internal/services/services.go index 251e774..14b9221 100644 --- a/registry/internal/services/services.go +++ b/registry/internal/services/services.go @@ -19,7 +19,7 @@ package services import ( "context" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" ) //go:generate mockery --all --inpackage --case=underscore diff --git a/registry/request-add-entry/cmd/main.go b/registry/request-add-entry/cmd/main.go index 6881beb..95c6a4b 100644 --- a/registry/request-add-entry/cmd/main.go +++ b/registry/request-add-entry/cmd/main.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" "golang.org/x/oauth2" "gopkg.in/retry.v1" diff --git a/registry/request-add-entry/request_add_entry.go b/registry/request-add-entry/request_add_entry.go index 8bc113c..d04e682 100644 --- a/registry/request-add-entry/request_add_entry.go +++ b/registry/request-add-entry/request_add_entry.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" "github.com/pelletier/go-toml" "gopkg.in/retry.v1" diff --git a/registry/request-add-entry/request_add_entry_test.go b/registry/request-add-entry/request_add_entry_test.go index 72202d2..2865e1f 100644 --- a/registry/request-add-entry/request_add_entry_test.go +++ b/registry/request-add-entry/request_add_entry_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" . "github.com/onsi/gomega" "github.com/pelletier/go-toml" "github.com/sclevine/spec" diff --git a/registry/request-yank-entry/cmd/main.go b/registry/request-yank-entry/cmd/main.go index 07dbffb..c793b9b 100644 --- a/registry/request-yank-entry/cmd/main.go +++ b/registry/request-yank-entry/cmd/main.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" "golang.org/x/oauth2" "gopkg.in/retry.v1" diff --git a/registry/request-yank-entry/request_yank_entry.go b/registry/request-yank-entry/request_yank_entry.go index 4b3869e..7d354e4 100644 --- a/registry/request-yank-entry/request_yank_entry.go +++ b/registry/request-yank-entry/request_yank_entry.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" "github.com/pelletier/go-toml" "gopkg.in/retry.v1" diff --git a/registry/request-yank-entry/request_yank_entry_test.go b/registry/request-yank-entry/request_yank_entry_test.go index 0aa3979..7452bfe 100644 --- a/registry/request-yank-entry/request_yank_entry_test.go +++ b/registry/request-yank-entry/request_yank_entry_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" . "github.com/onsi/gomega" "github.com/pelletier/go-toml" "github.com/sclevine/spec" diff --git a/registry/verify-namespace-owner/cmd/main.go b/registry/verify-namespace-owner/cmd/main.go index 6010320..de1c59e 100644 --- a/registry/verify-namespace-owner/cmd/main.go +++ b/registry/verify-namespace-owner/cmd/main.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" "golang.org/x/oauth2" "gopkg.in/retry.v1" diff --git a/registry/verify-namespace-owner/verify_namespace_owner.go b/registry/verify-namespace-owner/verify_namespace_owner.go index 5e92fce..1baaa85 100644 --- a/registry/verify-namespace-owner/verify_namespace_owner.go +++ b/registry/verify-namespace-owner/verify_namespace_owner.go @@ -23,7 +23,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" "gopkg.in/retry.v1" "github.com/buildpacks/github-actions/internal/toolkit" diff --git a/registry/verify-namespace-owner/verify_namespace_owner_test.go b/registry/verify-namespace-owner/verify_namespace_owner_test.go index 77e014f..00fcc18 100644 --- a/registry/verify-namespace-owner/verify_namespace_owner_test.go +++ b/registry/verify-namespace-owner/verify_namespace_owner_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" . "github.com/onsi/gomega" "github.com/sclevine/spec" "github.com/sclevine/spec/report" diff --git a/registry/yank-entry/cmd/main.go b/registry/yank-entry/cmd/main.go index e41b372..9c72651 100644 --- a/registry/yank-entry/cmd/main.go +++ b/registry/yank-entry/cmd/main.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" "golang.org/x/oauth2" "gopkg.in/retry.v1" diff --git a/registry/yank-entry/yank_entry.go b/registry/yank-entry/yank_entry.go index bb095a6..11307c7 100644 --- a/registry/yank-entry/yank_entry.go +++ b/registry/yank-entry/yank_entry.go @@ -21,7 +21,7 @@ import ( "fmt" "net/http" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" "gopkg.in/retry.v1" "github.com/buildpacks/github-actions/internal/toolkit" diff --git a/registry/yank-entry/yank_entry_test.go b/registry/yank-entry/yank_entry_test.go index 991475d..127e762 100644 --- a/registry/yank-entry/yank_entry_test.go +++ b/registry/yank-entry/yank_entry_test.go @@ -23,7 +23,7 @@ import ( "path/filepath" "testing" - "github.com/google/go-github/v32/github" + "github.com/google/go-github/v39/github" . "github.com/onsi/gomega" "github.com/sclevine/spec" "github.com/sclevine/spec/report"