chore(internal/gapicgen): remove all code related to updating google-…

…cloud-go (#7771) Also migrate all clients onto owlbot
googleapis · Apr 21, 2023 · 91a6100 · 91a6100
1 parent 6d70113
commit 91a6100
Show file tree

Hide file tree

Showing 17 changed files with 103 additions and 1,200 deletions.
diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
@@ -53,7 +53,7 @@ deep-remove-regex:
   - /binaryauthorization/apiv1beta1/
   - /certificatemanager/apiv1/
   - /channel/apiv1/
-  # - /cloudbuild/apiv1/v2/
+  - /cloudbuild/apiv1/v2/
   - /cloudbuild/apiv2/
   - /clouddms/apiv1/
   - /cloudtasks/apiv2/
@@ -78,6 +78,7 @@ deep-remove-regex:
   - /datastore/admin/apiv1/
   - /datastream/apiv1/
   - /datastream/apiv1alpha1/
+  - /debugger/apiv2/
   - /deploy/apiv1/
   - /dialogflow/apiv2/
   - /dialogflow/apiv2beta1/
@@ -89,6 +90,7 @@ deep-remove-regex:
   - /documentai/apiv1beta3/
   - /domains/apiv1beta1/
   - /edgecontainer/apiv1/
+  - /errorreporting/apiv1beta1/
   - /essentialcontacts/apiv1/
   - /eventarc/apiv1/
   - /eventarc/publishing/apiv1/
@@ -128,6 +130,7 @@ deep-remove-regex:
   - /metastore/apiv1/
   - /metastore/apiv1alpha/
   - /metastore/apiv1beta/
+  - /monitoring/apiv3/v2/
   - /monitoring/dashboard/apiv1/
   - /monitoring/metricsscope/apiv1/
   - /networkconnectivity/apiv1/
@@ -153,7 +156,8 @@ deep-remove-regex:
   - /privatecatalog/apiv1beta1/
   - /pubsub/apiv1/
   - /pubsublite/apiv1/
-  # - /recaptchaenterprise/v2/apiv1beta1/
+  - /recaptchaenterprise/v2/apiv1/
+  - /recaptchaenterprise/v2/apiv1beta1/
   - /recommendationengine/apiv1beta1/
   - /recommender/apiv1/
   - /recommender/apiv1beta1/
@@ -187,19 +191,23 @@ deep-remove-regex:
   - /speech/apiv1/
   - /speech/apiv1p1beta1/
   - /speech/apiv2/
+  - /storage/internal/apiv2/
   - /storagetransfer/apiv1/
   - /talent/apiv4/
   - /talent/apiv4beta1/
   - /texttospeech/apiv1/
   - /tpu/apiv1/
   - /trace/apiv1/
   - /trace/apiv2/
+  - /translate/apiv3/
   - /video/livestream/apiv1/
   # - /video/stitcher/apiv1/
   - /video/transcoder/apiv1/
   - /videointelligence/apiv1/
   - /videointelligence/apiv1beta2/
   - /videointelligence/apiv1p3beta1/
+  - /vision/v2/apiv1/
+  - /vision/v2/apiv1p1beta1/ 
   - /vmmigration/apiv1/
   - /vmwareengine/apiv1/
   - /vpcaccess/apiv1/
@@ -354,8 +362,8 @@ deep-copy-regex:
     dest: /certificatemanager/apiv1
   - source: /google/cloud/channel/v1/cloud.google.com/go/channel/apiv1
     dest: /channel/apiv1
-  # - source: /google/devtools/cloudbuild/v1/cloud.google.com/go/cloudbuild/apiv1/v2
-  #   dest: /cloudbuild/apiv1/v2
+  - source: /google/devtools/cloudbuild/v1/cloud.google.com/go/cloudbuild/apiv1/v2
+    dest: /cloudbuild/apiv1/v2
   - source: /google/devtools/cloudbuild/v2/cloud.google.com/go/cloudbuild/apiv2
     dest: /cloudbuild/apiv2
   - source: /google/cloud/clouddms/v1/cloud.google.com/go/clouddms/apiv1
@@ -404,6 +412,8 @@ deep-copy-regex:
     dest: /datastream/apiv1
   - source: /google/cloud/datastream/v1alpha1/cloud.google.com/go/datastream/apiv1alpha1
     dest: /datastream/apiv1alpha1
+  - source: /google/devtools/clouddebugger/v2/cloud.google.com/go/debugger/apiv2
+    dest: /debugger/apiv2
   - source: /google/cloud/deploy/v1/cloud.google.com/go/deploy/apiv1
     dest: /deploy/apiv1
   - source: /google/cloud/dialogflow/v2/cloud.google.com/go/dialogflow/apiv2
@@ -426,6 +436,8 @@ deep-copy-regex:
     dest: /domains/apiv1beta1
   - source: /google/cloud/edgecontainer/v1/cloud.google.com/go/edgecontainer/apiv1
     dest: /edgecontainer/apiv1
+  - source: /google/devtools/clouderrorreporting/v1beta1/cloud.google.com/go/errorreporting/apiv1beta1
+    dest: /errorreporting/apiv1beta1
   - source: /google/cloud/essentialcontacts/v1/cloud.google.com/go/essentialcontacts/apiv1
     dest: /essentialcontacts/apiv1
   - source: /google/cloud/eventarc/v1/cloud.google.com/go/eventarc/apiv1
@@ -504,6 +516,8 @@ deep-copy-regex:
     dest: /metastore/apiv1alpha
   - source: /google/cloud/metastore/v1beta/cloud.google.com/go/metastore/apiv1beta
     dest: /metastore/apiv1beta
+  - source: /google/monitoring/v3/cloud.google.com/go/monitoring/apiv3/v2
+    dest: /monitoring/apiv3/v2
   - source: /google/monitoring/dashboard/v1/cloud.google.com/go/monitoring/dashboard/apiv1
     dest: /monitoring/dashboard/apiv1
   - source: /google/monitoring/metricsscope/v1/cloud.google.com/go/monitoring/metricsscope/apiv1
@@ -554,8 +568,10 @@ deep-copy-regex:
     dest: /pubsub/apiv1
   - source: /google/cloud/pubsublite/v1/cloud.google.com/go/pubsublite/apiv1
     dest: /pubsublite/apiv1
-  # - source: /google/cloud/recaptchaenterprise/v1beta1/cloud.google.com/go/recaptchaenterprise/v2/apiv1beta1
-  #   dest: /recaptchaenterprise/v2/apiv1beta1
+  - source: /google/cloud/recaptchaenterprise/v1/cloud.google.com/go/recaptchaenterprise/v2/apiv1
+    dest: /recaptchaenterprise/v2/apiv1
+  - source: /google/cloud/recaptchaenterprise/v1beta1/cloud.google.com/go/recaptchaenterprise/v2/apiv1beta1
+    dest: /recaptchaenterprise/v2/apiv1beta1
   - source: /google/cloud/recommendationengine/v1beta1/cloud.google.com/go/recommendationengine/apiv1beta1
     dest: /recommendationengine/apiv1beta1
   - source: /google/cloud/recommender/v1/cloud.google.com/go/recommender/apiv1
@@ -622,6 +638,8 @@ deep-copy-regex:
     dest: /speech/apiv1p1beta1
   - source: /google/cloud/speech/v2/cloud.google.com/go/speech/apiv2
     dest: /speech/apiv2
+  - source: /google/storage/v2/cloud.google.com/go/storage/internal/apiv2
+    dest: /storage/internal/apiv2
   - source: /google/storagetransfer/v1/cloud.google.com/go/storagetransfer/apiv1
     dest: /storagetransfer/apiv1
   - source: /google/cloud/talent/v4/cloud.google.com/go/talent/apiv4
@@ -636,6 +654,8 @@ deep-copy-regex:
     dest: /trace/apiv1
   - source: /google/devtools/cloudtrace/v2/cloud.google.com/go/trace/apiv2
     dest: /trace/apiv2
+  - source: /google/cloud/translate/v3/cloud.google.com/go/translate/apiv3
+    dest: /translate/apiv3
   - source: /google/cloud/video/livestream/v1/cloud.google.com/go/video/livestream/apiv1
     dest: /video/livestream/apiv1
   # - source: /google/cloud/video/stitcher/v1/cloud.google.com/go/video/stitcher/apiv1
@@ -648,6 +668,10 @@ deep-copy-regex:
     dest: /videointelligence/apiv1beta2
   - source: /google/cloud/videointelligence/v1p3beta1/cloud.google.com/go/videointelligence/apiv1p3beta1
     dest: /videointelligence/apiv1p3beta1
+  - source: /google/cloud/vision/v1/cloud.google.com/go/vision/v2/apiv1
+    dest: /vision/v2/apiv1
+  - source: /google/cloud/vision/v1p1beta1/cloud.google.com/go/vision/v2/apiv1p1beta1
+    dest: /vision/v2/apiv1p1beta1
   - source: /google/cloud/vmmigration/v1/cloud.google.com/go/vmmigration/apiv1
     dest: /vmmigration/apiv1
   - source: /google/cloud/vmwareengine/v1/cloud.google.com/go/vmwareengine/apiv1

diff --git a/internal/gapicgen/cmd/genbot/bot.go b/internal/gapicgen/cmd/genbot/bot.go
@@ -60,28 +60,14 @@ func genBot(ctx context.Context, c botConfig) error {
 		log.Println("there is already a re-generation in progress")
 		return nil
 	}
-	if pr, err := githubClient.GetRegenPR(ctx, "google-cloud-go", "open"); err != nil {
-		return err
-	} else if pr != nil {
-		if err := updateGocloudPR(ctx, githubClient, pr); err != nil {
-			return err
-		}
-		return nil
-	}
+
 	log.Println("checking if a pull request was already opened and merged today")
 	if pr, err := githubClient.GetRegenPR(ctx, "go-genproto", "closed"); err != nil {
 		return err
 	} else if pr != nil && hasCreatedPRToday(pr.Created) {
 		log.Println("skipping generation, already created and merged a go-genproto PR today")
 		return nil
 	}
-	if pr, err := githubClient.GetRegenPR(ctx, "google-cloud-go", "closed"); err != nil {
-		return err
-	} else if pr != nil && hasCreatedPRToday(pr.Created) {
-		log.Println("skipping generation, already created and merged a google-cloud-go PR today")
-		return nil
-	}
-
 	return generate(ctx, githubClient, c.forceAll)
 }
 

diff --git a/internal/gapicgen/cmd/genbot/generate.go b/internal/gapicgen/cmd/genbot/generate.go
@@ -42,22 +42,18 @@ func generate(ctx context.Context, githubClient *git.GithubClient, forceAll bool
 	log.Printf("working out %s\n", tmpDir)
 
 	googleapisDir := filepath.Join(tmpDir, "googleapis")
-	gocloudDir := filepath.Join(tmpDir, "gocloud")
 	genprotoDir := filepath.Join(tmpDir, "genproto")
 	protoDir := filepath.Join(tmpDir, "proto")
 
 	// Clone repositories.
-
 	grp, _ := errgroup.WithContext(ctx)
 	grp.Go(func() error {
 		return git.DeepClone("https://github.com/googleapis/googleapis", googleapisDir)
 	})
 	grp.Go(func() error {
 		return git.DeepClone("https://github.com/googleapis/go-genproto", genprotoDir)
 	})
-	grp.Go(func() error {
-		return git.DeepClone("https://github.com/googleapis/google-cloud-go", gocloudDir)
-	})
+
 	grp.Go(func() error {
 		return git.DeepClone("https://github.com/protocolbuffers/protobuf", protoDir)
 	})
@@ -69,7 +65,6 @@ func generate(ctx context.Context, githubClient *git.GithubClient, forceAll bool
 	conf := &generator.Config{
 		GoogleapisDir: googleapisDir,
 		GenprotoDir:   genprotoDir,
-		GapicDir:      gocloudDir,
 		ProtoDir:      protoDir,
 		ForceAll:      forceAll,
 	}
@@ -78,61 +73,20 @@ func generate(ctx context.Context, githubClient *git.GithubClient, forceAll bool
 		return err
 	}
 
-	// Create PRs.
+	// Create PR
 	genprotoHasChanges, err := git.HasChanges(genprotoDir)
 	if err != nil {
 		return err
 	}
 
-	gocloudHasChanges, err := git.HasChanges(gocloudDir)
-	if err != nil {
-		return err
+	if !genprotoHasChanges {
+		log.Println("no changes detected")
+		return nil
 	}
-
-	switch {
-	case genprotoHasChanges && gocloudHasChanges:
-		// Both have changes.
-		genprotoPRNum, err := githubClient.CreateGenprotoPR(ctx, genprotoDir, true, changes)
-		if err != nil {
-			return fmt.Errorf("error creating PR for genproto (may need to check logs for more errors): %v", err)
-		}
-
-		gocloudPRNum, err := githubClient.CreateGocloudPR(ctx, gocloudDir, genprotoPRNum, changes)
-		if err != nil {
-			return fmt.Errorf("error creating CL for veneers (may need to check logs for more errors): %v", err)
-		}
-
-		if err := githubClient.AmendGenprotoPR(ctx, genprotoPRNum, genprotoDir, gocloudPRNum, changes); err != nil {
-			return fmt.Errorf("error amending genproto PR: %v", err)
-		}
-
-		genprotoPRURL := fmt.Sprintf("https://github.com/googleapis/go-genproto/pull/%d", genprotoPRNum)
-		gocloudPRURL := fmt.Sprintf("https://github.com/googleapis/google-cloud-go/pull/%d", genprotoPRNum)
-		log.Println(genprotoPRURL)
-		log.Println(gocloudPRURL)
-	case genprotoHasChanges:
-		// Only genproto has changes.
-		genprotoPRNum, err := githubClient.CreateGenprotoPR(ctx, genprotoDir, false, changes)
-		if err != nil {
-			return fmt.Errorf("error creating PR for genproto (may need to check logs for more errors): %v", err)
-		}
-
-		genprotoPRURL := fmt.Sprintf("https://github.com/googleapis/go-genproto/pull/%d", genprotoPRNum)
-		log.Println(genprotoPRURL)
-		log.Println("gocloud had no changes")
-	case gocloudHasChanges:
-		// Only gocloud has changes.
-		gocloudPRNum, err := githubClient.CreateGocloudPR(ctx, gocloudDir, -1, changes)
-		if err != nil {
-			return fmt.Errorf("error creating CL for veneers (may need to check logs for more errors): %v", err)
-		}
-
-		gocloudPRURL := fmt.Sprintf("https://github.com/googleapis/google-cloud-go/pull/%d", gocloudPRNum)
-		log.Println("genproto had no changes")
-		log.Println(gocloudPRURL)
-	default:
-		// Neither have changes.
-		log.Println("Neither genproto nor gocloud had changes")
+	genprotoPRNum, err := githubClient.CreateGenprotoPR(ctx, genprotoDir, false, changes)
+	if err != nil {
+		return fmt.Errorf("error creating PR for genproto (may need to check logs for more errors): %v", err)
 	}
+	log.Printf("https://github.com/googleapis/go-genproto/pull/%d", genprotoPRNum)
 	return nil
 }
diff --git a/internal/gapicgen/cmd/genbot/local.go b/internal/gapicgen/cmd/genbot/local.go
@@ -30,7 +30,6 @@ import (
 
 type localConfig struct {
 	googleapisDir   string
-	gocloudDir      string
 	genprotoDir     string
 	protoDir        string
 	gapicToGenerate string
@@ -49,14 +48,12 @@ func genLocal(ctx context.Context, c localConfig) error {
 	log.Printf("temp dir created at %s\n", tmpDir)
 	tmpGoogleapisDir := filepath.Join(tmpDir, "googleapis")
 	tmpGenprotoDir := filepath.Join(tmpDir, "genproto")
-	tmpGocloudDir := filepath.Join(tmpDir, "gocloud")
 	tmpProtoDir := filepath.Join(tmpDir, "proto")
 
 	// Clone repositories if needed.
 	grp, _ := errgroup.WithContext(ctx)
 	gitShallowClone(grp, "https://github.com/googleapis/googleapis.git", c.googleapisDir, tmpGoogleapisDir)
 	gitShallowClone(grp, "https://github.com/googleapis/go-genproto", c.genprotoDir, tmpGenprotoDir)
-	gitShallowClone(grp, "https://github.com/googleapis/google-cloud-go", c.gocloudDir, tmpGocloudDir)
 	gitShallowClone(grp, "https://github.com/protocolbuffers/protobuf", c.protoDir, tmpProtoDir)
 	if err := grp.Wait(); err != nil {
 		log.Println(err)
@@ -66,7 +63,6 @@ func genLocal(ctx context.Context, c localConfig) error {
 	conf := &generator.Config{
 		GoogleapisDir:     defaultDir(tmpGoogleapisDir, c.googleapisDir),
 		GenprotoDir:       defaultDir(tmpGenprotoDir, c.genprotoDir),
-		GapicDir:          defaultDir(tmpGocloudDir, c.gocloudDir),
 		ProtoDir:          defaultDir(tmpProtoDir, c.protoDir),
 		GapicToGenerate:   c.gapicToGenerate,
 		OnlyGenerateGapic: c.onlyGapics,

diff --git a/internal/gapicgen/cmd/genbot/main.go b/internal/gapicgen/cmd/genbot/main.go
@@ -46,7 +46,6 @@ func main() {
 
 	// flags for local mode
 	googleapisDir := flag.String("googleapis-dir", os.Getenv("GOOGLEAPIS_DIR"), "Directory where sources of googleapis/googleapis resides. If unset the sources will be cloned to a temporary directory that is not cleaned up.")
-	gocloudDir := flag.String("gocloud-dir", os.Getenv("GOCLOUD_DIR"), "Directory where sources of googleapis/google-cloud-go resides. If unset the sources will be cloned to a temporary directory that is not cleaned up.")
 	genprotoDir := flag.String("genproto-dir", os.Getenv("GENPROTO_DIR"), "Directory where sources of googleapis/go-genproto resides. If unset the sources will be cloned to a temporary directory that is not cleaned up.")
 	protoDir := flag.String("proto-dir", os.Getenv("PROTO_DIR"), "Directory where sources of google/protobuf resides. If unset the sources will be cloned to a temporary directory that is not cleaned up.")
 	gapicToGenerate := flag.String("gapic", os.Getenv("GAPIC_TO_GENERATE"), `Specifies which gapic to generate. The value should be in the form of an import path (Ex: cloud.google.com/go/pubsub/apiv1). The default "" generates all gapics.`)
@@ -59,7 +58,6 @@ func main() {
 	if *localMode {
 		if err := genLocal(ctx, localConfig{
 			googleapisDir:   *googleapisDir,
-			gocloudDir:      *gocloudDir,
 			genprotoDir:     *genprotoDir,
 			protoDir:        *protoDir,
 			gapicToGenerate: *gapicToGenerate,

diff --git a/internal/gapicgen/cmd/genbot/update.go b/internal/gapicgen/cmd/genbot/update.go