Tf state file name delete bug (#51)

* Fixing bug - initial commit

* Debugging

* Debugging v2

* Fix EFS_ENABLE flag

* Remove debugging messages

Author: LeoDiazL

operations/_scripts/deploy/deploy.sh

@@ -26,7 +26,7 @@ fi
 if [[ $(alpha_only "$AWS_EFS_CREATE") == true ]] || [[ $(alpha_only "$AWS_EFS_CREATE_HA") == true ]] || [ -n "$AWS_EFS_FS_ID" ]; then 
   export AWS_EFS_ENABLE="true"
 else
-  export AWS_EFS_ENABLE="false"
+  export AWS_EFS_ENABLE="" # Intentional, being consistent with the rest of incoming vars
 fi
 
 # Generate Github identifiers vars

operations/_scripts/generate/generate_bitops_config.sh

@@ -37,12 +37,25 @@ function check_aws_bucket_for_file() {
   return $?
 }
 
+function generate_tf_state_file_name () {
+  if [ -n "$TF_STATE_FILE_NAME" ]; then
+    filename="$TF_STATE_FILE_NAME"
+  else
+    filename="tf-state-$1"
+  fi
+
+  if [ -n "$TF_STATE_FILE_NAME_APPEND" ]; then
+    filename="${filename}-${TF_STATE_FILE_NAME_APPEND}"
+  fi
+  echo $filename
+}
+
 function check_statefile() {
   provider="$1"
   bucket="$TF_STATE_BUCKET"
   commons_module="$2"
   if [[ "$provider" == "aws" ]]; then
-    check_aws_bucket_for_file $bucket "tf-state-$commons_module"
+    check_aws_bucket_for_file $bucket $(generate_tf_state_file_name $commons_module)
     return $?
   fi 
 }

operations/deployment/terraform/aws/bitops.after-deploy.d/delete-tf-state-bucket.sh

@@ -4,8 +4,21 @@
 
 echo ""
 
-tf_state_file="tf-state-aws"
 bucket="$TF_STATE_BUCKET"
+commons_module="aws"
+
+function generate_tf_state_file_name () {
+  if [ -n "$TF_STATE_FILE_NAME" ]; then
+    filename="$TF_STATE_FILE_NAME"
+  else
+    filename="tf-state-$1"
+  fi
+
+  if [ -n "$TF_STATE_FILE_NAME_APPEND" ]; then
+    filename="${filename}-${TF_STATE_FILE_NAME_APPEND}"
+  fi
+  echo $filename
+}
 
 function check_aws_bucket_for_file() {
   bucket="$1"
@@ -14,6 +27,7 @@ function check_aws_bucket_for_file() {
   return $?
 }
 
+tf_state_file=$(generate_tf_state_file_name $commons_module)
 
 if [[ "$BITOPS_TERRAFORM_COMMAND" == "destroy" ]]; then
   if check_aws_bucket_for_file $bucket "$tf_state_file"; then

operations/deployment/terraform/ecr/bitops.after-deploy.d/delete-tf-state-bucket.sh

@@ -4,8 +4,21 @@
 
 echo ""
 
-tf_state_file="tf-state-aws"
 bucket="$TF_STATE_BUCKET"
+commons_module="ecr"
+
+function generate_tf_state_file_name () {
+  if [ -n "$TF_STATE_FILE_NAME" ]; then
+    filename="$TF_STATE_FILE_NAME"
+  else
+    filename="tf-state-$1"
+  fi
+
+  if [ -n "$TF_STATE_FILE_NAME_APPEND" ]; then
+    filename="${filename}-${TF_STATE_FILE_NAME_APPEND}"
+  fi
+  echo $filename
+}
 
 function check_aws_bucket_for_file() {
   bucket="$1"
@@ -14,6 +27,7 @@ function check_aws_bucket_for_file() {
   return $?
 }
 
+tf_state_file=$(generate_tf_state_file_name $commons_module)
 
 if [[ "$BITOPS_TERRAFORM_COMMAND" == "destroy" ]]; then
   if check_aws_bucket_for_file $bucket "$tf_state_file"; then

operations/deployment/terraform/eks/bitops.after-deploy.d/delete-tf-state-bucket.sh

@@ -4,8 +4,21 @@
 
 echo ""
 
-tf_state_file="tf-state-eks"
 bucket="$TF_STATE_BUCKET"
+commons_module="eks"
+
+function generate_tf_state_file_name () {
+  if [ -n "$TF_STATE_FILE_NAME" ]; then
+    filename="$TF_STATE_FILE_NAME"
+  else
+    filename="tf-state-$1"
+  fi
+
+  if [ -n "$TF_STATE_FILE_NAME_APPEND" ]; then
+    filename="${filename}-${TF_STATE_FILE_NAME_APPEND}"
+  fi
+  echo $filename
+}
 
 function check_aws_bucket_for_file() {
   bucket="$1"
@@ -14,6 +27,7 @@ function check_aws_bucket_for_file() {
   return $?
 }
 
+tf_state_file=$(generate_tf_state_file_name $commons_module)
 
 if [[ "$BITOPS_TERRAFORM_COMMAND" == "destroy" ]]; then
   if check_aws_bucket_for_file $bucket "$tf_state_file"; then