revert(cloudbuild): "feat(cloudbuild): Start generating apiv1/v3" (#2840)

codyoss · web-flow · commit 3aaf755476df · 2020-09-10T18:30:03.000Z
The breaking changes have been rolled back, there is no need to generate under a new package. This reverts commit 358a536.
diff --git 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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,7 @@ var microgenGapicConfigs = []*microgenConfig{`
`545`	`545`	`{`
`546`	`546`	`inputDirectoryPath: "google/devtools/cloudbuild/v1",`
`547`	`547`	`pkg: "cloudbuild",`
`548`		`- importPath: "cloud.google.com/go/cloudbuild/apiv1/v3",`
	`548`	`+ importPath: "cloud.google.com/go/cloudbuild/apiv1/v2",`
`549`	`549`	`gRPCServiceConfigPath: "google/devtools/cloudbuild/v1/cloudbuild_grpc_service_config.json",`
`550`	`550`	`apiServiceConfigPath: "google/devtools/cloudbuild/v1/cloudbuild_v1.yaml",`
`551`	`551`	`releaseLevel: "ga",`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ var apivExceptions = map[string]bool{`
`30`	`30`	`"cloud.google.com/go/firestore/apiv1/admin": true,`
`31`	`31`	`"cloud.google.com/go/cloudbuild/apiv1/v2": true,`
`32`	`32`	`"cloud.google.com/go/monitoring/apiv3/v2": true,`
`33`		`- "cloud.google.com/go/cloudbuild/apiv1/v3": true,`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`// TestMicrogenConfigs validates config entries.`