reverting changes

cloudbees-oss · Nov 14, 2024 · f615bdc · f615bdc
1 parent 6c89ef4
commit f615bdc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/blueprints/helpers.sh b/blueprints/helpers.sh
@@ -99,12 +99,12 @@ tf-destroy () {
   export TF_LOG_PATH="$SCRIPTDIR/$root/terraform.log"
   rm "$TF_LOG_PATH" || INFO "No previous log found."
   tf-destroy-wl "$root"
-  eks_cluster_name=$(tf-output "$root" eks_cluster_name)
-  aws_region=$(tf-output "$root" aws_region)
   retry 3 "terraform -chdir=$SCRIPTDIR/$root destroy -target=module.eks -auto-approve"
   INFO "Destroy target module.eks completed."
   #Prevent Issue #165
-  if [ "$root" == "${BLUEPRINTS[1]}" ] && [ -n "$eks_cluster_name" ] && [ -n "$aws_region" ]; then
+  if [ "$root" == "${BLUEPRINTS[1]}" ]; then
+    eks_cluster_name=$(tf-output "$root" eks_cluster_name)
+    aws_region=$(tf-output "$root" aws_region)
     bash "$SCRIPTDIR/$root/k8s/kube-prom-destroy.sh" "$eks_cluster_name" "$aws_region"
     INFO "kube-prom-destroy.sh completed."
   fi