Merge branch 'main' into fix-fhir-stores-list

Author: iennae

appengine/storage/flexible/README.md

@@ -12,13 +12,13 @@ Before you can run or deploy the sample, you will need to do the following:
 1. Create a Cloud Storage Bucket. You can do this with the [Google Cloud SDK](https://cloud.google.com/sdk)
 with the following command:
 
-        gsutil mb gs://<your-bucket-name>
+        gcloud storage buckets create gs://<your-bucket-name>
 
 1. Set the default ACL on your bucket to public read in order to serve files
 directly from Cloud Storage. You can do this with the [Google Cloud SDK](https://cloud.google.com/sdk)
 with the following command:
 
-        gsutil defacl set public-read gs://<your-bucket-name>
+        gcloud storage buckets update gs://<your-bucket-name> --predefined-default-object-acl=publicRead
 
 1. Update the environment variables in `app.yaml`.
 

appengine/storage/flexible_nodejs16_and_earlier/README.md

@@ -12,13 +12,13 @@ Before you can run or deploy the sample, you will need to do the following:
 1. Create a Cloud Storage Bucket. You can do this with the [Google Cloud SDK](https://cloud.google.com/sdk)
 with the following command:
 
-        gsutil mb gs://<your-bucket-name>
+        gcloud storage buckets create gs://<your-bucket-name>
 
 1. Set the default ACL on your bucket to public read in order to serve files
 directly from Cloud Storage. You can do this with the [Google Cloud SDK](https://cloud.google.com/sdk)
 with the following command:
 
-        gsutil defacl set public-read gs://<your-bucket-name>
+        gcloud storage buckets update gs://<your-bucket-name> --predefined-default-object-acl=publicRead
 
 1. Update the environment variables in `app.yaml`.
 

appengine/storage/standard/README.md

@@ -12,13 +12,13 @@ Before you can run or deploy the sample, you will need to do the following:
 1. Create a Cloud Storage Bucket. You can do this with the [Google Cloud SDK](https://cloud.google.com/sdk)
 with the following command:
 
-        gsutil mb gs://<your-bucket-name>
+        gcloud storage buckets create gs://<your-bucket-name>
 
 1. Set the default ACL on your bucket to public read in order to serve files
 directly from Cloud Storage. You can do this with the [Google Cloud SDK](https://cloud.google.com/sdk)
 with the following command:
 
-        gsutil defacl set public-read gs://<your-bucket-name>
+        gcloud storage buckets update --predefined-default-object-acl=publicRead gs://<your-bucket-name>
 
 1. Update the environment variables in `app.yaml`.
 

eventarc/audit-storage/README.md

@@ -35,8 +35,8 @@ gcloud run deploy $MY_RUN_SERVICE \
 Create a _single region_ Cloud Storage bucket:
 
 ```sh
-gsutil mb -p $(gcloud config get-value project) \
-  -l us-central1 \
+gcloud storage buckets create --project=$(gcloud config get-value project) \
+  --location=us-central1 \
   gs://"$MY_GCS_BUCKET"
 ```
 
@@ -56,7 +56,7 @@ gcloud beta eventarc triggers create my-gcs-trigger \
 Test your Cloud Run service by creating a GCS event:
 
 ```sh
-gsutil defstorageclass set NEARLINE gs://"$MY_GCS_BUCKET"
+gcloud storage buckets update --default-storage-class=NEARLINE gs://"$MY_GCS_BUCKET"
 ```
 
 Observe the Cloud Run service printing upon receiving an event in Cloud Logging:

functions/imagemagick/README.md

@@ -21,13 +21,13 @@ Functions for your project.
 
 1. Create a Cloud Storage Bucket:
 
-        gsutil mb gs://YOUR_INPUT_BUCKET_NAME
+        gcloud storage buckets create gs://YOUR_INPUT_BUCKET_NAME
 
     This storage bucket is used to upload images for the function to check.
 
 1. Create a second Cloud Storage Bucket:
 
-        gsutil mb gs://YOUR_OUTPUT_BUCKET_NAME
+        gcloud storage buckets create gs://YOUR_OUTPUT_BUCKET_NAME
 
     This second storage bucket is used to store blurred images. (Un-blurred images will not be saved to this bucket.)
 

functions/v2/imagemagick/README.md

@@ -21,13 +21,13 @@ Functions for your project.
 
 1. Create a Cloud Storage Bucket:
 
-        gsutil mb gs://YOUR_INPUT_BUCKET_NAME
+        gcloud storage buckets create gs://YOUR_INPUT_BUCKET_NAME
 
     This storage bucket is used to upload images for the function to check.
 
 1. Create a second Cloud Storage Bucket:
 
-        gsutil mb gs://YOUR_OUTPUT_BUCKET_NAME
+        gcloud storage buckets create gs://YOUR_OUTPUT_BUCKET_NAME
 
     This second storage bucket is used to store blurred images. (Un-blurred images will not be saved to this bucket.)
 

healthcare/fhir/deleteFhirStore.js

@@ -27,6 +27,7 @@ const main = (
     auth: new google.auth.GoogleAuth({
       scopes: ['https://www.googleapis.com/auth/cloud-platform'],
     }),
+    responseType: 'json',
   });
 
   const deleteFhirStore = async () => {
@@ -38,8 +39,12 @@ const main = (
     const name = `projects/${projectId}/locations/${cloudRegion}/datasets/${datasetId}/fhirStores/${fhirStoreId}`;
     const request = {name};
 
-    await healthcare.projects.locations.datasets.fhirStores.delete(request);
-    console.log(`Deleted FHIR store: ${fhirStoreId}`);
+    try {
+      await healthcare.projects.locations.datasets.fhirStores.delete(request);
+      console.log(`Deleted FHIR store: ${fhirStoreId}`);
+    } catch (error) {
+      console.error('Error deleting FHIR store:', error.message || error);
+    }
   };
 
   deleteFhirStore();

memorystore/redis/gce_deployment/deploy.sh

@@ -36,7 +36,7 @@ fi
 
 #Upload the tar to GCS
 tar -cvf app.tar -C .. package.json server.js
-gsutil cp app.tar gs://"$GCS_BUCKET_NAME"/gce/
+gcloud storage cp app.tar gs://"$GCS_BUCKET_NAME"/gce/
 
 # Create an instance
 gcloud compute instances create my-instance \

memorystore/redis/gce_deployment/startup-script.sh

@@ -34,7 +34,7 @@ apt-get install -yq ca-certificates supervisor nodejs build-essential
 curl -s "https://storage.googleapis.com/signals-agents/logging/google-fluentd-install.sh" | bash
 service google-fluentd restart &
 
-gsutil cp gs://"$GCS_BUCKET_NAME"/gce/app.tar /app.tar
+gcloud storage cp gs://"$GCS_BUCKET_NAME"/gce/app.tar /app.tar
 mkdir -p /app
 tar -x -f /app.tar -C /app
 cd /app

run/image-processing/test/e2e_test_cleanup.yaml

@@ -24,13 +24,13 @@ steps:
       "gcloud pubsub subscriptions delete ${_SERVICE}_sub"
 
 - id: 'Delete GCS buckets'
-  name: 'gcr.io/cloud-builders/gsutil:latest'
+  name: 'gcr.io/cloud-builders/gcloud:latest'
   entrypoint: /bin/bash
   args:
   - '-c'
   - |
-    ./test/retry.sh "gsutil rm -r gs://${_SERVICE}_input"
-    ./test/retry.sh "gsutil rm -r gs://${_SERVICE}_output"
+    ./test/retry.sh "gcloud storage rm --recursive gs://${_SERVICE}_input"
+    ./test/retry.sh "gcloud storage rm --recursive gs://${_SERVICE}_output"
 
 substitutions:
   _SERVICE: image-processing