From 3aaf755476dfea1700986fc086f53fc1ab756557 Mon Sep 17 00:00:00 2001 From: Cody Oss <6331106+codyoss@users.noreply.github.com> Date: Thu, 10 Sep 2020 12:30:03 -0600 Subject: [PATCH] revert(cloudbuild): "feat(cloudbuild): Start generating apiv1/v3" (#2840) The breaking changes have been rolled back, there is no need to generate under a new package. This reverts commit 358a5368da64cf4868551652e852ceb453504f64. --- internal/gapicgen/generator/config.go | 2 +- internal/gapicgen/generator/config_test.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/gapicgen/generator/config.go b/internal/gapicgen/generator/config.go index a22e37ce3ee..8930e76152b 100644 --- a/internal/gapicgen/generator/config.go +++ b/internal/gapicgen/generator/config.go @@ -545,7 +545,7 @@ var microgenGapicConfigs = []*microgenConfig{ { inputDirectoryPath: "google/devtools/cloudbuild/v1", pkg: "cloudbuild", - importPath: "cloud.google.com/go/cloudbuild/apiv1/v3", + importPath: "cloud.google.com/go/cloudbuild/apiv1/v2", gRPCServiceConfigPath: "google/devtools/cloudbuild/v1/cloudbuild_grpc_service_config.json", apiServiceConfigPath: "google/devtools/cloudbuild/v1/cloudbuild_v1.yaml", releaseLevel: "ga", diff --git a/internal/gapicgen/generator/config_test.go b/internal/gapicgen/generator/config_test.go index 85d679579ca..006d4533beb 100644 --- a/internal/gapicgen/generator/config_test.go +++ b/internal/gapicgen/generator/config_test.go @@ -30,7 +30,6 @@ var apivExceptions = map[string]bool{ "cloud.google.com/go/firestore/apiv1/admin": true, "cloud.google.com/go/cloudbuild/apiv1/v2": true, "cloud.google.com/go/monitoring/apiv3/v2": true, - "cloud.google.com/go/cloudbuild/apiv1/v3": true, } // TestMicrogenConfigs validates config entries.