Skip to content

Commit 095109e

Browse files
googlyrahmangooglyrahman
committed
Migrating the gsutil usage to gcloud storage
1 parent 80dad8e commit 095109e

File tree

10 files changed

+48
-37
lines changed

10 files changed

+48
-37
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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ 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+
entrypoint: gcloud
44+
args: ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
4445
timeout: 300s
4546
- id: "build_package"
4647
name: gcr.io/cloud-builders/go

‎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

‎operator/scripts/utils/cmd.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func DownloadAndExtractTarballAt(gcsPath, outputDir string) error {
3939
}
4040

4141
func DownloadObjectFromGCS(gcsPath, outputDir string) error {
42-
cmd := exec.Command("gsutil", "cp", gcsPath, outputDir)
42+
cmd := exec.Command("gcloud", "storage", "cp", gcsPath, outputDir)
4343
return Execute(cmd)
4444
}
4545

‎pkg/test/resourcefixture/testdata/basic/cloudbuild/v1beta1/cloudbuildtrigger/cloudbuildtrigger/create.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ spec:
3737
timeout: 1800s
3838
step:
3939
- id: "download_zip"
40-
name: gcr.io/cloud-builders/gsutil
41-
args: ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
40+
name: gcr.io/cloud-builders/gcloud
41+
args: ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
4242
timeout: 300s
4343
- id: "build_package"
4444
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_test.go‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,9 @@ 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+
entrypoint = "gcloud"
252+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
252253
timeout = "300s"
253254
}
254255
step {
@@ -325,8 +326,9 @@ resource "google_cloudbuild_trigger" "build_trigger" {
325326
images = ["gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA"]
326327
tags = ["team-a", "service-b"]
327328
step {
328-
name = "gcr.io/cloud-builders/gsutil"
329-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
329+
name = "gcr.io/cloud-builders/gcloud"
330+
entrypoint = "gcloud"
331+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
330332
}
331333
step {
332334
name = "gcr.io/cloud-builders/go"
@@ -384,8 +386,9 @@ resource "google_cloudbuild_trigger" "build_trigger" {
384386
tags = ["team-a", "service-b", "updated"]
385387
timeout = "2100s"
386388
step {
387-
name = "gcr.io/cloud-builders/gsutil"
388-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]
389+
name = "gcr.io/cloud-builders/gcloud"
390+
entrypoint = "gcloud"
391+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]
389392
timeout = "300s"
390393
}
391394
step {
@@ -426,8 +429,9 @@ resource "google_cloudbuild_trigger" "build_trigger" {
426429
tags = ["team-a", "service-b"]
427430
timeout = "1800s"
428431
step {
429-
name = "gcr.io/cloud-builders/gsutil"
430-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
432+
name = "gcr.io/cloud-builders/gcloud"
433+
entrypoint = "gcloud"
434+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
431435
timeout = "300s"
432436
}
433437
available_secrets {
@@ -454,8 +458,9 @@ resource "google_cloudbuild_trigger" "build_trigger" {
454458
tags = ["team-a", "service-b"]
455459
timeout = "1800s"
456460
step {
457-
name = "gcr.io/cloud-builders/gsutil"
458-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
461+
name = "gcr.io/cloud-builders/gcloud"
462+
entrypoint = "gcloud"
463+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
459464
timeout = "300s"
460465
}
461466
}
@@ -479,8 +484,9 @@ resource "google_cloudbuild_trigger" "build_trigger" {
479484
tags = ["team-a", "service-b"]
480485
timeout = "1800s"
481486
step {
482-
name = "gcr.io/cloud-builders/gsutil"
483-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
487+
name = "gcr.io/cloud-builders/gcloud"
488+
entrypoint = "gcloud"
489+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
484490
timeout = "300s"
485491
}
486492
}
@@ -507,8 +513,9 @@ resource "google_cloudbuild_trigger" "build_trigger" {
507513
tags = ["team-a", "service-b"]
508514
timeout = "1800s"
509515
step {
510-
name = "gcr.io/cloud-builders/gsutil"
511-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
516+
name = "gcr.io/cloud-builders/gcloud"
517+
entrypoint = "gcloud"
518+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
512519
timeout = "300s"
513520
}
514521
}
@@ -663,8 +670,9 @@ resource "google_cloudbuild_trigger" "build_trigger" {
663670
tags = ["team-a", "service-b"]
664671
timeout = "900s"
665672
step {
666-
name = "gcr.io/cloud-builders/gsutil"
667-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
673+
name = "gcr.io/cloud-builders/gcloud"
674+
entrypoint = "gcloud"
675+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
668676
timeout = "500s"
669677
}
670678
step {
@@ -697,8 +705,9 @@ resource "google_cloudbuild_trigger" "build_trigger" {
697705
tags = ["team-a", "service-b"]
698706
timeout = "1200"
699707
step {
700-
name = "gcr.io/cloud-builders/gsutil"
701-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
708+
name = "gcr.io/cloud-builders/gcloud"
709+
entrypoint = "gcloud"
710+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
702711
timeout = "500s"
703712
}
704713
}

‎third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataproc/resource_dataproc_cluster_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1390,7 +1390,7 @@ resource "google_storage_bucket_object" "init_script" {
13901390
content = <<EOL
13911391
#!/bin/bash
13921392
echo "init action success" >> /tmp/%s
1393-
gsutil cp /tmp/%s ${google_storage_bucket.init_bucket.url}
1393+
gcloud storage cp /tmp/%s ${google_storage_bucket.init_bucket.url}
13941394
EOL
13951395
13961396
}

‎third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storage/data_source_storage_object_signed_url_internal_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ const fakeCredentials = `{
2626
}
2727
`
2828

29-
// The following values are derived from the output of the `gsutil signurl` command.
29+
// The following values are derived from the output of the `gcloud storage sign-url` command.
3030
// i.e.
31-
// gsutil signurl fake_creds.json gs://tf-test-bucket-6159205297736845881/path/to/file
31+
// gcloud storage sign-url gs://tf-test-bucket-6159205297736845881/path/to/file --private-key-file=fake_creds.json
3232
// URL HTTP Method Expiration Signed URL
3333
// gs://tf-test-bucket-6159205297736845881/path/to/file GET 2016-08-12 14:03:30 https://storage.googleapis.com/tf-test-bucket-6159205297736845881/path/to/file?GoogleAccessId=user@gcp-project.iam.gserviceaccount.com&Expires=1470967410&Signature=JJvE2Jc%2BeoagyS1qRACKBGUkgLkKjw7cGymHhtB4IzzN3nbXDqr0acRWGy0%2BEpZ3HYNDalEYsK0lR9Q0WCgty5I0JKmPIuo9hOYa1xTNH%2B22xiWsekxGV%2FcA9FXgWpi%2BFt7fBmMk4dhDe%2BuuYc7N79hd0FYuSBNW1Wp32Bluoe4SNkNAB%2BuIDd9KqPzqs09UAbBoz2y4WxXOQnRyR8GAfb8B%2FDtv62gYjtmp%2F6%2Fyr6xj7byWKZdQt8kEftQLTQmP%2F17Efjp6p%2BXo71Q0F9IhAFiqWfp3Ij8hHDSebLcVb2ULXyHNNQpHBOhFgALrFW3I6Uc3WciLEOsBS9Ej3EGdTg%3D%3D
3434

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