From dce75efa9ec5e57b93e465ca76bfac9c24fa2d23 Mon Sep 17 00:00:00 2001
From: Chris Hawk <hawk@google.com>
Date: Thu, 31 Aug 2023 15:00:38 -0700
Subject: [PATCH] fix: don't send empty arguments to gcloud in the cleanup
 script

---
 scripts/cleanup-project.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/scripts/cleanup-project.sh b/scripts/cleanup-project.sh
index 4dd4ddb0a..e45ddd5a2 100755
--- a/scripts/cleanup-project.sh
+++ b/scripts/cleanup-project.sh
@@ -40,8 +40,20 @@ cleanup_resource() {
     extra_list_arg="$3"
     extra_delete_arg="$4"
 
-    for resource_id in $(gcloud "${resource_group}" "${resource}" list --project="${PROJECT_ID}" --format="csv[no-heading](name)" "${extra_list_arg}"); do
-        gcloud "${resource_group}" "${resource}" delete "${resource_id}" --project="${PROJECT_ID}" -q "${extra_delete_arg}"
+    if [ -z "$extra_list_arg" ]
+    then
+        resources=( $(gcloud "${resource_group}" "${resource}" list --project="${PROJECT_ID}" --format="csv[no-heading](name)") )
+    else
+        resources=( $(gcloud "${resource_group}" "${resource}" list --project="${PROJECT_ID}" --format="csv[no-heading](name)" "${extra_list_arg}") )
+    fi
+
+    for resource_id in $resources; do
+        if [ -z "$extra_delete_arg" ]
+        then
+            gcloud "${resource_group}" "${resource}" delete "${resource_id}" --project="${PROJECT_ID}" -q
+        else
+            gcloud "${resource_group}" "${resource}" delete "${resource_id}" --project="${PROJECT_ID}" -q "${extra_delete_arg}"
+        fi
     done
 }