From 043a63ff66b5a67c36a14876edf9095d74b62783 Mon Sep 17 00:00:00 2001 From: Carson Long <12767276+ctlong@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:45:59 -0700 Subject: [PATCH] Bump to go1.22 (#1185) * Bump the minimum version of go to 1.22.0 * Bump assets to use use/require go1.22 * Update README with new Go version --- README.md | 4 ++-- assets/binary/go.mod | 2 +- assets/catnip/go.mod | 2 +- assets/credhub-service-broker/go.mod | 2 +- assets/go_calls_ruby/go.mod | 2 +- assets/golang/go.mod | 2 +- assets/golang/manifest.yml | 6 +++--- assets/grpc/go.mod | 2 +- assets/http2/go.mod | 2 +- assets/logging-route-service/go.mod | 2 +- assets/logging-route-service/manifest.yml | 10 +++++----- assets/multi-port-app/go.mod | 2 +- assets/multi-port-app/manifest.yml | 4 ++-- assets/pora/go.mod | 2 +- assets/pora/manifest.yml | 12 ++++++------ assets/proxy/go.mod | 2 +- assets/proxy/internal-route-manifest.yml | 2 +- assets/proxy/manifest.yml | 4 ++-- assets/syslog-drain-listener/go.mod | 2 +- assets/syslog-drain-listener/manifest.yml | 8 ++++---- assets/tcp-listener/go.mod | 2 +- assets/tcp-listener/manifest.yml | 6 +++--- assets/worker/go.mod | 2 +- go.mod | 2 +- 24 files changed, 43 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index b2d349992..1583e901b 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ in such a way as to impact other tests. ## Test Setup ### Prerequisites for running CATS -- Install golang >= `1.21`. Set up your golang development environment, per +- Install golang >= `1.22`. Set up your golang development environment, per [golang.org](http://golang.org/doc/install). - Install the [`cf CLI`](https://github.com/cloudfoundry/cli) >= `8.5.0`. Make sure that it is accessible in your `$PATH`. @@ -53,7 +53,7 @@ in such a way as to impact other tests. All `go` dependencies required by CATs are vendored in the `vendor` directory. -Make sure to have Golang 1.21+ +Make sure to have Golang 1.22+ In order to update a current dependency to a specific version, do the following: diff --git a/assets/binary/go.mod b/assets/binary/go.mod index d20bcd299..7b035d243 100644 --- a/assets/binary/go.mod +++ b/assets/binary/go.mod @@ -1,3 +1,3 @@ module github.com/cloudfoundry/cf-acceptance-tests/assets/binary -go 1.21 +go 1.22.0 diff --git a/assets/catnip/go.mod b/assets/catnip/go.mod index 3a0dd1bfa..8c3d1dde3 100644 --- a/assets/catnip/go.mod +++ b/assets/catnip/go.mod @@ -1,6 +1,6 @@ module github.com/cloudfoundry/cf-acceptance-tests/assets/catnip -go 1.21 +go 1.22.0 require ( code.cloudfoundry.org/clock v1.2.0 diff --git a/assets/credhub-service-broker/go.mod b/assets/credhub-service-broker/go.mod index 124aad8e5..4c795be49 100644 --- a/assets/credhub-service-broker/go.mod +++ b/assets/credhub-service-broker/go.mod @@ -1,6 +1,6 @@ module github.com/cloudfoundry/cf-acceptance-tests/assets/credhub-service-broker -go 1.21 +go 1.22.0 require ( code.cloudfoundry.org/credhub-cli v0.0.0-20230320130818-a7d5420b283b diff --git a/assets/go_calls_ruby/go.mod b/assets/go_calls_ruby/go.mod index 2d33c3162..0337e0be7 100644 --- a/assets/go_calls_ruby/go.mod +++ b/assets/go_calls_ruby/go.mod @@ -1,3 +1,3 @@ module github.com/cloudfoundry/cf-acceptance-tests/assets/go_calls_ruby -go 1.21 +go 1.22.0 diff --git a/assets/golang/go.mod b/assets/golang/go.mod index b326b79eb..e8a8838ae 100644 --- a/assets/golang/go.mod +++ b/assets/golang/go.mod @@ -1,3 +1,3 @@ module github.com/cloudfoundry/cf-acceptance-tests/assets/golang -go 1.21 +go 1.22.0 diff --git a/assets/golang/manifest.yml b/assets/golang/manifest.yml index a09cd7212..f10509fad 100644 --- a/assets/golang/manifest.yml +++ b/assets/golang/manifest.yml @@ -1,5 +1,5 @@ --- applications: -- env: - GOPACKAGENAME: go-online - GOVERSION: go1.21 + - env: + GOPACKAGENAME: go-online + GOVERSION: go1.22 diff --git a/assets/grpc/go.mod b/assets/grpc/go.mod index 75287669f..aab24228a 100644 --- a/assets/grpc/go.mod +++ b/assets/grpc/go.mod @@ -1,6 +1,6 @@ module github.com/cloudfoundry/cf-acceptance-tests/assets/grpc -go 1.21 +go 1.22.0 require ( google.golang.org/grpc v1.65.0 diff --git a/assets/http2/go.mod b/assets/http2/go.mod index 48580be78..bfb54db9c 100644 --- a/assets/http2/go.mod +++ b/assets/http2/go.mod @@ -1,6 +1,6 @@ module github.com/cloudfoundry/cf-acceptance-tests/assets/http2 -go 1.21 +go 1.22.0 require golang.org/x/net v0.27.0 diff --git a/assets/logging-route-service/go.mod b/assets/logging-route-service/go.mod index d12876fb4..888043734 100644 --- a/assets/logging-route-service/go.mod +++ b/assets/logging-route-service/go.mod @@ -1,3 +1,3 @@ module github.com/cloudfoundry-samples/logging-route-service -go 1.21 +go 1.22.0 diff --git a/assets/logging-route-service/manifest.yml b/assets/logging-route-service/manifest.yml index 3917a5a82..09003b662 100644 --- a/assets/logging-route-service/manifest.yml +++ b/assets/logging-route-service/manifest.yml @@ -1,7 +1,7 @@ --- applications: -- buildpacks: - - go_buildpack - env: - GOVERSION: go1.21 - GOPACKAGENAME: github.com/cloudfoundry-samples/logging-route-service + - buildpacks: + - go_buildpack + env: + GOVERSION: go1.22 + GOPACKAGENAME: github.com/cloudfoundry-samples/logging-route-service diff --git a/assets/multi-port-app/go.mod b/assets/multi-port-app/go.mod index b8cc9ca31..9f64ba005 100644 --- a/assets/multi-port-app/go.mod +++ b/assets/multi-port-app/go.mod @@ -1,3 +1,3 @@ module github.com/cloudfoundry/cf-acceptance-tests/assets/multi-port-app -go 1.21 +go 1.22.0 diff --git a/assets/multi-port-app/manifest.yml b/assets/multi-port-app/manifest.yml index 1039dc6a1..8354a55b8 100644 --- a/assets/multi-port-app/manifest.yml +++ b/assets/multi-port-app/manifest.yml @@ -1,4 +1,4 @@ --- applications: -- env: - GOVERSION: go1.21 + - env: + GOVERSION: go1.22 diff --git a/assets/pora/go.mod b/assets/pora/go.mod index c52dbf2b7..24aedbbc5 100644 --- a/assets/pora/go.mod +++ b/assets/pora/go.mod @@ -1,3 +1,3 @@ module github.com/cloudfoundry/cf-acceptance-tests/assets/pora -go 1.21 +go 1.22.0 diff --git a/assets/pora/manifest.yml b/assets/pora/manifest.yml index e22a78f6f..67ff4218f 100644 --- a/assets/pora/manifest.yml +++ b/assets/pora/manifest.yml @@ -1,8 +1,8 @@ --- applications: -- name: pora - buildpacks: - - go_buildpack - env: - GOPACKAGENAME: pora - GOVERSION: go1.21 + - name: pora + buildpacks: + - go_buildpack + env: + GOPACKAGENAME: pora + GOVERSION: go1.22 diff --git a/assets/proxy/go.mod b/assets/proxy/go.mod index 0083174bd..60d1f0de2 100644 --- a/assets/proxy/go.mod +++ b/assets/proxy/go.mod @@ -1,3 +1,3 @@ module example-apps/proxy -go 1.21 +go 1.22.0 diff --git a/assets/proxy/internal-route-manifest.yml b/assets/proxy/internal-route-manifest.yml index f0985b5eb..5c4d76d90 100644 --- a/assets/proxy/internal-route-manifest.yml +++ b/assets/proxy/internal-route-manifest.yml @@ -6,6 +6,6 @@ applications: buildpack: go_buildpack env: GOPACKAGENAME: example-apps/proxy - GOVERSION: go1.21 + GOVERSION: go1.22 routes: - route: app-smoke.apps.internal diff --git a/assets/proxy/manifest.yml b/assets/proxy/manifest.yml index ded74dff0..8f253edd3 100644 --- a/assets/proxy/manifest.yml +++ b/assets/proxy/manifest.yml @@ -4,7 +4,7 @@ applications: memory: 32M disk_quota: 32M buildpacks: - - go_buildpack + - go_buildpack env: GOPACKAGENAME: example-apps/proxy - GOVERSION: go1.21 + GOVERSION: go1.22 diff --git a/assets/syslog-drain-listener/go.mod b/assets/syslog-drain-listener/go.mod index 9118b8645..4c7539a39 100644 --- a/assets/syslog-drain-listener/go.mod +++ b/assets/syslog-drain-listener/go.mod @@ -1,5 +1,5 @@ module github.com/cloudfoundry/cf-acceptance-tests/assets/syslog-drain-listener -go 1.21 +go 1.22.0 require code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921 diff --git a/assets/syslog-drain-listener/manifest.yml b/assets/syslog-drain-listener/manifest.yml index 67205f78d..190651f46 100644 --- a/assets/syslog-drain-listener/manifest.yml +++ b/assets/syslog-drain-listener/manifest.yml @@ -1,6 +1,6 @@ --- applications: -- name: syslog-drain-listener - env: - GOPACKAGENAME: main - GOVERSION: go1.21 + - name: syslog-drain-listener + env: + GOPACKAGENAME: main + GOVERSION: go1.22 diff --git a/assets/tcp-listener/go.mod b/assets/tcp-listener/go.mod index bbe37759d..1b6dd79cf 100644 --- a/assets/tcp-listener/go.mod +++ b/assets/tcp-listener/go.mod @@ -1,3 +1,3 @@ module github.com/cloudfoundry/cf-acceptance-tests/assets/tcp-listener -go 1.21 +go 1.22.0 diff --git a/assets/tcp-listener/manifest.yml b/assets/tcp-listener/manifest.yml index 1baf9c16e..e7c9013b0 100644 --- a/assets/tcp-listener/manifest.yml +++ b/assets/tcp-listener/manifest.yml @@ -1,5 +1,5 @@ --- applications: -- env: - GOPACKAGENAME: tcp-listener - GOVERSION: go1.21 + - env: + GOPACKAGENAME: tcp-listener + GOVERSION: go1.22 diff --git a/assets/worker/go.mod b/assets/worker/go.mod index f5391baba..fa2e21e8d 100644 --- a/assets/worker/go.mod +++ b/assets/worker/go.mod @@ -1,3 +1,3 @@ module github.com/cloudfoundry/cf-acceptance-tests/assets/worker -go 1.21 +go 1.22.0 diff --git a/go.mod b/go.mod index 330822bd6..f3c382f50 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cloudfoundry/cf-acceptance-tests -go 1.21 +go 1.22.0 require ( code.cloudfoundry.org/archiver v0.0.0-20230220125704-e06c77649d28