From 17fdebb2f8088ebc2b6dcac3c3b770e0f742d100 Mon Sep 17 00:00:00 2001
From: gurusai-voleti <gvoleti@google.com>
Date: Wed, 4 Feb 2026 11:06:50 +0000
Subject: [PATCH] chore: Migrate gsutil usage to gcloud storage

---
 grr/config/grr_response_templates/upload.sh | 8 ++++----
 terraform/demo/google/server_startup.sh     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/grr/config/grr_response_templates/upload.sh b/grr/config/grr_response_templates/upload.sh
index 58c8a1a4e7..ec0f98fe45 100755
--- a/grr/config/grr_response_templates/upload.sh
+++ b/grr/config/grr_response_templates/upload.sh
@@ -22,13 +22,13 @@ fi
 md5fingerprint=$(md5sum "${RELEASE_FILE}" | cut -d" " -f1)
 
 # Upload tarball, make public
-gsutil cp "${RELEASE_FILE}" "gs://${BUCKET}/"
-gsutil acl ch -u AllUsers:R "gs://${BUCKET}/${RELEASE_TAR}"
+gcloud storage cp "${RELEASE_FILE}" "gs://${BUCKET}/"
+gcloud storage objects update "gs://${BUCKET}/${RELEASE_TAR}" --add-acl-grant=entity=allUsers,role=READER
 
 sed -i -e "s!</body></html>!<a href=\"${RELEASE_TAR}#md5=${md5fingerprint}\">${RELEASE_NAME}</a><br/>\n</body></html>!" index.html
 
-gsutil cp index.html "gs://${BUCKET}/"
-gsutil acl ch -u AllUsers:R "gs://${BUCKET}/index.html"
+gcloud storage cp index.html "gs://${BUCKET}/"
+gcloud storage objects update "gs://${BUCKET}/index.html" --add-acl-grant=entity=allUsers,role=READER
 
 echo "Test install with:"
 echo "pip install --no-cache-dir -f https://storage.googleapis.com/${BUCKET}/index.html grr-response-templates==${VERSION}"
diff --git a/terraform/demo/google/server_startup.sh b/terraform/demo/google/server_startup.sh
index a6b9fd221a..d71579b446 100755
--- a/terraform/demo/google/server_startup.sh
+++ b/terraform/demo/google/server_startup.sh
@@ -6,7 +6,7 @@ LINUX_INSTALLER_UPLOAD_URL=$(curl http://metadata.google.internal/computeMetadat
 if [[ "${grr_version}" = "latest" ]]; then
   wget "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-273.0.0-linux-x86_64.tar.gz"
   tar -xzf ./google-cloud-sdk-273.0.0-linux-x86_64.tar.gz -C .
-  ./google-cloud-sdk/bin/gsutil cp gs://autobuilds.grr-response.com/_latest_server_deb/*.deb .
+  ./google-cloud-sdk/bin/gcloud storage cp gs://autobuilds.grr-response.com/_latest_server_deb/*.deb .
   GRR_VERSION=$(ls *.deb | sed 's/.*\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\-\([0-9]\+\).*/\1.\2.\3.\4/')
 else
   GRR_VERSION="${grr_version}"