From 7e44bee7caf88fa835887845f6dd8b9b324e44a3 Mon Sep 17 00:00:00 2001
From: Simon Gottschlag <simon.gottschlag@xenit.se>
Date: Mon, 3 May 2021 16:38:24 +0200
Subject: [PATCH] Add select_workspace to validate

---
 docker/terraform.sh | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/docker/terraform.sh b/docker/terraform.sh
index 65b8545..c6b1815 100755
--- a/docker/terraform.sh
+++ b/docker/terraform.sh
@@ -46,13 +46,7 @@ plan () {
   rm -f .terraform/plans/${ENVIRONMENT}
   terraform init -input=false -backend-config="key=${BACKEND_KEY}" -backend-config="resource_group_name=${BACKEND_RG}" -backend-config="storage_account_name=${BACKEND_NAME}" -backend-config="container_name=${CONTAINER_NAME}" -backend-config="snapshot=true"
 
-  set +e
-  terraform workspace select ${ENVIRONMENT} 2> /dev/null
-  if [ $? -ne 0 ]; then
-    terraform workspace new ${ENVIRONMENT}
-    terraform workspace select ${ENVIRONMENT}
-  fi
-  set -e
+  select_workspace
 
   mkdir -p .terraform/plans
   terraform plan -input=false -var-file="variables/${ENVIRONMENT}.tfvars" -var-file="variables/common.tfvars" -var-file="../global.tfvars" -out=".terraform/plans/${ENVIRONMENT}"
@@ -152,7 +146,7 @@ state_remove () {
 
 validate () {
   terraform init -input=false -backend-config="key=${BACKEND_KEY}" -backend-config="resource_group_name=${BACKEND_RG}" -backend-config="storage_account_name=${BACKEND_NAME}" -backend-config="container_name=${CONTAINER_NAME}" -backend-config="snapshot=true"
-  terraform workspace select ${ENVIRONMENT}
+  select_workspace
   terraform validate
   terraform fmt .
   terraform fmt variables/
@@ -160,6 +154,16 @@ validate () {
   tfsec .
 }
 
+select_workspace() {
+  set +e 
+  terraform workspace select ${ENVIRONMENT} 2> /dev/null 
+  if [ $? -ne 0 ]; then 
+    terraform workspace new ${ENVIRONMENT} 
+    terraform workspace select ${ENVIRONMENT} 
+  fi 
+  set -e 
+}
+
 envup() {
   if [ -f ${ENVIRONMENT_FILE} ]; then
     set -a