chore: reenable asset on owlbot (#7709)

Fixes: #7352
googleapis · Apr 10, 2023 · 4b03485 · 4b03485
1 parent c43900b
commit 4b03485
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 33 deletions.
diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
@@ -14,6 +14,9 @@ deep-remove-regex:
   - /area120/tables/apiv1alpha1/
   - /artifactregistry/apiv1/
   - /artifactregistry/apiv1beta2/
+  - /asset/apiv1/
+  - /asset/apiv1p2beta1/
+  - /asset/apiv1p5beta1/
   - /assuredworkloads/apiv1/
   - /assuredworkloads/apiv1beta1/
   - /automl/apiv1/
@@ -230,6 +233,12 @@ deep-copy-regex:
     dest: /apigateway/apiv1
   - source: /google/cloud/apigeeconnect/v1/cloud.google.com/go/apigeeconnect/apiv1
     dest: /apigeeconnect/apiv1
+  - source: /google/cloud/asset/v1/cloud.google.com/go/asset/apiv1
+    dest: /asset/apiv1
+  - source: /google/cloud/asset/v1p2beta1/cloud.google.com/go/asset/apiv1p2beta1
+    dest: /asset/apiv1p2beta1
+  - source: /google/cloud/asset/v1p5beta1/cloud.google.com/go/asset/apiv1p5beta1
+    dest: /asset/apiv1p5beta1
   - source: /google/api/apikeys/v2/cloud.google.com/go/apikeys/apiv2
     dest: /apikeys/apiv2
   - source: /google/appengine/v1/cloud.google.com/go/appengine/apiv1

diff --git a/internal/gapicgen/generator/config.go b/internal/gapicgen/generator/config.go
@@ -153,30 +153,6 @@ var MicrogenGapicConfigs = []*MicrogenConfig{
 		NumericEnumsDisabled:  true,
 		Transports:            []string{"grpc"},
 	},
-	{
-		InputDirectoryPath:    "google/cloud/asset/v1",
-		Pkg:                   "asset",
-		ImportPath:            "cloud.google.com/go/asset/apiv1",
-		GRPCServiceConfigPath: "cloudasset_grpc_service_config.json",
-		ApiServiceConfigPath:  "cloudasset_v1.yaml",
-		ReleaseLevel:          "ga",
-	},
-	{
-		InputDirectoryPath:    "google/cloud/asset/v1p2beta1",
-		Pkg:                   "asset",
-		ImportPath:            "cloud.google.com/go/asset/apiv1p2beta1",
-		GRPCServiceConfigPath: "cloudasset_grpc_service_config.json",
-		ApiServiceConfigPath:  "cloudasset_v1p2beta1.yaml",
-		ReleaseLevel:          "beta",
-	},
-	{
-		InputDirectoryPath:    "google/cloud/asset/v1p5beta1",
-		Pkg:                   "asset",
-		ImportPath:            "cloud.google.com/go/asset/apiv1p5beta1",
-		GRPCServiceConfigPath: "cloudasset_grpc_service_config.json",
-		ApiServiceConfigPath:  "cloudasset_v1p5beta1.yaml",
-		ReleaseLevel:          "beta",
-	},
 	{
 		InputDirectoryPath:    "google/cloud/bigquery/analyticshub/v1",
 		Pkg:                   "analyticshub",

diff --git a/internal/postprocessor/config.yaml b/internal/postprocessor/config.yaml
@@ -255,6 +255,12 @@ service-configs:
    service-config: apigateway_v1.yaml
  - input-directory: google/cloud/apigeeconnect/v1
    service-config: apigeeconnect_v1.yaml
+ - input-directory: google/cloud/asset/v1
+   service-config: cloudasset_v1.yaml
+ - input-directory: google/cloud/asset/v1p2beta1
+   service-config: cloudasset_v1p2beta1.yaml
+ - input-directory: google/cloud/asset/v1p5beta1
+   service-config: cloudasset_v1p5beta1.yaml
  - input-directory: google/cloud/assuredworkloads/v1
    service-config: assuredworkloads_v1.yaml
  - input-directory: google/cloud/assuredworkloads/v1beta1
@@ -616,15 +622,6 @@ service-configs:
  - input-directory: google/cloud/apigeeregistry/v1
    service-config: apigeeregistry_v1.yaml
    import-path: cloud.google.com/go/apigeeregistry/apiv1
- - input-directory: google/cloud/asset/v1
-   service-config: cloudasset_v1.yaml
-   import-path: cloud.google.com/go/asset/apiv1
- - input-directory: google/cloud/asset/v1p2beta1
-   service-config: cloudasset_v1p2beta1.yaml
-   import-path: cloud.google.com/go/asset/apiv1p2beta1
- - input-directory: google/cloud/asset/v1p5beta1
-   service-config: cloudasset_v1p5beta1.yaml
-   import-path: cloud.google.com/go/asset/apiv1p5beta1
  - input-directory: google/cloud/bigquery/analyticshub/v1
    service-config: analyticshub_v1.yaml
    import-path: cloud.google.com/go/bigquery/analyticshub/apiv1