libgo: cmd/go: use 'gcloud storage cp' instead of 'gsutil cp'

In some misguided attempt at "cleanup", Google Cloud has
decided to retire 'gsutil' in favor of 'gcloud storage' instead
of leaving an entirely backwards-compatible wrapper so
that client scripts and muscle memory keep working.

In addition to breaking customers this way, they are also
sending AI bots around "cleaning up" old usages with scary
warnings that maybe the changes will break your entire world.
This is even more misguided, of course, and resulted in us
receiving CL 748661 (originally GitHub PR golang/gofrontend#13)
and then me receiving a private email asking for it to be merged.

It was easier to recreate the 4-line CL myself than to
enumerate everything that was wrong with that CL's
commit message.

I hope that only Google teams are being subjected to this.

This is based on https://go.dev/cl/748900 from the main Go repo by Russ.

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/749000

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 4520e543784a3ba4c162487aad4538c53e7b092f..d2d7e987bbea183f148b7da54e50c4406590a324 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-6e421340885c87c4987f27be4a16b7bedb86faaa
+d7cb797c46170ea43381064745514fd597cb8d7d
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/go/cmd/go/internal/modload/query_test.go b/libgo/go/cmd/go/internal/modload/query_test.go
index a3f2f84505a0f996d48aa6bb91937e63c33ff097..24b5da53e8b244836a86e757293f9c30c11fb855 100644 (file)
--- a/libgo/go/cmd/go/internal/modload/query_test.go
+++ b/libgo/go/cmd/go/internal/modload/query_test.go
@@ -88,7 +88,7 @@ var queryTests = []struct {
                git commit -m 'after v2.5.5' status
                git checkout master
                zip -r ../querytest.zip
-               gsutil cp ../querytest.zip gs://vcs-test/git/querytest.zip
+               gcloud storage cp ../querytest.zip gs://vcs-test/git/querytest.zip
                curl 'https://vcs-test.golang.org/git/querytest?go-get=1'
        */
        {path: queryRepo, query: "<v0.0.0", vers: "v0.0.0-pre1"},

diff --git a/libgo/go/cmd/go/testdata/script/mod_get_pseudo_other_branch.txt b/libgo/go/cmd/go/testdata/script/mod_get_pseudo_other_branch.txt
index d085f4fa3c8e6b2319bce5ed94c9b569f58d3ded..0646df7361cbb873c898e5175f039695f651ec17 100644 (file)
--- a/libgo/go/cmd/go/testdata/script/mod_get_pseudo_other_branch.txt
+++ b/libgo/go/cmd/go/testdata/script/mod_get_pseudo_other_branch.txt
@@ -64,4 +64,4 @@ git checkout master
 git merge b -m merge
 
 zip -r ../tagtests.zip .
-gsutil cp ../tagtests.zip gs://vcs-test/git/tagtests.zip
+gcloud storage cp ../tagtests.zip gs://vcs-test/git/tagtests.zip

diff --git a/libgo/go/cmd/go/testdata/script/mod_get_pseudo_prefix.txt b/libgo/go/cmd/go/testdata/script/mod_get_pseudo_prefix.txt
index 8e6cd907f183495842855232179f2ed9f16e3bb1..9fa5d1559375b0802b9f5d2f778d766f722b0f40 100644 (file)
--- a/libgo/go/cmd/go/testdata/script/mod_get_pseudo_prefix.txt
+++ b/libgo/go/cmd/go/testdata/script/mod_get_pseudo_prefix.txt
@@ -61,4 +61,4 @@ git add status
 git commit -m 'after last tag'
 
 zip -r ../prefixtagtests.zip .
-gsutil cp ../prefixtagtests.zip gs://vcs-test/git/prefixtagtests.zip
+gcloud storage cp ../prefixtagtests.zip gs://vcs-test/git/prefixtagtests.zip

diff --git a/libgo/go/cmd/go/testdata/script/mod_retract_pseudo_base.txt b/libgo/go/cmd/go/testdata/script/mod_retract_pseudo_base.txt
index 27c2b670658e214bd27be9f739da3a6a64560812..ca627d131100c0816a00fa1a97b3a030c155df8f 100644 (file)
--- a/libgo/go/cmd/go/testdata/script/mod_retract_pseudo_base.txt
+++ b/libgo/go/cmd/go/testdata/script/mod_retract_pseudo_base.txt
@@ -59,4 +59,4 @@ git mv p.go q.go
 git commit -m 'trivial change'
 
 zip -r ../retract-pseudo.zip .
-gsutil cp ../retract-pseudo.zip gs://vcs-test/git/retract-pseudo.zip
+gcloud storage cp ../retract-pseudo.zip gs://vcs-test/git/retract-pseudo.zip