Skip to content

Commit 6ea0409

Browse files
authored
chore(deps): Update dependencies and Go version to 1.25.7 (fix lint logic) (#2562)
1 parent 42acc73 commit 6ea0409

File tree

3 files changed

+80
-81
lines changed

3 files changed

+80
-81
lines changed

build.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,13 @@ function fix() {
8888
## lint - runs the linters
8989
function lint() {
9090
# run lint checks
91-
get_golang_tool 'golangci-lint' 'golangci/golangci-lint' 'github.com/golangci/golangci-lint/v2/cmd/golangci-lint'
92-
".tools/golangci-lint" run --timeout 3m
91+
get_golang_tool 'goimports' 'golang/tools' 'golang.org/x/tools/cmd/goimports'
92+
".tools/goimports" -w .
93+
go fmt ./...
94+
go mod tidy
9395

9496
# Check the commit includes a go.mod that is fully
9597
# up to date.
96-
fix
9798
if [[ -d "$SCRIPT_DIR/.git" ]] ; then
9899
git diff --exit-code
99100
fi

go.mod

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/GoogleCloudPlatform/cloudsql-proxy
22

3-
go 1.24.11
4-
5-
toolchain go1.24.13
3+
go 1.25.7
64

75
require (
86
cloud.google.com/go/compute/metadata v0.9.0
@@ -11,19 +9,19 @@ require (
119
github.com/hanwen/go-fuse/v2 v2.9.0
1210
github.com/jackc/pgx/v4 v4.18.3
1311
github.com/lib/pq v1.11.2
14-
github.com/microsoft/go-mssqldb v1.9.6
12+
github.com/microsoft/go-mssqldb v1.9.8
1513
go.uber.org/zap v1.27.1
16-
golang.org/x/net v0.50.0
17-
golang.org/x/oauth2 v0.35.0
18-
golang.org/x/sys v0.41.0
19-
golang.org/x/time v0.14.0
20-
google.golang.org/api v0.266.0
14+
golang.org/x/net v0.52.0
15+
golang.org/x/oauth2 v0.36.0
16+
golang.org/x/sys v0.42.0
17+
golang.org/x/time v0.15.0
18+
google.golang.org/api v0.271.0
2119
)
2220

2321
require (
2422
cloud.google.com/go/auth v0.18.2 // indirect
2523
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
26-
filippo.io/edwards25519 v1.1.0 // indirect
24+
filippo.io/edwards25519 v1.2.0 // indirect
2725
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2826
github.com/felixge/httpsnoop v1.0.4 // indirect
2927
github.com/go-logr/logr v1.4.3 // indirect
@@ -32,8 +30,8 @@ require (
3230
github.com/golang-sql/sqlexp v0.1.0 // indirect
3331
github.com/google/s2a-go v0.1.9 // indirect
3432
github.com/google/uuid v1.6.0 // indirect
35-
github.com/googleapis/enterprise-certificate-proxy v0.3.12 // indirect
36-
github.com/googleapis/gax-go/v2 v2.17.0 // indirect
33+
github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
34+
github.com/googleapis/gax-go/v2 v2.18.0 // indirect
3735
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
3836
github.com/jackc/pgconn v1.14.3 // indirect
3937
github.com/jackc/pgio v1.0.0 // indirect
@@ -44,14 +42,14 @@ require (
4442
github.com/pkg/errors v0.9.1 // indirect
4543
github.com/shopspring/decimal v1.4.0 // indirect
4644
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
47-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
48-
go.opentelemetry.io/otel v1.40.0 // indirect
49-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
50-
go.opentelemetry.io/otel/trace v1.40.0 // indirect
45+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
46+
go.opentelemetry.io/otel v1.42.0 // indirect
47+
go.opentelemetry.io/otel/metric v1.42.0 // indirect
48+
go.opentelemetry.io/otel/trace v1.42.0 // indirect
5149
go.uber.org/multierr v1.11.0 // indirect
52-
golang.org/x/crypto v0.48.0 // indirect
53-
golang.org/x/text v0.34.0 // indirect
54-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
55-
google.golang.org/grpc v1.79.1 // indirect
50+
golang.org/x/crypto v0.49.0 // indirect
51+
golang.org/x/text v0.35.0 // indirect
52+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260311181403-84a4fc48630c // indirect
53+
google.golang.org/grpc v1.79.2 // indirect
5654
google.golang.org/protobuf v1.36.11 // indirect
5755
)

0 commit comments

Comments
 (0)