Bootstrap fixes for 0.9.2+

Author: Zordrak

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.1 (06/04/2017)
+
+ * Fix 0.9.2+ support for bootstrap.sh
+
 ## 1.1.0 (28/03/2017)
 
  * Move from terraform-0.8 to terraform-0.9

bin/terraform.sh

@@ -8,7 +8,7 @@
 ##
 # Set Script Version
 ##
-readonly script_ver="1.1.0";
+readonly script_ver="1.1.1";
 
 ##
 # Standardised failure function

bootstrap/bootstrap.sh

@@ -154,15 +154,17 @@ fi;
   backend \"s3\" {
     region = \"${region}\"
     bucket = \"${bucket}\"
-    key    = \"${project}/${aws_account_id}/${region}/${environment}/${component_name}.tfstate\"
+    key    = \"${project}/${aws_account_id}/${region}/bootstrap/bootstrap.tfstate\"
   }
 }" > backend_terraformscaffold.tf \
   || error_and_die "Failed to write backend config to $(pwd)/backend_terraformscaffold.tf";
 
   # Push Terraform Remote State to S3
-  terraform remote push \
-    || error_and_die "Terraform remote push failed";
+  echo "yes" | terraform init || error_and_die "Terraform init failed";
+
+  rm -f backend_terraformscaffold.tf;
+  rm -f terraform.tfstate # Prime not the backup
+  rm -rf .terraform;
 
-  rm -f backend_terraformscaffold.tf
 ) || exit $?;