fix: added install gcloud beta component in pipeline.sh

apigee · Mar 22, 2024 · a0ec366 · a0ec366
1 parent 4e1b9cc
commit a0ec366
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/tools/target-server-validator/pipeline.sh b/tools/target-server-validator/pipeline.sh
@@ -21,12 +21,13 @@ SCRIPTPATH="$(
     pwd -P
 )"
 
+gcloud components install beta --quiet # as the cloud-sdk image no longer has this
 NOTIFICATION_CHANNEL_IDS=$(bash "$SCRIPTPATH/test/create_notification_channel.sh" "$APIGEE_X_ORG" 2>&1)
 if [ -z "$NOTIFICATION_CHANNEL_IDS" ]; then
     echo "Error creating notification channel"
     exit 1
 else
-    echo "Notification Channel Id - ${NOTIFICATION_CHANNEL_IDS}"
+    echo "Created Notification Channel Id - ${NOTIFICATION_CHANNEL_IDS}"
 fi
 
 bash "$SCRIPTPATH/callout/build_java_callout.sh"

diff --git a/tools/target-server-validator/test/create_notification_channel.sh b/tools/target-server-validator/test/create_notification_channel.sh
@@ -21,7 +21,7 @@ type=$(jq -r '.type' $JSON_FILE)
 displayName=$(jq -r '.displayName' $JSON_FILE)
 emailAddress=$(jq -r '.labels.email_address' $JSON_FILE)
 
-list_response=$(gcloud alpha monitoring channels list --filter="type='$type' AND displayName=\"$displayName\" AND labels.email_address='$emailAddress'" --format=json --verbosity=none --project="$PROJECT_ID" --format=json 2>&1)
+list_response=$(gcloud beta monitoring channels list --filter="type='$type' AND displayName=\"$displayName\" AND labels.email_address='$emailAddress'" --format=json --verbosity=none --project="$PROJECT_ID"  2>&1)
 
 if [ "$list_response" = "[]" ]; then
 

diff --git a/tools/target-server-validator/test/delete_notification_channel.sh b/tools/target-server-validator/test/delete_notification_channel.sh
@@ -20,5 +20,6 @@ IFS=','
 
 # Loop through each notification channel ID and delete it
 for CHANNEL_ID in $NOTIFICATION_CHANNEL_IDS; do
-    gcloud beta monitoring channels delete "$CHANNEL_ID" --project="$PROJECT_ID" --quiet
+    yes | gcloud beta monitoring channels delete "$CHANNEL_ID" --project="$PROJECT_ID" \
+        || echo "Couldn't delete Notification Channel"
 done