Merge branch 'dev' into dev

jonathanedey · web-flow · commit 92fb8e423c9e · 2025-06-03T14:11:24.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ['1.21', '1.22', '1.23']
+        go: ['1.23', '1.24']
 
     steps:
     - name: Check out code
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: '1.21'
+        go-version: '1.23'
 
     - name: Install golint
       run: go install golang.org/x/lint/golint@latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -47,7 +47,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: '1.21'
+        go-version: '1.23'
 
     - name: Install golint
       run: go install golang.org/x/lint/golint@latest
diff --git a/README.md b/README.md
@@ -44,10 +44,10 @@ requests, code review feedback, and also pull requests.
 
 ## Supported Go Versions
 
-The Admin Go SDK is compatible with at least the three most recent, major Go releases.
-We currently support Go v1.21 and higher.
+The Admin Go SDK is compatible with the two most-recent major Go releases.
+We currently support Go v1.23 and 1.24.
 [Continuous integration](https://github.com/firebase/firebase-admin-go/actions) system
-tests the code on Go v1.21 through v1.23.
+tests the code on Go v1.23 and v1.24.
 
 ## Documentation
 
diff --git a/db/db_test.go b/db/db_test.go
@@ -108,7 +108,7 @@ func TestNewClient(t *testing.T) {
 		t.Run(tc.Name, func(t *testing.T) {
 			t.Setenv(emulatorDatabaseEnvVar, tc.EnvURL)
 			fromEnv := os.Getenv(emulatorDatabaseEnvVar)
-			fmt.Printf(fromEnv)
+			fmt.Printf("%s", fromEnv)
 			c, err := NewClient(context.Background(), &internal.DatabaseConfig{
 				Opts:         testOpts,
 				URL:          tc.URL,
diff --git a/db/ref_test.go b/db/ref_test.go
@@ -711,7 +711,7 @@ func TestTransactionError(t *testing.T) {
 			mock.Header = map[string]string{"ETag": "mock-etag2"}
 			mock.Resp = &person{"Peter Parker", 19}
 		} else if cnt == 1 {
-			return nil, fmt.Errorf(want)
+			return nil, fmt.Errorf("%s", want)
 		}
 		cnt++
 		var p person
diff --git a/firebase.go b/firebase.go
@@ -39,7 +39,7 @@ import (
 var defaultAuthOverrides = make(map[string]interface{})
 
 // Version of the Firebase Go Admin SDK.
-const Version = "4.15.1"
+const Version = "4.15.2"
 
 // firebaseEnvName is the name of the environment variable with the Config.
 const firebaseEnvName = "FIREBASE_CONFIG"
diff --git a/go.mod b/go.mod
@@ -1,49 +1,66 @@
 module firebase.google.com/go/v4
 
-go 1.21
+go 1.24
+
+toolchain go1.24.1
 
 require (
-	cloud.google.com/go/firestore v1.15.0
-	cloud.google.com/go/storage v1.40.0
+	cloud.google.com/go/firestore v1.18.0
+	cloud.google.com/go/storage v1.53.0
 	github.com/MicahParks/keyfunc v1.9.0
-	github.com/golang-jwt/jwt/v4 v4.5.1
-	github.com/google/go-cmp v0.6.0
-	golang.org/x/oauth2 v0.18.0
-	google.golang.org/api v0.170.0
-	google.golang.org/appengine/v2 v2.0.2
+	github.com/golang-jwt/jwt/v4 v4.5.2
+	github.com/google/go-cmp v0.7.0
+	golang.org/x/oauth2 v0.30.0
+	google.golang.org/api v0.231.0
+	google.golang.org/appengine/v2 v2.0.6
 )
 
 require (
-	cloud.google.com/go v0.112.1 // indirect
-	cloud.google.com/go/compute v1.24.0 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v1.1.7 // indirect
-	cloud.google.com/go/longrunning v0.5.5 // indirect
+	cel.dev/expr v0.23.1 // indirect
+	cloud.google.com/go v0.121.0 // indirect
+	cloud.google.com/go/auth v0.16.1 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
+	cloud.google.com/go/compute/metadata v0.6.0 // indirect
+	cloud.google.com/go/iam v1.5.2 // indirect
+	cloud.google.com/go/longrunning v0.6.7 // indirect
+	cloud.google.com/go/monitoring v1.24.2 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
+	github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
+	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-jose/go-jose/v4 v4.1.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/s2a-go v0.1.7 // indirect
+	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
-	github.com/googleapis/gax-go/v2 v2.12.3 // indirect
-	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
-	go.opentelemetry.io/otel v1.24.0 // indirect
-	go.opentelemetry.io/otel/metric v1.24.0 // indirect
-	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect
-	google.golang.org/grpc v1.62.1 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
+	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
+	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
+	github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
+	github.com/zeebo/errs v1.4.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
+	go.opentelemetry.io/otel v1.35.0 // indirect
+	go.opentelemetry.io/otel/metric v1.35.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.35.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
+	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+	golang.org/x/crypto v0.38.0 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
+	google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect
+	google.golang.org/grpc v1.72.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/messaging/messaging.go b/messaging/messaging.go
diff --git a/messaging/messaging_test.go b/messaging/messaging_test.go

Original file line number	Diff line number	Diff line change
`@@ -711,7 +711,7 @@ func TestTransactionError(t *testing.T) {`
`711`	`711`	`mock.Header = map[string]string{"ETag": "mock-etag2"}`
`712`	`712`	`mock.Resp = &person{"Peter Parker", 19}`
`713`	`713`	`} else if cnt == 1 {`
`714`		`- return nil, fmt.Errorf(want)`
	`714`	`+ return nil, fmt.Errorf("%s", want)`
`715`	`715`	`}`
`716`	`716`	`cnt++`
`717`	`717`	`var p person`