Migrating the path Migrating the gsutil usage to gcloud storage

Author: googlyrahman

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

config/samples/resources/cloudbuildtrigger/build-trigger-for-github-repo/cloudbuild_v1beta1_cloudbuildtrigger.yaml

@@ -42,8 +42,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

dev/tasks/deploy-release-manifest

@@ -84,7 +84,7 @@ echo "Generated ${BUILD_DIR}/release-bundle.tar.gz for manual installation."
 
 # Leave this step out of the script for now.
 
-# gsutil cp ${REPO_ROOT}/.build/release-bundle.tar.gz gs://configconnector-operator/${LATEST_VERSION}/
-# gsutil cp ${REPO_ROOT}/.build/release-bundle.tar.gz gs://configconnector-operator/latest
+# gcloud storage cp ${REPO_ROOT}/.build/release-bundle.tar.gz gs://configconnector-operator/${LATEST_VERSION}/
+# gcloud storage cp ${REPO_ROOT}/.build/release-bundle.tar.gz gs://configconnector-operator/latest
 
 # echo "Pushed the latest release-bundle."

dev/tasks/download-e2e-logs

@@ -31,24 +31,24 @@ cd ${REPO_ROOT}
 if [[ -z "${TEST:-}" ]]; then
   echo "Must specify TEST (e.g. TEST=e2e-service-pubsub)"
   echo "Listing tests:"
-  gsutil ls gs://cnrm-prow/logs/ | sed -e "s@gs://cnrm-prow/logs/@@g" | sed -e "s@/@@g"
+  gcloud storage ls gs://cnrm-prow/logs/ | sed -e "s@gs://cnrm-prow/logs/@@g" | sed -e "s@/@@g"
   exit 1
 fi
 
 if [[ -z "${TEST_RUN:-}" ]]; then
   echo "TEST_RUN not specified, getting latest test run for ${TEST}"
-  echo "To list recent runs: gsutil ls gs://cnrm-prow/logs/${TEST}/ | cut -f 6 -d / | sort | grep -v latest | tail"
-  TEST_RUN=$(gsutil cat gs://cnrm-prow/logs/${TEST}/latest-build.txt)
+  echo "To list recent runs: gcloud storage ls gs://cnrm-prow/logs/${TEST}/ | cut -f 6 -d / | sort | grep -v latest | tail"
+  TEST_RUN=$(gcloud storage cat gs://cnrm-prow/logs/${TEST}/latest-build.txt)
 fi
 
 echo "Getting test results:"
-gsutil cat gs://cnrm-prow/logs/${TEST}/${TEST_RUN}/finished.json | jq .
+gcloud storage cat gs://cnrm-prow/logs/${TEST}/${TEST_RUN}/finished.json | jq .
 
 echo "Downloading golden output"
-gsutil cp gs://cnrm-prow/logs/${TEST}/${TEST_RUN}/artifacts/golden.zip .build/golden.zip
+gcloud storage cp gs://cnrm-prow/logs/${TEST}/${TEST_RUN}/artifacts/golden.zip .build/golden.zip
 
 echo "Expanding golden output into testdata directory"
 unzip -o .build/golden.zip "pkg/test/resourcefixture/testdata/*"
 
 echo "Downloading test log to e2e.log"
-gsutil cp gs://cnrm-prow/logs/${TEST}/${TEST_RUN}/build-log.txt e2e.log
+gcloud storage cp gs://cnrm-prow/logs/${TEST}/${TEST_RUN}/build-log.txt e2e.log

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)
 }
 

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

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

scripts/resource-autogen/generated/samples/CloudBuild-CloudBuildTrigger-cloudbuild_trigger_build/main.tf

@@ -25,8 +25,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"]
     }