Skip to content

Commit d018407

Browse files
authored
upgrade: go version to 1.25.1 (#839)
* update: go version 1.25.1 * update: golangci-lint version to v2.4.0 * migrate: golangci-lint config to v2 * fix: linter issues * add: changelog
1 parent f3b6bba commit d018407

File tree

11 files changed

+146
-357
lines changed

11 files changed

+146
-357
lines changed

.changelog/807.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
```release-note:security
2-
go: upgrade go version to 40c38fd658f0fd07ce74f2ee51b8abd3bfed01b3
2+
go: upgrade go-discover version to 40c38fd658f0fd07ce74f2ee51b8abd3bfed01b3
33
```

.changelog/839.txt

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

.github/workflows/consul-dataplane-checks.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,6 @@ jobs:
5555
go-version: ${{ needs.get-go-version.outputs.go-version }}
5656
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
5757
- name: golangci-lint
58-
uses: golangci/golangci-lint-action@82d40c283aeb1f2b6595839195e95c2d6a49081b # v5.0.0
58+
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
59+
with:
60+
version: "v2.4.0"

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.23.10
1+
1.25.1

.golangci.yml

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
1-
# Copyright (c) HashiCorp, Inc.
2-
# SPDX-License-Identifier: MPL-2.0
1+
version: "2"
2+
linters:
3+
exclusions:
4+
generated: lax
5+
presets:
6+
- comments
7+
- common-false-positives
8+
- legacy
9+
- std-error-handling
10+
rules:
11+
- linters:
12+
- staticcheck
13+
path: (pkg/consuldp/bootstrap.go)
14+
text: 'SA1019:'
15+
- linters:
16+
- staticcheck
17+
text: 'ST1005:'
318

4-
issues:
5-
exclude-rules:
6-
# Allow usage of deprecated values.
7-
- linters: [ staticcheck ]
8-
text: 'SA1019:'
9-
path: "(pkg/consuldp/bootstrap.go)"
19+
paths:
20+
- third_party$
21+
- builtin$
22+
- examples$
23+
formatters:
24+
exclusions:
25+
generated: lax
26+
paths:
27+
- third_party$
28+
- builtin$
29+
- examples$

go.mod

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
module github.com/hashicorp/consul-dataplane
22

3-
go 1.24.5
3+
go 1.25.1
44

55
require (
66
dario.cat/mergo v1.0.0
77
github.com/armon/go-metrics v0.4.1
88
github.com/hashi-derek/grpc-proxy v0.0.0-20231207191910-191266484d75
9-
github.com/hashicorp/consul-server-connection-manager v0.1.9
10-
github.com/hashicorp/consul/proto-public v0.6.3
9+
github.com/hashicorp/consul-server-connection-manager v0.1.12
10+
github.com/hashicorp/consul/proto-public v0.6.4
1111
github.com/hashicorp/go-hclog v1.5.0
1212
github.com/hashicorp/go-multierror v1.1.1
1313
github.com/hashicorp/go-rootcerts v1.0.2
1414
github.com/mitchellh/mapstructure v1.5.0
15-
github.com/prometheus/client_golang v1.13.0
16-
github.com/stretchr/testify v1.9.0
17-
google.golang.org/grpc v1.56.3
18-
google.golang.org/protobuf v1.33.0
15+
github.com/prometheus/client_golang v1.23.2
16+
github.com/stretchr/testify v1.11.1
17+
google.golang.org/grpc v1.75.0
18+
google.golang.org/protobuf v1.36.8
1919
)
2020

2121
require (
2222
github.com/DataDog/datadog-go v3.2.0+incompatible // indirect
2323
github.com/beorn7/perks v1.0.1 // indirect
2424
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
25-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
25+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2626
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2727
github.com/fatih/color v1.16.0 // indirect
28-
github.com/golang/protobuf v1.5.4 // indirect
29-
github.com/google/go-cmp v0.6.0 // indirect
3028
github.com/hashicorp/errwrap v1.0.0 // indirect
3129
github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
30+
github.com/hashicorp/go-metrics v0.5.4 // indirect
3231
github.com/hashicorp/go-netaddrs v0.1.0 // indirect
3332
github.com/hashicorp/golang-lru v0.5.1 // indirect
3433
github.com/mattn/go-colorable v0.1.13 // indirect
3534
github.com/mattn/go-isatty v0.0.20 // indirect
36-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
3735
github.com/mitchellh/go-homedir v1.1.0 // indirect
36+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3837
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
39-
github.com/prometheus/client_model v0.2.0 // indirect
40-
github.com/prometheus/common v0.37.0 // indirect
41-
github.com/prometheus/procfs v0.8.0 // indirect
38+
github.com/prometheus/client_model v0.6.2 // indirect
39+
github.com/prometheus/common v0.66.1 // indirect
40+
github.com/prometheus/procfs v0.16.1 // indirect
4241
github.com/stretchr/objx v0.5.2 // indirect
43-
golang.org/x/net v0.41.0 // indirect
44-
golang.org/x/sys v0.33.0 // indirect
45-
golang.org/x/text v0.26.0 // indirect
46-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // indirect
42+
go.yaml.in/yaml/v2 v2.4.2 // indirect
43+
golang.org/x/net v0.43.0 // indirect
44+
golang.org/x/sys v0.35.0 // indirect
45+
golang.org/x/text v0.28.0 // indirect
46+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
4747
gopkg.in/yaml.v3 v3.0.1 // indirect
4848
)

0 commit comments

Comments
 (0)