Merge branch 'main' into feature/cbt-hot-backup

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-ARG VARIANT="1-1.21-bullseye"
+ARG VARIANT="1-1.22-bullseye"
 FROM mcr.microsoft.com/devcontainers/go:${VARIANT}
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive

.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
 // README at: https://github.com/devcontainers/templates/tree/main/src/go
 {
-	"name": "Go 1.21.0",
+	"name": "Go 1.22.0",
 	"build": {
 		"dockerfile": "Dockerfile"
 	},

.github/.OwlBot.lock.yaml

@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-go:infrastructure-public-image-latest
-  digest: sha256:111fd8212e7019d5ca9b806aa8dc69cc3a5226196eafd3da329509e676a75eb2
+  digest: sha256:b0991f5602d8166a262ed7853acca42ac8e7300e6ae8d0c88fe9d0f77f8c4342

.github/.OwlBot.yaml

@@ -298,6 +298,8 @@ deep-remove-regex:
   - /internal/generated/snippets/mediatranslation/apiv1beta1/
   - /internal/generated/snippets/memcache/apiv1/
   - /internal/generated/snippets/memcache/apiv1beta2/
+  - /internal/generated/snippets/memorystore/apiv1/
+  - /internal/generated/snippets/memorystore/apiv1beta/
   - /internal/generated/snippets/metastore/apiv1/
   - /internal/generated/snippets/metastore/apiv1alpha/
   - /internal/generated/snippets/metastore/apiv1beta/
@@ -383,6 +385,7 @@ deep-remove-regex:
   - /internal/generated/snippets/shopping/merchant/quota/apiv1beta/
   - /internal/generated/snippets/shopping/merchant/inventories/apiv1beta/
   - /internal/generated/snippets/shopping/merchant/reports/apiv1beta/
+  - /internal/generated/snippets/shopping/merchant/reviews/apiv1beta/
   - /internal/generated/snippets/shopping/merchant/lfp/apiv1beta/
   - /internal/generated/snippets/spanner/admin/database/apiv1/
   - /internal/generated/snippets/spanner/admin/instance/apiv1/
@@ -447,6 +450,8 @@ deep-remove-regex:
   - /mediatranslation/apiv1beta1/
   - /memcache/apiv1/
   - /memcache/apiv1beta2/
+  - /memorystore/apiv1/
+  - /memorystore/apiv1beta/
   - /metastore/apiv1/
   - /metastore/apiv1alpha/
   - /metastore/apiv1beta/
@@ -535,6 +540,7 @@ deep-remove-regex:
   - /shopping/merchant/inventories/apiv1beta/
   - /shopping/merchant/lfp/apiv1beta/
   - /shopping/merchant/reports/apiv1beta/
+  - /shopping/merchant/reviews/apiv1beta/
   - /shopping/type/
   - /spanner/admin/database/apiv1/
   - /spanner/admin/instance/apiv1/
@@ -946,6 +952,10 @@ deep-copy-regex:
     dest: /
   - source: /google/cloud/memcache/v1beta2/cloud.google.com/go
     dest: /
+  - source: /google/cloud/memorystore/v1/cloud.google.com/go
+    dest: /
+  - source: /google/cloud/memorystore/v1beta/cloud.google.com/go
+    dest: /
   - source: /google/cloud/metastore/v1/cloud.google.com/go
     dest: /
   - source: /google/cloud/metastore/v1alpha/cloud.google.com/go
@@ -1126,6 +1136,8 @@ deep-copy-regex:
     dest: /
   - source: /google/shopping/merchant/reports/v1beta/cloud.google.com/go
     dest: /
+  - source: /google/shopping/merchant/reviews/v1beta/cloud.google.com/go
+    dest: /
   - source: /google/shopping/type/cloud.google.com/go
     dest: /
   - source: /google/spanner/admin/database/v1/cloud.google.com/go

.github/renovate.json

@@ -13,10 +13,7 @@
     "commitMessageAction": "update",
     "groupName": "deps",
     "ignoreDeps": [
-        "golang.org/x/mod",
-        "golang.org/x/tools",
-        "google.golang.org/genproto",
-        "github.com/google/pprof"
+        "google.golang.org/genproto"
     ],
     "ignorePaths": [
         "**/snippets/**"
@@ -33,7 +30,7 @@
     ],
     "force": {
         "constraints": {
-            "go": "1.21"
+            "go": "1.22"
         }
     }
 }

.github/workflows/conformance.yaml

@@ -36,7 +36,7 @@ jobs:
     strategy:
       matrix:
         # Bigtable test proxy can be run on any of these Go versions
-        go: [ '1.21', '1.23']
+        go: [ '1.22', '1.23']
         folders: ['bigtable']
     steps:
     - uses: actions/checkout@v4

.github/workflows/vet.sh

@@ -80,7 +80,7 @@ golint ./... 2>&1 | (
 ) |
   tee /dev/stderr | (! read)
 
-staticcheck -go 1.15 ./... 2>&1 | (
+staticcheck -go 1.22 ./... 2>&1 | (
   grep -v SA1019 |
     grep -v go-cloud-debug-agent |
     grep -v internal/btree/btree.go |

.github/workflows/vet.yml

@@ -19,12 +19,11 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v5
       with:
-        go-version: '1.21.x'
+        go-version: '1.22.x'
     - name: Install tools
-      # go: golang.org/x/tools/cmd/goimports@latest: golang.org/x/[email protected] requires go >= 1.22.0
       run: |
         go install golang.org/x/lint/golint@latest && \
-        go install golang.org/x/tools/cmd/goimports@v0.24.0 && \
-        go install honnef.co/go/tools/cmd/staticcheck@v0.4.7
+        go install golang.org/x/tools/cmd/goimports@v0.29.0 && \
+        go install honnef.co/go/tools/cmd/staticcheck@v0.5.1
     - name: Execute vet.sh
       run: ./.github/workflows/vet.sh

.release-please-manifest-individual.json

@@ -1,16 +1,16 @@
 {
-  "auth": "0.11.0",
+  "auth": "0.13.0",
   "auth/oauth2adapt": "0.2.6",
-  "bigquery": "1.64.0",
-  "bigtable": "1.33.0",
+  "bigquery": "1.65.0",
+  "bigtable": "1.34.0",
   "datastore": "1.20.0",
-  "errorreporting": "0.3.1",
-  "firestore": "1.17.0",
-  "logging": "1.12.0",
-  "profiler": "0.4.1",
-  "pubsub": "1.45.2",
+  "errorreporting": "0.3.2",
+  "firestore": "1.18.0",
+  "logging": "1.13.0",
+  "profiler": "0.4.2",
+  "pubsub": "1.45.3",
   "pubsublite": "1.8.2",
   "spanner": "1.73.0",
-  "storage": "1.47.0",
-  "vertexai": "0.13.2"
+  "storage": "1.49.0",
+  "vertexai": "0.13.3"
 }