Skip to content

Commit 9aa6862

Browse files
hc-github-team-consul-coresreeram77pajay-raoVikramarjuna
authored
Backport of upgrade: go to v1.25 into release/1.21.x (#22659)
* fix: golangci-lint staticcheck errors (#22642) * fix: golangci-lint staticcheck errors * fix: missing braces for else in mesh_gateway.go * fix: remove unnecessary type check in otel_sink_test.go * fix: golangci-lint issues (#22644) * upgrade: golangci-lint to v2 (#22648) * fix: golangci-lint issues * migrate golangci-lint config to v2 * upgrade: golangci-lint to v2.4.0 * fix: linter issues in agent/consul (#22651) * Fixing bind addr issue, ipv6 bracket, valid peering token issue m go-discover update (#22584) * Fixing bind addr issue, ipv6 bracket and valid peering token issue * Making addr and port compatible with ipv6 * Updating go-discover to v1.1.0 * Updating testcases * chore:added workflow to delete stale branches (#22658) * upgrade: go to v1.25 (#22652) * update: go version to 1.25 * update: gotestsum version * update: mog, buf and deep-copy * fix: add workaround to install covdata in go toolchain * update: regen proto files * fix: install deep-copy with go 1.23 * add: changelog * update: regen deepcopy files * fix: non-constant format string in formatter * upgrade: mockery and proto-gen, and regen files (#22634) * update: mockery to v3 and generate mocks * update: protoc-gen to v1.5.1 and regen proto go files * fix: use InterfaceName_mock.go for filename in mockery * update: generate mock files with mockery v3 * fix: case in structname in mockery config * update: testcase errMsg in TestPatchStruct * update: increase timeout for context in TestSubscribeBackend_IntegrationWithServer_TLSReload --------- Co-authored-by: Sreeram Narayanan <sreeram.narayanan@hashicorp.com> Co-authored-by: P Ajay Rao <pajay.rao@hashicorp.com> Co-authored-by: Vikramarjuna <vkrmrjun@gmail.com>
1 parent f5d19c5 commit 9aa6862

File tree

462 files changed

+11208
-17343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

462 files changed

+11208
-17343
lines changed

.changelog/22652.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:security
2+
security: upgrade go version to 1.25.0
3+
```

.github/workflows/nightly-test-integ-peering_commontopo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
TEST_RESULTS_DIR: /tmp/test-results
1414
CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
1515
GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
16-
GOTESTSUM_VERSION: "1.10.1"
16+
GOTESTSUM_VERSION: "1.12.3"
1717
CONSUL_BINARY_UPLOAD_NAME: consul-bin
1818
# strip the hashicorp/ off the front of github.repository for consul
1919
CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}

.github/workflows/nightly-test-integrations-1.15.x.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
TEST_RESULTS_ARTIFACT_NAME: test-results
1515
CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
1616
GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
17-
GOTESTSUM_VERSION: "1.11.0"
17+
GOTESTSUM_VERSION: "1.12.3"
1818
CONSUL_BINARY_UPLOAD_NAME: consul-bin
1919
# strip the hashicorp/ off the front of github.repository for consul
2020
CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}

.github/workflows/nightly-test-integrations-1.18.x.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
TEST_RESULTS_ARTIFACT_NAME: test-results
1515
CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
1616
GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
17-
GOTESTSUM_VERSION: "1.11.0"
17+
GOTESTSUM_VERSION: "1.12.3"
1818
CONSUL_BINARY_UPLOAD_NAME: consul-bin
1919
# strip the hashicorp/ off the front of github.repository for consul
2020
CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}

.github/workflows/nightly-test-integrations-1.19.x.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
TEST_RESULTS_ARTIFACT_NAME: test-results
1515
CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
1616
GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
17-
GOTESTSUM_VERSION: "1.11.0"
17+
GOTESTSUM_VERSION: "1.12.3"
1818
CONSUL_BINARY_UPLOAD_NAME: consul-bin
1919
# strip the hashicorp/ off the front of github.repository for consul
2020
CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}

.github/workflows/nightly-test-integrations-1.20.x.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
TEST_RESULTS_ARTIFACT_NAME: test-results
1515
CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
1616
GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
17-
GOTESTSUM_VERSION: "1.11.0"
17+
GOTESTSUM_VERSION: "1.12.3"
1818
CONSUL_BINARY_UPLOAD_NAME: consul-bin
1919
# strip the hashicorp/ off the front of github.repository for consul
2020
CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}

.github/workflows/nightly-test-integrations-1.21.x.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
TEST_RESULTS_ARTIFACT_NAME: test-results
1515
CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
1616
GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
17-
GOTESTSUM_VERSION: "1.11.0"
17+
GOTESTSUM_VERSION: "1.12.3"
1818
CONSUL_BINARY_UPLOAD_NAME: consul-bin
1919
# strip the hashicorp/ off the front of github.repository for consul
2020
CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}

.github/workflows/nightly-test-integrations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
TEST_RESULTS_ARTIFACT_NAME: test-results
1515
CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
1616
GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
17-
GOTESTSUM_VERSION: "1.11.0"
17+
GOTESTSUM_VERSION: "1.12.3"
1818
CONSUL_BINARY_UPLOAD_NAME: consul-bin
1919
# strip the hashicorp/ off the front of github.repository for consul
2020
CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}

.github/workflows/reusable-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Set golangci-lint version
5555
run: echo "GOLANGCI_LINT_VERSION=$(make --no-print-directory print-GOLANGCI_LINT_VERSION)" >> $GITHUB_ENV
5656
- name: lint-${{ matrix.directory }}
57-
uses: golangci/golangci-lint-action@82d40c283aeb1f2b6595839195e95c2d6a49081b # v5.0.0
57+
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
5858
with:
5959
working-directory: ${{ matrix.directory }}
6060
version: ${{ env.GOLANGCI_LINT_VERSION }}

.github/workflows/reusable-unit-split.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ on:
4949
required: true
5050
env:
5151
TEST_RESULTS: /tmp/test-results
52-
GOTESTSUM_VERSION: "1.11.0"
52+
GOTESTSUM_VERSION: "1.12.3"
5353
GOARCH: ${{inputs.go-arch}}
5454
TOTAL_RUNNERS: ${{inputs.runner-count}}
5555
CONSUL_LICENSE: ${{secrets.consul-license}}

0 commit comments

Comments
 (0)