From a8df70c0fc0e3825c3e14fce45148ca7bc9d0dcf Mon Sep 17 00:00:00 2001 From: Jerad C Date: Tue, 29 Nov 2022 15:26:54 -0600 Subject: [PATCH 1/3] upgrade go mod version --- go.mod | 13 +++++-------- go.sum | 4 +--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 3cfa9840..2820dc4e 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,14 @@ module github.com/aws/aws-node-termination-handler -go 1.17 +go 1.19 require ( + github.com/aws/aws-sdk-go v1.38.55 github.com/go-logr/zapr v0.4.0 - github.com/onsi/ginkgo v1.16.5 + github.com/onsi/ginkgo/v2 v2.1.3 github.com/onsi/gomega v1.18.1 + go.uber.org/multierr v1.6.0 + go.uber.org/zap v1.19.1 k8s.io/api v0.21.4 k8s.io/apimachinery v0.21.4 k8s.io/client-go v0.21.4 @@ -28,7 +31,6 @@ require ( github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect - github.com/aws/aws-sdk-go v1.38.55 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/blendle/zapdriver v1.3.1 // indirect @@ -76,8 +78,6 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect - github.com/nxadm/tail v1.4.8 // indirect - github.com/onsi/ginkgo/v2 v2.1.3 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -95,8 +95,6 @@ require ( go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/automaxprocs v1.4.0 // indirect - go.uber.org/multierr v1.6.0 // indirect - go.uber.org/zap v1.19.1 // indirect golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect @@ -112,7 +110,6 @@ require ( google.golang.org/grpc v1.42.0 // indirect google.golang.org/protobuf v1.27.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect k8s.io/apiextensions-apiserver v0.21.4 // indirect diff --git a/go.sum b/go.sum index e7c8f978..28f605f9 100644 --- a/go.sum +++ b/go.sum @@ -287,7 +287,6 @@ github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2K github.com/go-openapi/validate v0.19.8/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gobuffalo/flect v0.2.4 h1:BSYA8+T60cdyq+vynaSUjqSVI9mDEg9ZfQUXKmfjo4I= github.com/gobuffalo/flect v0.2.4/go.mod h1:1ZyCLIbg0YD7sDkzvFdPoOydPtD8y9JQnrOROolUcM8= @@ -389,7 +388,6 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= @@ -469,6 +467,7 @@ github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJk github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -586,7 +585,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= From 7188892c511b8c3c3609e8c9d7311f7ee7f5b821 Mon Sep 17 00:00:00 2001 From: Jerad C Date: Wed, 30 Nov 2022 09:25:44 -0600 Subject: [PATCH 2/3] update third party licenses --- Makefile | 4 +--- THIRD_PARTY_LICENSES.md | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ff918430..bca8fad0 100644 --- a/Makefile +++ b/Makefile @@ -185,6 +185,4 @@ version: latest-release-tag ## Get the most recent release version. third-party-licenses: $(GOLICENSES) ## Save list of third party licenses. @$(GOLICENSES) report \ --template "$(PROJECT_DIR)/templates/third-party-licenses.tmpl" \ - $(PROJECT_DIR)/cmd/controller \ - $(PROJECT_DIR)/cmd/webhook \ - $(PROJECT_DIR)/test > $(THIRD_PARTY_LICENSES) + $(PROJECT_DIR)/... > $(THIRD_PARTY_LICENSES) diff --git a/THIRD_PARTY_LICENSES.md b/THIRD_PARTY_LICENSES.md index d0f60b80..8289a7c7 100644 --- a/THIRD_PARTY_LICENSES.md +++ b/THIRD_PARTY_LICENSES.md @@ -61,6 +61,8 @@ - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd [Apache-2.0](https://github.com/modern-go/concurrent/blob/bacd9c7ef1dd/LICENSE) - github.com/modern-go/reflect2 v1.0.2 [Apache-2.0](https://github.com/modern-go/reflect2/blob/v1.0.2/LICENSE) - github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 [MIT](https://github.com/monochromegane/go-gitignore/blob/205db1a8cc00/LICENSE) +- github.com/onsi/ginkgo/v2 v2.1.3 [MIT](https://github.com/onsi/ginkgo/blob/v2.1.3/LICENSE) +- github.com/onsi/gomega v1.18.1 [MIT](https://github.com/onsi/gomega/blob/v1.18.1/LICENSE) - github.com/peterbourgon/diskv v2.0.1 [MIT](https://github.com/peterbourgon/diskv/blob/v2.0.1/LICENSE) - github.com/pkg/errors v0.9.1 [BSD-2-Clause](https://github.com/pkg/errors/blob/v0.9.1/LICENSE) - github.com/pmezard/go-difflib/difflib v1.0.0 [BSD-3-Clause](https://github.com/pmezard/go-difflib/blob/v1.0.0/LICENSE) From d4f45db64fa7e16169cd275ccb89c0ccef89b731 Mon Sep 17 00:00:00 2001 From: Jerad C Date: Tue, 29 Nov 2022 15:27:32 -0600 Subject: [PATCH 3/3] upgrade workflow go version --- .github/workflows/release.yml | 2 +- .github/workflows/tests.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 45f90768..e041f2c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ permissions: contents: write # require for uploading releases env: - DEFAULT_GO_VERSION: ^1.18 + DEFAULT_GO_VERSION: ^1.19.3 GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }} GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }} WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2f853102..a53fac90 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,10 +15,10 @@ jobs: name: Run 'make test' runs-on: ubuntu-20.04 steps: - - name: Set up Go 1.17.x + - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.17.x" + go-version: "^1.19.3" - run: go version - name: Check out code into the Go module directory