Skip to content

Commit 8ffc129

Browse files
googlyrahmangooglyrahman
committed
Migrating the path Migrating the gsutil usage to gcloud storage
1 parent 80dad8e commit 8ffc129

File tree

10 files changed

+44
-41
lines changed

10 files changed

+44
-41
lines changed

‎config/cloudcodesnippets/cloudbuild_v1beta1_cloudbuildtrigger.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ insertText: |
2929
timeout: \${13:1800s}
3030
step:
3131
- id: \${14:download_zip}
32-
name: \${15:gcr.io/cloud-builders/gsutil}
32+
name: \${15:gcr.io/cloud-builders/gcloud}
3333
args:
34+
- storage
3435
- \${16:cp}
3536
- \${17:gs://mybucket/remotefile.zip}
3637
- \${18:localfile.zip}

‎config/samples/resources/cloudbuildtrigger/build-trigger-for-cloud-source-repo/cloudbuild_v1beta1_cloudbuildtrigger.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ spec:
3939
timeout: 1800s
4040
step:
4141
- id: "download_zip"
42-
name: gcr.io/cloud-builders/gsutil
43-
args: ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
42+
name: gcr.io/cloud-builders/gcloud
43+
args: ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
4444
timeout: 300s
4545
- id: "build_package"
4646
name: gcr.io/cloud-builders/go

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ spec:
4242
timeout: 1800s
4343
step:
4444
- id: "download_zip"
45-
name: gcr.io/cloud-builders/gsutil
46-
args: ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
45+
name: gcr.io/cloud-builders/gcloud
46+
args: ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
4747
timeout: 300s
4848
- id: "build_package"
4949
name: gcr.io/cloud-builders/go

‎dev/tasks/deploy-release-manifest‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ echo "Generated ${BUILD_DIR}/release-bundle.tar.gz for manual installation."
8484

8585
# Leave this step out of the script for now.
8686

87-
# gsutil cp ${REPO_ROOT}/.build/release-bundle.tar.gz gs://configconnector-operator/${LATEST_VERSION}/
88-
# gsutil cp ${REPO_ROOT}/.build/release-bundle.tar.gz gs://configconnector-operator/latest
87+
# gcloud storage cp ${REPO_ROOT}/.build/release-bundle.tar.gz gs://configconnector-operator/${LATEST_VERSION}/
88+
# gcloud storage cp ${REPO_ROOT}/.build/release-bundle.tar.gz gs://configconnector-operator/latest
8989

9090
# echo "Pushed the latest release-bundle."

‎dev/tasks/download-e2e-logs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,24 @@ cd ${REPO_ROOT}
3131
if [[ -z "${TEST:-}" ]]; then
3232
echo "Must specify TEST (e.g. TEST=e2e-service-pubsub)"
3333
echo "Listing tests:"
34-
gsutil ls gs://cnrm-prow/logs/ | sed -e "s@gs://cnrm-prow/logs/@@g" | sed -e "s@/@@g"
34+
gcloud storage ls gs://cnrm-prow/logs/ | sed -e "s@gs://cnrm-prow/logs/@@g" | sed -e "s@/@@g"
3535
exit 1
3636
fi
3737

3838
if [[ -z "${TEST_RUN:-}" ]]; then
3939
echo "TEST_RUN not specified, getting latest test run for ${TEST}"
40-
echo "To list recent runs: gsutil ls gs://cnrm-prow/logs/${TEST}/ | cut -f 6 -d / | sort | grep -v latest | tail"
41-
TEST_RUN=$(gsutil cat gs://cnrm-prow/logs/${TEST}/latest-build.txt)
40+
echo "To list recent runs: gcloud storage ls gs://cnrm-prow/logs/${TEST}/ | cut -f 6 -d / | sort | grep -v latest | tail"
41+
TEST_RUN=$(gcloud storage cat gs://cnrm-prow/logs/${TEST}/latest-build.txt)
4242
fi
4343

4444
echo "Getting test results:"
45-
gsutil cat gs://cnrm-prow/logs/${TEST}/${TEST_RUN}/finished.json | jq .
45+
gcloud storage cat gs://cnrm-prow/logs/${TEST}/${TEST_RUN}/finished.json | jq .
4646

4747
echo "Downloading golden output"
48-
gsutil cp gs://cnrm-prow/logs/${TEST}/${TEST_RUN}/artifacts/golden.zip .build/golden.zip
48+
gcloud storage cp gs://cnrm-prow/logs/${TEST}/${TEST_RUN}/artifacts/golden.zip .build/golden.zip
4949

5050
echo "Expanding golden output into testdata directory"
5151
unzip -o .build/golden.zip "pkg/test/resourcefixture/testdata/*"
5252

5353
echo "Downloading test log to e2e.log"
54-
gsutil cp gs://cnrm-prow/logs/${TEST}/${TEST_RUN}/build-log.txt e2e.log
54+
gcloud storage cp gs://cnrm-prow/logs/${TEST}/${TEST_RUN}/build-log.txt e2e.log

‎scripts/generate-google3-docs/resource-reference/generated/resource-docs/cloudbuild/cloudbuildtrigger.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2904,8 +2904,9 @@ spec:
29042904
timeout: 1800s
29052905
step:
29062906
- id: "download_zip"
2907-
name: gcr.io/cloud-builders/gsutil
2908-
args: ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
2907+
name: gcr.io/cloud-builders/gcloud
2908+
entrypoint: gcloud
2909+
args: ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
29092910
timeout: 300s
29102911
- id: "build_package"
29112912
name: gcr.io/cloud-builders/go
@@ -2998,8 +2999,9 @@ spec:
29982999
timeout: 1800s
29993000
step:
30003001
- id: "download_zip"
3001-
name: gcr.io/cloud-builders/gsutil
3002-
args: ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
3002+
name: gcr.io/cloud-builders/gcloud
3003+
entrypoint: gcloud
3004+
args: ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
30033005
timeout: 300s
30043006
- id: "build_package"
30053007
name: gcr.io/cloud-builders/go

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ resource "google_cloudbuild_trigger" "build-trigger" {
2525

2626
build {
2727
step {
28-
name = "gcr.io/cloud-builders/gsutil"
29-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
28+
name = "gcr.io/cloud-builders/gcloud"
29+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
3030
timeout = "120s"
3131
secret_env = ["MY_SECRET"]
3232
}

‎third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ resource "google_cloudbuild_trigger" "build-trigger" {
113113
114114
build {
115115
step {
116-
name = "gcr.io/cloud-builders/gsutil"
117-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
116+
name = "gcr.io/cloud-builders/gcloud"
117+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
118118
timeout = "120s"
119119
secret_env = ["MY_SECRET"]
120120
}

‎third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbuild/resource_cloudbuild_trigger_test.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
247247
tags = ["team-a", "service-b"]
248248
timeout = "1800s"
249249
step {
250-
name = "gcr.io/cloud-builders/gsutil"
251-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
250+
name = "gcr.io/cloud-builders/gcloud"
251+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
252252
timeout = "300s"
253253
}
254254
step {
@@ -325,8 +325,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
325325
images = ["gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA"]
326326
tags = ["team-a", "service-b"]
327327
step {
328-
name = "gcr.io/cloud-builders/gsutil"
329-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
328+
name = "gcr.io/cloud-builders/gcloud"
329+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
330330
}
331331
step {
332332
name = "gcr.io/cloud-builders/go"
@@ -384,8 +384,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
384384
tags = ["team-a", "service-b", "updated"]
385385
timeout = "2100s"
386386
step {
387-
name = "gcr.io/cloud-builders/gsutil"
388-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]
387+
name = "gcr.io/cloud-builders/gcloud"
388+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]
389389
timeout = "300s"
390390
}
391391
step {
@@ -426,8 +426,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
426426
tags = ["team-a", "service-b"]
427427
timeout = "1800s"
428428
step {
429-
name = "gcr.io/cloud-builders/gsutil"
430-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
429+
name = "gcr.io/cloud-builders/gcloud"
430+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
431431
timeout = "300s"
432432
}
433433
available_secrets {
@@ -454,8 +454,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
454454
tags = ["team-a", "service-b"]
455455
timeout = "1800s"
456456
step {
457-
name = "gcr.io/cloud-builders/gsutil"
458-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
457+
name = "gcr.io/cloud-builders/gcloud"
458+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
459459
timeout = "300s"
460460
}
461461
}
@@ -479,8 +479,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
479479
tags = ["team-a", "service-b"]
480480
timeout = "1800s"
481481
step {
482-
name = "gcr.io/cloud-builders/gsutil"
483-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
482+
name = "gcr.io/cloud-builders/gcloud"
483+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
484484
timeout = "300s"
485485
}
486486
}
@@ -507,8 +507,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
507507
tags = ["team-a", "service-b"]
508508
timeout = "1800s"
509509
step {
510-
name = "gcr.io/cloud-builders/gsutil"
511-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
510+
name = "gcr.io/cloud-builders/gcloud"
511+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
512512
timeout = "300s"
513513
}
514514
}
@@ -663,8 +663,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
663663
tags = ["team-a", "service-b"]
664664
timeout = "900s"
665665
step {
666-
name = "gcr.io/cloud-builders/gsutil"
667-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
666+
name = "gcr.io/cloud-builders/gcloud"
667+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
668668
timeout = "500s"
669669
}
670670
step {
@@ -697,8 +697,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
697697
tags = ["team-a", "service-b"]
698698
timeout = "1200"
699699
step {
700-
name = "gcr.io/cloud-builders/gsutil"
701-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
700+
name = "gcr.io/cloud-builders/gcloud"
701+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
702702
timeout = "500s"
703703
}
704704
}

‎third_party/github.com/hashicorp/terraform-provider-google-beta/website/docs/guides/version_2_upgrade.html.markdown‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
300300
tags = ["team-a", "service-b", "updated"]
301301
302302
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"]
305305
}
306306
307307
step {

0 commit comments

Comments
 (0)