chore: Migrate gsutil usage to gcloud storage (#10002)

Author: bhandarivijay-png

deploy/setup-secret.sh

@@ -34,7 +34,7 @@ function download_existing_key() {
   KEY_IDS=$(gcloud iam service-accounts keys list --iam-account=metrics-writer@${METRICS_PROJECT_ID}.iam.gserviceaccount.com --project=${METRICS_PROJECT_ID} --managed-by=user --format="value(name)")
   while read -r KEY_ID
   do
-    if gsutil cp gs://${BUCKET_ID}/${KEY_ID}.json ${KEY_FILE}; then
+    if gcloud storage cp gs://${BUCKET_ID}/${KEY_ID}.json ${KEY_FILE}; then
       echo "Downloaded existing key to ${KEY_FILE}"
       return 0
     fi
@@ -52,8 +52,8 @@ function upload_new_key() {
   fi
   echo "New service account key created."
   KEY_ID=$(gcloud iam service-accounts keys list --iam-account=metrics-writer@${METRICS_PROJECT_ID}.iam.gserviceaccount.com --project=${METRICS_PROJECT_ID} --managed-by=user --format="value(name)" --limit=1)
-  gsutil cp ${KEY_FILE} gs://${BUCKET_ID}/${KEY_ID}.json
-  gsutil cp ${KEY_FILE} gs://${BUCKET_ID}/${LATEST_GCS_PATH}
+  gcloud storage cp ${KEY_FILE} gs://${BUCKET_ID}/${KEY_ID}.json
+  gcloud storage cp ${KEY_FILE} gs://${BUCKET_ID}/${LATEST_GCS_PATH}
   echo "New service account key uploaded to GCS."
   return 0
 }

hack/update-lts-dependencies.sh

@@ -68,7 +68,7 @@ HELM_URL=https://get.helm.sh/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz
 wget -q -O  helm.tar.gz "${HELM_URL}"
 
 # upload the binary to skaffold gcs bucket
-gsutil -q cp helm.tar.gz gs://skaffold/deps/helm/helm-${HELM_VERSION}-linux-amd64.tar.gz
+gcloud storage cp helm.tar.gz gs://skaffold/deps/helm/helm-${HELM_VERSION}-linux-amd64.tar.gz
 
 # take the shasum and put into correct digests/ dir
 sha256sum helm.tar.gz > ${DIGESTS_DIR}/helm.amd64.sha256
@@ -78,7 +78,7 @@ KUSTOMIZE_URL=https://github.com/kubernetes-sigs/kustomize/releases/download/kus
 wget -q -O  kustomize.tar.gz "${KUSTOMIZE_URL}"
 
 # upload the binary to skaffold gcs bucket
-gsutil -q cp kustomize.tar.gz gs://skaffold/deps/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz
+gcloud storage cp kustomize.tar.gz gs://skaffold/deps/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz
 
 # take the shasum and put into correct digests/ dir
 sha256sum kustomize.tar.gz > ${DIGESTS_DIR}/kustomize.amd64.sha256
@@ -88,7 +88,7 @@ KPT_URL=https://github.com/GoogleContainerTools/kpt/releases/download/v${KPT_VER
 wget -q -O  kpt "${KPT_URL}"
 
 # upload the binary to skaffold gcs bucket
-gsutil -q cp kpt gs://skaffold/deps/kpt/v${KPT_VERSION}/kpt_linux_amd64
+gcloud storage cp kpt gs://skaffold/deps/kpt/v${KPT_VERSION}/kpt_linux_amd64
 
 # take the shasum and put into correct digests/ dir
 sha256sum kpt > ${DIGESTS_DIR}/kpt.amd64.sha256

pkg/skaffold/gcs/gsutil.go

@@ -36,7 +36,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/v2/proto/v1"
 )
 
-const GsutilExec = "gsutil"
+const GsutilExec = "gcloud"
 
 type Gsutil interface {
 	Copy(ctx context.Context, src, dst string, recursive bool) error
@@ -49,11 +49,11 @@ func NewGsutil() Gsutil {
 	return &gsutil{}
 }
 
-// Copy calls `gsutil cp [-r] <source_url> <destination_url>
+// Copy calls `gcloud storage cp [--recursive] <source_url> <destination_url>
 func (g *gsutil) Copy(ctx context.Context, src, dst string, recursive bool) error {
-	args := []string{"cp"}
+	args := []string{"storage", "cp"}
 	if recursive {
-		args = append(args, "-r")
+		args = append(args, "--recursive")
 	}
 	args = append(args, src, dst)
 	cmd := exec.CommandContext(ctx, GsutilExec, args...)

pkg/skaffold/gcs/gsutil_test.go

@@ -48,20 +48,20 @@ func TestCopy(t *testing.T) {
 			description: "copy single file",
 			src:         file,
 			dst:         gcsFile,
-			commands:    testutil.CmdRunOut(fmt.Sprintf("gsutil cp %s %s", file, gcsFile), "logs"),
+			commands:    testutil.CmdRunOut(fmt.Sprintf("gcloud storage cp %s %s", file, gcsFile), "logs"),
 		},
 		{
 			description: "copy recursively",
 			src:         folder,
 			dst:         gcsFolder,
-			commands:    testutil.CmdRunOut(fmt.Sprintf("gsutil cp -r %s %s", folder, gcsFolder), "logs"),
+			commands:    testutil.CmdRunOut(fmt.Sprintf("gcloud storage cp --recursive %s %s", folder, gcsFolder), "logs"),
 			recursive:   true,
 		},
 		{
 			description: "copy failed",
 			src:         file,
 			dst:         gcsFile,
-			commands:    testutil.CmdRunOutErr(fmt.Sprintf("gsutil cp %s %s", file, gcsFile), "logs", fmt.Errorf("file not found")),
+			commands:    testutil.CmdRunOutErr(fmt.Sprintf("gcloud storage cp %s %s", file, gcsFile), "logs", fmt.Errorf("file not found")),
 			shouldErr:   true,
 		},
 	}