Skip to content

Commit ef62709

Browse files
hessjcghessjcg
committed
chore(deps): Update dependencies and Go version (hardcode Go 1.25 in Cloud Build)
1 parent b324220 commit ef62709

File tree

5 files changed

+135
-1368
lines changed

5 files changed

+135
-1368
lines changed

‎.ci/cloudbuild.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
steps:
1616

1717
- id: run integration tests
18-
name: golang:${_VERSION}
18+
name: golang:1.25
1919
env:
2020
[
2121
"IP_TYPE=${_IP_TYPE}",
@@ -55,7 +55,7 @@ steps:
5555
go test -race -v ./tests/...
5656
5757
substitutions:
58-
_VERSION: ${_VERSION}
58+
_VERSION: "1.25"
5959
_IP_TYPE: ${_IP_TYPE}
6060

6161
availableSecrets:

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
2626
go build -ldflags "-X github.com/GoogleCloudPlatform/cloud-sql-proxy/v2/cmd.metadataString=container"
2727

2828
# Final Stage
29-
FROM gcr.io/distroless/static:nonroot@sha256:f43f134f5d60bf7afb3db92f865db42514913f01a53b08cd59a1ac6534671077
29+
FROM gcr.io/distroless/static:nonroot@sha256:88a46f645e304fc0dcfbdacdfa338ce02d9890df5f936872243d553278deae92
3030

3131
LABEL org.opencontainers.image.source="https://github.com/GoogleCloudPlatform/cloud-sql-proxy"
3232

‎go.mod‎

Lines changed: 35 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/GoogleCloudPlatform/cloud-sql-proxy/v2
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/cloudsqlconn v1.20.1
@@ -13,14 +11,14 @@ require (
1311
github.com/google/go-cmp v0.7.0
1412
github.com/hanwen/go-fuse/v2 v2.9.0
1513
github.com/jackc/pgx/v5 v5.8.0
16-
github.com/microsoft/go-mssqldb v1.9.6
14+
github.com/microsoft/go-mssqldb v1.9.8
1715
github.com/spf13/cobra v1.10.2
1816
github.com/spf13/pflag v1.0.10
1917
github.com/spf13/viper v1.21.0
2018
go.opencensus.io v0.24.0
21-
golang.org/x/oauth2 v0.35.0
22-
golang.org/x/sys v0.41.0
23-
google.golang.org/api v0.266.0
19+
golang.org/x/oauth2 v0.36.0
20+
golang.org/x/sys v0.42.0
21+
google.golang.org/api v0.271.0
2422
gopkg.in/natefinch/lumberjack.v2 v2.2.1
2523
)
2624

@@ -30,63 +28,60 @@ require (
3028
cloud.google.com/go/compute/metadata v0.9.0 // indirect
3129
cloud.google.com/go/monitoring v1.24.3 // indirect
3230
cloud.google.com/go/trace v1.11.7 // indirect
33-
filippo.io/edwards25519 v1.1.0 // indirect
34-
github.com/aws/aws-sdk-go v1.43.31 // indirect
31+
filippo.io/edwards25519 v1.2.0 // indirect
32+
github.com/aws/aws-sdk-go v1.55.8 // indirect
3533
github.com/beorn7/perks v1.0.1 // indirect
36-
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
34+
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
3735
github.com/cespare/xxhash/v2 v2.3.0 // indirect
38-
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
36+
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
3937
github.com/felixge/httpsnoop v1.0.4 // indirect
4038
github.com/fsnotify/fsnotify v1.9.0 // indirect
41-
github.com/go-kit/log v0.2.1 // indirect
42-
github.com/go-logfmt/logfmt v0.5.1 // indirect
4339
github.com/go-logr/logr v1.4.3 // indirect
4440
github.com/go-logr/stdr v1.2.2 // indirect
45-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
41+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
4642
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
4743
github.com/golang-sql/sqlexp v0.1.0 // indirect
4844
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
4945
github.com/golang/protobuf v1.5.4 // indirect
5046
github.com/google/s2a-go v0.1.9 // indirect
5147
github.com/google/uuid v1.6.0 // indirect
52-
github.com/googleapis/enterprise-certificate-proxy v0.3.12 // indirect
53-
github.com/googleapis/gax-go/v2 v2.17.0 // indirect
48+
github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
49+
github.com/googleapis/gax-go/v2 v2.18.0 // indirect
5450
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5551
github.com/jackc/pgpassfile v1.0.0 // indirect
5652
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
5753
github.com/jackc/puddle/v2 v2.2.2 // indirect
5854
github.com/jmespath/go-jmespath v0.4.0 // indirect
59-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
55+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6056
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
61-
github.com/prometheus/client_golang v1.13.0 // indirect
62-
github.com/prometheus/client_model v0.2.0 // indirect
63-
github.com/prometheus/common v0.37.0 // indirect
64-
github.com/prometheus/procfs v0.8.0 // indirect
65-
github.com/prometheus/prometheus v0.35.0 // indirect
66-
github.com/prometheus/statsd_exporter v0.22.7 // indirect
57+
github.com/prometheus/client_golang v1.23.2 // indirect
58+
github.com/prometheus/client_model v0.6.2 // indirect
59+
github.com/prometheus/common v0.67.5 // indirect
60+
github.com/prometheus/procfs v0.20.1 // indirect
61+
github.com/prometheus/prometheus v0.310.0 // indirect
62+
github.com/prometheus/statsd_exporter v0.29.0 // indirect
6763
github.com/russross/blackfriday/v2 v2.1.0 // indirect
68-
github.com/sagikazarmark/locafero v0.11.0 // indirect
64+
github.com/sagikazarmark/locafero v0.12.0 // indirect
6965
github.com/shopspring/decimal v1.4.0 // indirect
70-
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
7166
github.com/spf13/afero v1.15.0 // indirect
7267
github.com/spf13/cast v1.10.0 // indirect
7368
github.com/subosito/gotenv v1.6.0 // indirect
7469
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
75-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
76-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
77-
go.opentelemetry.io/otel v1.40.0 // indirect
78-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
79-
go.opentelemetry.io/otel/trace v1.40.0 // indirect
70+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 // indirect
71+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
72+
go.opentelemetry.io/otel v1.42.0 // indirect
73+
go.opentelemetry.io/otel/metric v1.42.0 // indirect
74+
go.opentelemetry.io/otel/trace v1.42.0 // indirect
75+
go.yaml.in/yaml/v2 v2.4.4 // indirect
8076
go.yaml.in/yaml/v3 v3.0.4 // indirect
81-
golang.org/x/crypto v0.48.0 // indirect
82-
golang.org/x/net v0.50.0 // indirect
83-
golang.org/x/sync v0.19.0 // indirect
84-
golang.org/x/text v0.34.0 // indirect
85-
golang.org/x/time v0.14.0 // indirect
86-
google.golang.org/genproto v0.0.0-20260128011058-8636f8732409 // indirect
87-
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
88-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
89-
google.golang.org/grpc v1.79.1 // indirect
77+
golang.org/x/crypto v0.49.0 // indirect
78+
golang.org/x/net v0.52.0 // indirect
79+
golang.org/x/sync v0.20.0 // indirect
80+
golang.org/x/text v0.35.0 // indirect
81+
golang.org/x/time v0.15.0 // indirect
82+
google.golang.org/genproto v0.0.0-20260311181403-84a4fc48630c // indirect
83+
google.golang.org/genproto/googleapis/api v0.0.0-20260311181403-84a4fc48630c // indirect
84+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260311181403-84a4fc48630c // indirect
85+
google.golang.org/grpc v1.79.2 // indirect
9086
google.golang.org/protobuf v1.36.11 // indirect
91-
gopkg.in/yaml.v2 v2.4.0 // indirect
9287
)

0 commit comments

Comments
 (0)