Merge branch 'main' into version_ci_iter

elastic · Mar 31, 2024 · f4a2efa · f4a2efa
2 parents 9125223 + 147ede5
commit f4a2efa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/deploy/test-environments/delete_env.sh b/deploy/test-environments/delete_env.sh
@@ -163,9 +163,14 @@ echo "Failed to delete CloudFormation stacks (${#FAILED_STACKS[@]}):"
 printf "%s\n" "${FAILED_STACKS[@]}"
 
 # Delete GCP deployments
-PROJECT_NAME=$(gcloud config get-value core/project)
-PROJECT_NUMBER=$(gcloud projects list --filter="${PROJECT_NAME}" --format="value(PROJECT_NUMBER)")
-./delete_gcp_env.sh "$PROJECT_NAME" "$PROJECT_NUMBER" "${ALL_GCP_DEPLOYMENTS[@]}"
+# Check if ALL_GCP_DEPLOYMENTS is empty
+if [ ${#ALL_GCP_DEPLOYMENTS[@]} -eq 0 ]; then
+    echo "No GCP deployments to delete."
+else
+    PROJECT_NAME=$(gcloud config get-value core/project)
+    PROJECT_NUMBER=$(gcloud projects list --filter="${PROJECT_NAME}" --format="value(PROJECT_NUMBER)")
+    ./delete_gcp_env.sh "$PROJECT_NAME" "$PROJECT_NUMBER" "${ALL_GCP_DEPLOYMENTS[@]}"
+fi
 
 # Delete Azure groups
 FAILED_AZURE_GROUPS=()

diff --git a/deploy/test-environments/main.tf b/deploy/test-environments/main.tf
@@ -4,11 +4,12 @@ provider "aws" {
 
 locals {
   common_tags = {
-    division = "${var.division}"
-    org      = "${var.org}"
-    team     = "${var.team}"
-    project  = "${var.project}"
-    owner    = "${var.owner}"
+    division   = "${var.division}"
+    org        = "${var.org}"
+    team       = "${var.team}"
+    project    = "${var.project}"
+    owner      = "${var.owner}"
+    deployment = "${var.deployment_name}"
   }
   ec_url = "https://cloud.elastic.co"
   ec_headers = {