chore: update to 1.21 (#2735)

googleapis · Aug 14, 2024 · c2b2ac9 · c2b2ac9
1 parent 4118ec2
commit c2b2ac9
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 10 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -12,8 +12,7 @@
   "commitMessageAction": "update",
   "groupName": "all",
   "ignoreDeps": [
-    "google.golang.org/appengine",
-    "google.golang.org/grpc"
+    "google.golang.org/appengine"
   ],
   "packageRules": [
     {
@@ -26,7 +25,7 @@
   ],
   "force": {
     "constraints": {
-      "go": "1.20"
+      "go": "1.21"
     }
   }
 }
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module google.golang.org/api
 
-go 1.20
+go 1.21
 
 require (
 	cloud.google.com/go v0.115.0

diff --git a/go.sum b/go.sum
@@ -40,6 +40,7 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -67,6 +68,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
@@ -129,6 +131,7 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY
 google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf h1:OqdXDEakZCVtDiZTjcxfwbHPCT11ycCEsTKesBVKvyY=
 google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:mCr1K1c8kX+1iSBREvU3Juo11CB+QOEWxbRS01wWl5M=
 google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f h1:b1Ln/PG8orm0SsBbHZWke8dDp2lrCD4jSmfglFpTZbk=
+google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f/go.mod h1:AHT0dDg3SoMOgZGnZk29b5xTbPHMoEC8qthmBLJCpys=
 google.golang.org/genproto/googleapis/bytestream v0.0.0-20240730163845-b1a4ccb954bf h1:T4tsZBlZYXK3j40sQNP5MBO32I+rn6ypV1PpklsiV8k=
 google.golang.org/genproto/googleapis/bytestream v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:5/MT647Cn/GGhwTpXC7QqcaR5Cnee4v4MKCU1/nwnIQ=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf h1:liao9UHurZLtiEwBgT9LMOnKYsHze6eA6w1KQCMVN2Q=

diff --git a/go.work b/go.work
@@ -1,4 +1,4 @@
-go 1.20
+go 1.21
 
 use (
 	.

diff --git a/go.work.sum b/go.work.sum
diff --git a/internal/kokoro/vet.sh b/internal/kokoro/vet.sh
@@ -41,7 +41,7 @@ golint ./... 2>&1 | (
     grep -vE "\.pb\.go:" || true
 ) | tee /dev/stderr | (! read)
 
-staticcheck -go 1.9 ./... 2>&1 | (
+staticcheck -go 1.23 ./... 2>&1 | (
   grep -v "SA1019" |
     grep -v "S1007" |
     grep -v "error var Done should have name of the form ErrFoo" |

diff --git a/option/internaloption/internaloption_test.go b/option/internaloption/internaloption_test.go
@@ -58,6 +58,6 @@ func TestDefaultApply(t *testing.T) {
 		cmpopts.IgnoreFields(google.Credentials{}, "udMu", "universeDomain"),
 	}
 	if !cmp.Equal(got, want, ignore...) {
-		t.Errorf(cmp.Diff(got, want, ignore...))
+		t.Error(cmp.Diff(got, want, ignore...))
 	}
 }
diff --git a/option/option_test.go b/option/option_test.go
@@ -99,7 +99,7 @@ func TestApply(t *testing.T) {
 		cmpopts.IgnoreFields(google.Credentials{}, "udMu", "universeDomain"),
 	}
 	if !cmp.Equal(got, want, ignore...) {
-		t.Errorf(cmp.Diff(got, want, ignore...))
+		t.Error(cmp.Diff(got, want, ignore...))
 	}
 }
 
@@ -130,6 +130,6 @@ func TestApplyClientCertSource(t *testing.T) {
 		t.Error(err)
 	}
 	if !cmp.Equal(certGot, certWant, cmpopts.IgnoreUnexported(big.Int{}), cmpopts.IgnoreFields(tls.Certificate{}, "Leaf")) {
-		t.Errorf(cmp.Diff(certGot, certWant, cmpopts.IgnoreUnexported(big.Int{}), cmpopts.IgnoreFields(tls.Certificate{}, "Leaf")))
+		t.Error(cmp.Diff(certGot, certWant, cmpopts.IgnoreUnexported(big.Int{}), cmpopts.IgnoreFields(tls.Certificate{}, "Leaf")))
 	}
 }