Skip to content

Commit db529ad

Browse files
committed
chore: Update dependencies to latest as of 2026-05-04
1 parent 87a84fb commit db529ad

6 files changed

Lines changed: 56 additions & 54 deletions

File tree

Dockerfile.alpine

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.alpine"
2727

2828
# Final stage
29-
FROM alpine:3@sha256:5b10f432ef3da1b8d4c7eb6c487f2f5a8f096bc91145e68878dd4a5019afde11
29+
FROM alpine:3@sha256:4d889c14e7d5a73929ab00be2ef8ff22437e7cbc545931e52554a7b00e123d8b
3030

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

Dockerfile.bookworm

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.bookworm"
2727

2828
# Final stage
29-
FROM gcr.io/cloud-marketplace-containers/google/debian12@sha256:cf8344264656f8e053bf791a4687a459bfb73808b3cca9742085ff333a320db6
29+
FROM gcr.io/cloud-marketplace-containers/google/debian12@sha256:bd98c05df056eb8ba216ae36e65f834ba3e97999cb7875f545fe7b186d4abf9a
3030

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

Dockerfile.bullseye

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.bullseye"
2727

2828
# Final stage
29-
FROM gcr.io/cloud-marketplace-containers/google/debian11@sha256:5a1ec8337ed8e9e4a41cfa6ac1b6a73fc3ddf4cab60cda1ef807d1e6a8b1f74d
29+
FROM gcr.io/cloud-marketplace-containers/google/debian11@sha256:c478cfda4573217c270200b1332b34e7c52c2790968f9e8758044e661de3459a
3030

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

build.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function test() {
4343

4444
## e2e - Runs end-to-end integration tests.
4545
function e2e() {
46-
if [[ ! -f .envrc ]] ; then
46+
if [[ ! -s .envrc ]] ; then
4747
write_e2e_env .envrc
4848
fi
4949
source .envrc
@@ -97,7 +97,9 @@ function lint() {
9797
# Check the commit includes a go.mod that is fully
9898
# up to date.
9999
fix
100-
if [[ -d "$SCRIPT_DIR/.git" ]] ; then
100+
if which jj &>/dev/null && jj root &>/dev/null; then
101+
echo "Skipping git diff check in jj repo"
102+
elif [[ -d "$SCRIPT_DIR/.git" ]] ; then
101103
git diff --exit-code
102104
fi
103105
}
@@ -212,7 +214,7 @@ function write_e2e_env(){
212214
exit 1
213215
fi
214216

215-
local_user=$(gcloud auth list --format 'value(account)' | tr -d '\n')
217+
local_user=$(gcloud config get-value account)
216218

217219
echo "Getting test secrets from $TEST_PROJECT into $1"
218220
{

go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,35 @@ require (
77
contrib.go.opencensus.io/exporter/prometheus v0.4.2
88
contrib.go.opencensus.io/exporter/stackdriver v0.13.14
99
github.com/coreos/go-systemd/v22 v22.7.0
10-
github.com/go-sql-driver/mysql v1.9.3
10+
github.com/go-sql-driver/mysql v1.10.0
1111
github.com/google/go-cmp v0.7.0
12-
github.com/hanwen/go-fuse/v2 v2.9.0
13-
github.com/jackc/pgx/v5 v5.9.1
14-
github.com/microsoft/go-mssqldb v1.9.8
12+
github.com/hanwen/go-fuse/v2 v2.10.1
13+
github.com/jackc/pgx/v5 v5.9.2
14+
github.com/microsoft/go-mssqldb v1.10.0
1515
github.com/spf13/cobra v1.10.2
1616
github.com/spf13/pflag v1.0.10
1717
github.com/spf13/viper v1.21.0
1818
go.opencensus.io v0.24.0
1919
golang.org/x/oauth2 v0.36.0
2020
golang.org/x/sys v0.43.0
21-
google.golang.org/api v0.276.0
21+
google.golang.org/api v0.277.0
2222
gopkg.in/natefinch/lumberjack.v2 v2.2.1
2323
)
2424

2525
require (
2626
cloud.google.com/go/auth v0.20.0 // indirect
2727
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
2828
cloud.google.com/go/compute/metadata v0.9.0 // indirect
29-
cloud.google.com/go/monitoring v1.27.0 // indirect
30-
cloud.google.com/go/trace v1.14.0 // indirect
29+
cloud.google.com/go/monitoring v1.28.0 // indirect
30+
cloud.google.com/go/trace v1.15.0 // indirect
3131
filippo.io/edwards25519 v1.2.0 // indirect
3232
github.com/aws/aws-sdk-go v1.55.8 // indirect
3333
github.com/beorn7/perks v1.0.1 // indirect
3434
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
3535
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3636
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
3737
github.com/felixge/httpsnoop v1.0.4 // indirect
38-
github.com/fsnotify/fsnotify v1.9.0 // indirect
38+
github.com/fsnotify/fsnotify v1.10.1 // indirect
3939
github.com/go-logr/logr v1.4.3 // indirect
4040
github.com/go-logr/stdr v1.2.2 // indirect
4141
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
@@ -53,12 +53,12 @@ require (
5353
github.com/jackc/puddle/v2 v2.2.2 // indirect
5454
github.com/jmespath/go-jmespath v0.4.0 // indirect
5555
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
56-
github.com/pelletier/go-toml/v2 v2.3.0 // indirect
56+
github.com/pelletier/go-toml/v2 v2.3.1 // indirect
5757
github.com/prometheus/client_golang v1.23.2 // indirect
5858
github.com/prometheus/client_model v0.6.2 // indirect
5959
github.com/prometheus/common v0.67.5 // indirect
6060
github.com/prometheus/procfs v0.20.1 // indirect
61-
github.com/prometheus/prometheus v0.311.2 // indirect
61+
github.com/prometheus/prometheus v0.311.3 // indirect
6262
github.com/prometheus/statsd_exporter v0.29.0 // indirect
6363
github.com/russross/blackfriday/v2 v2.1.0 // indirect
6464
github.com/sagikazarmark/locafero v0.12.0 // indirect
@@ -79,9 +79,9 @@ require (
7979
golang.org/x/sync v0.20.0 // indirect
8080
golang.org/x/text v0.36.0 // indirect
8181
golang.org/x/time v0.15.0 // indirect
82-
google.golang.org/genproto v0.0.0-20260414002931-afd174a4e478 // indirect
83-
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478 // indirect
84-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 // indirect
85-
google.golang.org/grpc v1.80.0 // indirect
82+
google.golang.org/genproto v0.0.0-20260504160031-60b97b32f348 // indirect
83+
google.golang.org/genproto/googleapis/api v0.0.0-20260504160031-60b97b32f348 // indirect
84+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260504160031-60b97b32f348 // indirect
85+
google.golang.org/grpc v1.81.0 // indirect
8686
google.golang.org/protobuf v1.36.11 // indirect
8787
)

0 commit comments

Comments
 (0)