Skip to content

Commit d8e0034

Browse files
Migrate from gsutil to gcloud storage (#15053) (#24249)
[upstream:afd50116b0d8d000c6616cbd8471cd581f4deefa] Signed-off-by: Modular Magician <[email protected]>
1 parent 1534796 commit d8e0034

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

google/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
}

google/services/cloudbuild/resource_cloudbuild_trigger_test.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
261261
tags = ["team-a", "service-b"]
262262
timeout = "1800s"
263263
step {
264-
name = "gcr.io/cloud-builders/gsutil"
265-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
264+
name = "gcr.io/cloud-builders/gcloud"
265+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
266266
timeout = "300s"
267267
}
268268
step {
@@ -339,8 +339,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
339339
images = ["gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA"]
340340
tags = ["team-a", "service-b"]
341341
step {
342-
name = "gcr.io/cloud-builders/gsutil"
343-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
342+
name = "gcr.io/cloud-builders/gcloud"
343+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
344344
}
345345
step {
346346
name = "gcr.io/cloud-builders/go"
@@ -398,8 +398,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
398398
tags = ["team-a", "service-b", "updated"]
399399
timeout = "2100s"
400400
step {
401-
name = "gcr.io/cloud-builders/gsutil"
402-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]
401+
name = "gcr.io/cloud-builders/gcloud"
402+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]
403403
timeout = "300s"
404404
}
405405
step {
@@ -440,8 +440,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
440440
tags = ["team-a", "service-b"]
441441
timeout = "1800s"
442442
step {
443-
name = "gcr.io/cloud-builders/gsutil"
444-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
443+
name = "gcr.io/cloud-builders/gcloud"
444+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
445445
timeout = "300s"
446446
}
447447
available_secrets {
@@ -468,8 +468,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
468468
tags = ["team-a", "service-b"]
469469
timeout = "1800s"
470470
step {
471-
name = "gcr.io/cloud-builders/gsutil"
472-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
471+
name = "gcr.io/cloud-builders/gcloud"
472+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
473473
timeout = "300s"
474474
}
475475
}
@@ -493,8 +493,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
493493
tags = ["team-a", "service-b"]
494494
timeout = "1800s"
495495
step {
496-
name = "gcr.io/cloud-builders/gsutil"
497-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
496+
name = "gcr.io/cloud-builders/gcloud"
497+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
498498
timeout = "300s"
499499
}
500500
}
@@ -521,8 +521,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
521521
tags = ["team-a", "service-b"]
522522
timeout = "1800s"
523523
step {
524-
name = "gcr.io/cloud-builders/gsutil"
525-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
524+
name = "gcr.io/cloud-builders/gcloud"
525+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
526526
timeout = "300s"
527527
}
528528
}
@@ -677,8 +677,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
677677
tags = ["team-a", "service-b"]
678678
timeout = "900s"
679679
step {
680-
name = "gcr.io/cloud-builders/gsutil"
681-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
680+
name = "gcr.io/cloud-builders/gcloud"
681+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
682682
timeout = "500s"
683683
}
684684
step {
@@ -711,8 +711,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
711711
tags = ["team-a", "service-b"]
712712
timeout = "1200"
713713
step {
714-
name = "gcr.io/cloud-builders/gsutil"
715-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
714+
name = "gcr.io/cloud-builders/gcloud"
715+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
716716
timeout = "500s"
717717
}
718718
}

website/docs/guides/version_2_upgrade.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ resource "google_cloudbuild_trigger" "build_trigger" {
314314
tags = ["team-a", "service-b", "updated"]
315315
316316
step {
317-
name = "gcr.io/cloud-builders/gsutil"
318-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]
317+
name = "gcr.io/cloud-builders/gcloud"
318+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]
319319
}
320320
321321
step {

website/docs/r/cloudbuild_trigger.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ resource "google_cloudbuild_trigger" "build-trigger" {
7777
7878
build {
7979
step {
80-
name = "gcr.io/cloud-builders/gsutil"
81-
args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
80+
name = "gcr.io/cloud-builders/gcloud"
81+
args = ["storage", "cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
8282
timeout = "120s"
8383
secret_env = ["MY_SECRET"]
8484
}

0 commit comments

Comments
 (0)