Merge branch 'main' into bq-fix-storage-read-recv-err

.github/.OwlBot.yaml

@@ -314,6 +314,7 @@ deep-remove-regex:
   - /internal/generated/snippets/serviceusage/apiv1/
   - /internal/generated/snippets/servicemanagement/apiv1/
   - /internal/generated/snippets/shell/apiv1/
+  - /internal/generated/snippets/shopping/merchant/inventories/v1beta/
   - /internal/generated/snippets/spanner/admin/database/apiv1/
   - /internal/generated/snippets/spanner/admin/instance/apiv1/
   - /internal/generated/snippets/spanner/apiv1/
@@ -433,6 +434,7 @@ deep-remove-regex:
   - /serviceusage/apiv1/
   - /servicemanagement/apiv1/
   - /shell/apiv1/
+  - /shopping/merchant/inventories/v1beta/
   - /spanner/admin/database/apiv1/
   - /spanner/admin/instance/apiv1/
   - /spanner/apiv1/
@@ -916,6 +918,8 @@ deep-copy-regex:
     dest: /
   - source: /google/cloud/shell/v1/cloud.google.com/go
     dest: /
+  - source: /google/cloud/shopping/merchant/inventories/v1beta/cloud.google.com/go
+    dest: /
   - source: /google/spanner/admin/database/v1/cloud.google.com/go
     dest: /
   - source: /google/spanner/admin/instance/v1/cloud.google.com/go

internal/postprocessor/config.yaml

@@ -116,6 +116,7 @@ modules:
   - servicemanagement
   - serviceusage
   - shell
+  - shopping
   - spanner
   - speech
   - storage
@@ -766,6 +767,9 @@ service-configs:
   - input-directory: google/cloud/shell/v1
     service-config: cloudshell_v1.yaml
     import-path: cloud.google.com/go/shell/apiv1
+  - input-directory: google/cloud/shopping/merchant/inventories/v1beta
+    service-config: merchantapi_v1beta.yaml
+    import-path: cloud.google.com/go/shopping/merchant/inventories/v1beta
   - input-directory: google/cloud/speech/v1
     service-config: speech_v1.yaml
     import-path: cloud.google.com/go/speech/apiv1