Migrating the path Migrating the gsutil usage to gcloud storage

googlyrahman · googlyrahman · commit 97565ab83f39 · 2025-10-09T00:50:56.000+05:30
diff --git a/config/samples/resources/cloudbuildtrigger/build-trigger-for-cloud-source-repo/cloudbuild_v1beta1_cloudbuildtrigger.yaml b/config/samples/resources/cloudbuildtrigger/build-trigger-for-cloud-source-repo/cloudbuild_v1beta1_cloudbuildtrigger.yaml
@@ -39,8 +39,8 @@ spec:
     timeout: 1800s
     step:
       - id: "download_zip"
-        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
       - id: "build_package"
         name: gcr.io/cloud-builders/go
diff --git a/config/samples/resources/cloudbuildtrigger/build-trigger-for-github-repo/cloudbuild_v1beta1_cloudbuildtrigger.yaml b/config/samples/resources/cloudbuildtrigger/build-trigger-for-github-repo/cloudbuild_v1beta1_cloudbuildtrigger.yaml
@@ -42,8 +42,9 @@ spec:
     timeout: 1800s
     step:
       - id: "download_zip"
-        name: gcr.io/cloud-builders/gsutil
-        args: ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
+        name: gcr.io/cloud-builders/gcloud
+        entrypoint: gcloud
+        args: ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
         timeout: 300s
       - id: "build_package"
         name: gcr.io/cloud-builders/go
diff --git a/operator/scripts/utils/cmd.go b/operator/scripts/utils/cmd.go
@@ -39,7 +39,7 @@ func DownloadAndExtractTarballAt(gcsPath, outputDir string) error {
 }
 
 func DownloadObjectFromGCS(gcsPath, outputDir string) error {
-	cmd := exec.Command("gsutil", "cp", gcsPath, outputDir)
+	cmd := exec.Command("gcloud", "storage", "cp", gcsPath, outputDir)
 	return Execute(cmd)
 }
 
diff --git a/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1beta1/cloudbuildtrigger/cloudbuildtrigger/create.yaml b/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1beta1/cloudbuildtrigger/cloudbuildtrigger/create.yaml
@@ -37,8 +37,8 @@ spec:
     timeout: 1800s
     step:
       - id: "download_zip"
-        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
       - id: "build_package"
         name: gcr.io/cloud-builders/go
diff --git a/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1beta1/cloudbuildtrigger/cloudbuildtrigger/update.yaml b/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1beta1/cloudbuildtrigger/cloudbuildtrigger/update.yaml
@@ -37,8 +37,8 @@ spec:
     timeout: 1800s
     step:
       - id: "download_zip"
-        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
       - id: "build_package"
         name: gcr.io/cloud-builders/go
diff --git a/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go b/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go
@@ -113,8 +113,8 @@ resource "google_cloudbuild_trigger" "build-trigger" {
 
   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"]
     }
diff --git a/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbuild/resource_cloudbuild_trigger_test.go b/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbuild/resource_cloudbuild_trigger_test.go
@@ -247,8 +247,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 {
@@ -325,8 +325,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"
@@ -384,8 +384,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 {
@@ -426,8 +426,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 {
@@ -454,8 +454,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"
     }
   }
@@ -479,8 +479,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"
     }
   }
@@ -507,8 +507,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"
     }
   }
@@ -663,8 +663,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 {
@@ -697,8 +697,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"
     }
   }
diff --git a/third_party/github.com/hashicorp/terraform-provider-google-beta/website/docs/guides/version_2_upgrade.html.markdown b/third_party/github.com/hashicorp/terraform-provider-google-beta/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 {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func DownloadAndExtractTarballAt(gcsPath, outputDir string) error {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`func DownloadObjectFromGCS(gcsPath, outputDir string) error {`
`42`		`- cmd := exec.Command("gsutil", "cp", gcsPath, outputDir)`
	`42`	`+ cmd := exec.Command("gcloud", "storage", "cp", gcsPath, outputDir)`
`43`	`43`	`return Execute(cmd)`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -300,8 +300,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {`
`300`	`300`	`tags = ["team-a", "service-b", "updated"]`
`301`	`301`
`302`	`302`	`step {`
`303`		`- name = "gcr.io/cloud-builders/gsutil"`
`304`		`- args = ["cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]`
	`303`	`+ name = "gcr.io/cloud-builders/gcloud"`
	`304`	`+ args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`step {`