From 22921ed6cf5e1b517cfa4513e58c409693fb7bac Mon Sep 17 00:00:00 2001 From: Scarlett Perry <39421794+scarlettperry@users.noreply.github.com> Date: Wed, 13 Mar 2024 15:22:23 -0400 Subject: [PATCH] housekeeping: update to go 1.22 (#2952) --- .github/workflows/api.yml | 4 ++-- .github/workflows/backend.yml | 10 +++++++--- .github/workflows/frontend.yml | 2 +- .github/workflows/license_review.yml | 4 ++++ .github/workflows/scaffolding.yml | 2 +- backend/gateway/gateway_test.go | 2 +- backend/go.mod | 2 +- docs/_website/generator/go.mod | 2 +- tools/go.mod | 2 +- tools/golangci-lint.sh | 6 +++--- .../scaffolding/templates/gateway/backend/go.mod.tmpl | 2 +- 11 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index aab095233b..5f63673af6 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.21.x + go-version: 1.22.x - name: Set up Node uses: actions/setup-node@v3 with: @@ -36,6 +36,6 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.21.x + go-version: 1.22.x - name: lint run: make api-lint diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index a0d96a53d7..e773da30c1 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-go@v3 id: setup-go with: - go-version: 1.21.x + go-version: 1.22.x - name: go mod cache uses: actions/cache@v4 with: @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-go@v3 id: setup-go with: - go-version: 1.21.x + go-version: 1.22.x - name: go mod cache uses: actions/cache@v4 with: @@ -69,6 +69,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + id: setup-go + with: + go-version: 1.22.x - run: make backend-integration-test lint: runs-on: ubuntu-latest @@ -77,7 +81,7 @@ jobs: - uses: actions/setup-go@v3 id: setup-go with: - go-version: 1.21.x + go-version: 1.22.x - name: go mod cache uses: actions/cache@v4 with: diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 8909c02f3b..c18d1b3d5a 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -82,7 +82,7 @@ jobs: - uses: actions/setup-go@v3 id: setup-go with: - go-version: 1.21.x + go-version: 1.22.x - uses: actions/setup-node@v3 with: node-version: '16.x' diff --git a/.github/workflows/license_review.yml b/.github/workflows/license_review.yml index 2fb65d8aac..cf70210830 100644 --- a/.github/workflows/license_review.yml +++ b/.github/workflows/license_review.yml @@ -16,6 +16,10 @@ jobs: working-directory: ./tools/license-finder steps: - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + id: setup-go + with: + go-version: 1.22.x - name: Install Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/scaffolding.yml b/.github/workflows/scaffolding.yml index 6b2afbfdd7..57c56a237f 100644 --- a/.github/workflows/scaffolding.yml +++ b/.github/workflows/scaffolding.yml @@ -18,7 +18,7 @@ jobs: path: ${{ env.PACKAGEPATH }} - uses: actions/setup-go@v3 with: - go-version: 1.21.x + go-version: 1.22.x - uses: actions/setup-node@v3 with: node-version: '16.x' diff --git a/backend/gateway/gateway_test.go b/backend/gateway/gateway_test.go index 0859c9cda0..1627b1010a 100644 --- a/backend/gateway/gateway_test.go +++ b/backend/gateway/gateway_test.go @@ -106,7 +106,7 @@ func TestGetStatsReporterConfiguration(t *testing.T) { { cfg: &gatewayv1.Config{Gateway: &gatewayv1.GatewayOptions{ Stats: &gatewayv1.Stats{ - Reporter: &gatewayv1.Stats_PrometheusReporter_{PrometheusReporter: &gatewayv1.Stats_PrometheusReporter{HandlerPath: "foo"}}, + Reporter: &gatewayv1.Stats_PrometheusReporter_{PrometheusReporter: &gatewayv1.Stats_PrometheusReporter{HandlerPath: "foo.com/path"}}, }, }}, prefix: "clutch", diff --git a/backend/go.mod b/backend/go.mod index cfde51525a..8413ec2fbb 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -1,6 +1,6 @@ module github.com/lyft/clutch/backend -go 1.21 +go 1.22 require ( github.com/DATA-DOG/go-sqlmock v1.5.0 diff --git a/docs/_website/generator/go.mod b/docs/_website/generator/go.mod index 9a8862aa06..37cce82bf6 100644 --- a/docs/_website/generator/go.mod +++ b/docs/_website/generator/go.mod @@ -1,6 +1,6 @@ module github.com/lyft/clutch/docs/website/generator -go 1.21 +go 1.22 require ( github.com/Masterminds/sprig/v3 v3.2.3 diff --git a/tools/go.mod b/tools/go.mod index 0cea88744d..16edaa9b88 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,3 +1,3 @@ module github.com/lyft/clutch/tools -go 1.21 +go 1.22 diff --git a/tools/golangci-lint.sh b/tools/golangci-lint.sh index 1dff5e6d20..17b2318118 100755 --- a/tools/golangci-lint.sh +++ b/tools/golangci-lint.sh @@ -6,9 +6,9 @@ BUILD_ROOT="${REPO_ROOT}/build" BUILD_BIN="${BUILD_ROOT}/bin" NAME=golangci-lint -RELEASE=v1.55.2 -OSX_RELEASE_256=632e96e6d5294fbbe7b2c410a49c8fa01c60712a0af85a567de85bcc1623ea21 -LINUX_RELEASE_256=ca21c961a33be3bc15e4292dc40c98c8dcc5463a7b6768a3afc123761630c09c +RELEASE=v1.56.1 +OSX_RELEASE_256=62f02d4c0e8f6f8c77e787b8f271cdd1535eb7d2a28742e2535608652271018e +LINUX_RELEASE_256=aaf8260c76530f7571c49a7bc34b2ecd15accac21106710d47463a2313f1f663 ARCH=amd64 diff --git a/tools/scaffolding/templates/gateway/backend/go.mod.tmpl b/tools/scaffolding/templates/gateway/backend/go.mod.tmpl index a2afdf6ccc..694faab105 100644 --- a/tools/scaffolding/templates/gateway/backend/go.mod.tmpl +++ b/tools/scaffolding/templates/gateway/backend/go.mod.tmpl @@ -1,3 +1,3 @@ module {{ .RepoProvider }}/{{ .RepoOwner }}/{{ .RepoName }}/backend -go 1.21 +go 1.22