Migrate from gsutil to gcloud storage (#15053)

Co-authored-by: Modular Magician <[email protected]>

Author: copybara-service[bot]

mmv1/templates/terraform/examples/cloudbuild_trigger_build.tf.tmpl

@@ -9,8 +9,8 @@ resource "google_cloudbuild_trigger" "{{$.PrimaryResourceId}}" {
 
   build {
     step {
-      name = "gcr.io/cloud-builders/gsutil"
-      args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
+      name = "gcr.io/cloud-builders/gcloud"
+      args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
       timeout = "120s"
       secret_env = ["MY_SECRET"]
     }

mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_trigger_test.go

@@ -245,8 +245,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     tags   = ["team-a", "service-b"]
     timeout = "1800s"
     step {
-      name = "gcr.io/cloud-builders/gsutil"
-      args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
+      name = "gcr.io/cloud-builders/gcloud"
+      args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
       timeout = "300s"
     }
     step {
@@ -323,8 +323,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     images = ["gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA"]
     tags   = ["team-a", "service-b"]
     step {
-      name = "gcr.io/cloud-builders/gsutil"
-      args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
+      name = "gcr.io/cloud-builders/gcloud"
+      args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
     }
     step {
       name = "gcr.io/cloud-builders/go"
@@ -382,8 +382,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     tags   = ["team-a", "service-b", "updated"]
     timeout = "2100s"
     step {
-      name = "gcr.io/cloud-builders/gsutil"
-      args = ["cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]
+      name = "gcr.io/cloud-builders/gcloud"
+      args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]
       timeout = "300s"
     }
     step {
@@ -424,8 +424,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     tags   = ["team-a", "service-b"]
     timeout = "1800s"
     step {
-      name = "gcr.io/cloud-builders/gsutil"
-      args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
+      name = "gcr.io/cloud-builders/gcloud"
+      args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
       timeout = "300s"
     }
     available_secrets {
@@ -452,8 +452,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     tags   = ["team-a", "service-b"]
     timeout = "1800s"
     step {
-      name = "gcr.io/cloud-builders/gsutil"
-      args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
+      name = "gcr.io/cloud-builders/gcloud"
+      args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
       timeout = "300s"
     }
   }
@@ -477,8 +477,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     tags   = ["team-a", "service-b"]
     timeout = "1800s"
     step {
-      name = "gcr.io/cloud-builders/gsutil"
-      args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
+      name = "gcr.io/cloud-builders/gcloud"
+      args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
       timeout = "300s"
     }
   }
@@ -505,8 +505,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     tags   = ["team-a", "service-b"]
     timeout = "1800s"
     step {
-      name = "gcr.io/cloud-builders/gsutil"
-      args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
+      name = "gcr.io/cloud-builders/gcloud"
+      args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
       timeout = "300s"
     }
   }
@@ -661,8 +661,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     tags = ["team-a", "service-b"]
     timeout = "900s"
     step {
-      name = "gcr.io/cloud-builders/gsutil"
-      args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
+      name = "gcr.io/cloud-builders/gcloud"
+      args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
       timeout = "500s"
     }
     step {
@@ -695,8 +695,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     tags = ["team-a", "service-b"]
     timeout = "1200"
     step {
-      name = "gcr.io/cloud-builders/gsutil"
-      args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
+      name = "gcr.io/cloud-builders/gcloud"
+      args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
       timeout = "500s"
     }
   }

mmv1/third_party/terraform/website/docs/guides/version_2_upgrade.html.markdown

@@ -300,8 +300,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     tags   = ["team-a", "service-b", "updated"]
 
     step {
-      name = "gcr.io/cloud-builders/gsutil"
-      args = ["cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]
+      name = "gcr.io/cloud-builders/gcloud"
+      args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]
     }
 
     step {