Merge branch 'main' into release-please--branches--main--components--…

…storage
googleapis · Jan 18, 2023 · 0ce2117 · 0ce2117
2 parents 446e7db + 5bd944d
commit 0ce2117
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
@@ -3,30 +3,30 @@ docker:
 
 deep-remove-regex:
   - /dialogflow/cx/apiv3beta1
-  - /dialogflow/cx/apiv3
-  - /dialogflow/apiv2
-  - /datastream/apiv1
-  - /datastream/apiv1alpha1
-  - /secretmanager/apiv1
+  # - /dialogflow/cx/apiv3
+  # - /dialogflow/apiv2
+  # - /datastream/apiv1
+  # - /datastream/apiv1alpha1
+  # - /secretmanager/apiv1
 
 deep-preserve-regex:
   - /.*/version.go
-  - /secretmanager/apiv1/iam.go
-  - /secretmanager/apiv1/iam_example_test.go
+  # - /secretmanager/apiv1/iam.go
+  # - /secretmanager/apiv1/iam_example_test.go
 
 deep-copy-regex:
   - source: /google/cloud/dialogflow/cx/v3beta1/cloud.google.com/go/dialogflow/cx/apiv3beta1
     dest: /dialogflow/cx/apiv3beta1
-  - source: /google/cloud/dialogflow/cx/v3/cloud.google.com/go/dialogflow/cx/apiv3
-    dest: /dialogflow/cx/apiv3
-  - source: /google/cloud/dialogflow/v2/cloud.google.com/go/dialogflow/apiv2
-    dest: /dialogflow/apiv2
-  - source: /google/cloud/datastream/v1/cloud.google.com/go/datastream/apiv1
-    dest: /datastream/apiv1
-  - source: /google/cloud/datastream/v1alpha1/cloud.google.com/go/datastream/apiv1alpha1
-    dest: /datastream/apiv1alpha1
-  - source: /google/cloud/secretmanager/v1/cloud.google.com/go/secretmanager/apiv1
-    dest: /secretmanager/apiv1
+  # - source: /google/cloud/dialogflow/cx/v3/cloud.google.com/go/dialogflow/cx/apiv3
+  #   dest: /dialogflow/cx/apiv3
+  # - source: /google/cloud/dialogflow/v2/cloud.google.com/go/dialogflow/apiv2
+  #   dest: /dialogflow/apiv2
+  # - source: /google/cloud/datastream/v1/cloud.google.com/go/datastream/apiv1
+  #   dest: /datastream/apiv1
+  # - source: /google/cloud/datastream/v1alpha1/cloud.google.com/go/datastream/apiv1alpha1
+  #   dest: /datastream/apiv1alpha1
+  # - source: /google/cloud/secretmanager/v1/cloud.google.com/go/secretmanager/apiv1
+  #   dest: /secretmanager/apiv1
 
 # api-name inserts a [REPLACEME] in OwlBot generated commit messages that is used by
 # postprocessor to identify commit titles that need scope added

diff --git a/internal/gapicgen/generator/config.go b/internal/gapicgen/generator/config.go
@@ -385,7 +385,6 @@ var MicrogenGapicConfigs = []*MicrogenConfig{
 		GRPCServiceConfigPath: "secretmanager_grpc_service_config.json",
 		ApiServiceConfigPath:  "secretmanager_v1.yaml",
 		ReleaseLevel:          "ga",
-		StopGeneration:        true,
 	},
 	{
 		InputDirectoryPath:    "google/cloud/osconfig/v1",
@@ -657,7 +656,6 @@ var MicrogenGapicConfigs = []*MicrogenConfig{
 		GRPCServiceConfigPath: "dialogflow_grpc_service_config.json",
 		ApiServiceConfigPath:  "dialogflow_v3.yaml",
 		ReleaseLevel:          "ga",
-		StopGeneration:        true,
 	},
 	{
 		InputDirectoryPath:    "google/cloud/dialogflow/v2",
@@ -666,7 +664,6 @@ var MicrogenGapicConfigs = []*MicrogenConfig{
 		GRPCServiceConfigPath: "dialogflow_grpc_service_config.json",
 		ApiServiceConfigPath:  "dialogflow_v2.yaml",
 		ReleaseLevel:          "ga",
-		StopGeneration:        true,
 	},
 	{
 		InputDirectoryPath:    "google/iam/credentials/v1",
@@ -1305,7 +1302,6 @@ var MicrogenGapicConfigs = []*MicrogenConfig{
 		GRPCServiceConfigPath: "datastream_grpc_service_config.json",
 		ApiServiceConfigPath:  "datastream_v1alpha1.yaml",
 		ReleaseLevel:          "alpha",
-		StopGeneration:        true,
 	},
 	{
 		InputDirectoryPath:    "google/dataflow/v1beta3",
@@ -1514,7 +1510,6 @@ var MicrogenGapicConfigs = []*MicrogenConfig{
 		GRPCServiceConfigPath: "datastream_grpc_service_config.json",
 		ApiServiceConfigPath:  "datastream_v1.yaml",
 		ReleaseLevel:          "ga",
-		StopGeneration:        true,
 	},
 	{
 		InputDirectoryPath:    "google/cloud/notebooks/v1",