From 4b03485f68621eed8e1aea465cccc2d98d4db71d Mon Sep 17 00:00:00 2001 From: Cody Oss <6331106+codyoss@users.noreply.github.com> Date: Mon, 10 Apr 2023 09:46:38 -0500 Subject: [PATCH] chore: reenable asset on owlbot (#7709) Fixes: #7352 --- .github/.OwlBot.yaml | 9 +++++++++ internal/gapicgen/generator/config.go | 24 ------------------------ internal/postprocessor/config.yaml | 15 ++++++--------- 3 files changed, 15 insertions(+), 33 deletions(-) diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index 3bb5b95fcb59..e3573b39c7c9 100644 --- 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 index 40ea995ed035..90868ff55fc3 100644 --- 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 index e47b96da1cef..7de9e5319d08 100644 --- 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