fix stage deploy

GSA · Nov 18, 2024 · 632993b · 632993b
1 parent 0104095
commit 632993b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/.github/workflows/terraform-deploy-infra.yml b/.github/workflows/terraform-deploy-infra.yml
@@ -12,15 +12,17 @@ jobs:
         uses: actions/checkout@v4
       - name: Set env.BRANCH
         run: |
-          BRANCH=develop
-          #BRANCH=$(echo $GITHUB_REF | cut -d'/' -f 3)
+          BRANCH=$(echo $GITHUB_REF | cut -d'/' -f 3)
           case ${BRANCH} in
             develop)
               CF_SPACE="dev"
               ;;
             main)
               CF_SPACE="prod"
               ;;
+            stage)
+              CF_SPACE="staging"
+              ;;
           esac
           echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
           echo "CF_SPACE=${CF_SPACE}" >> $GITHUB_ENV

diff --git a/terraform/infra/locals.tf b/terraform/infra/locals.tf
@@ -481,6 +481,37 @@ locals {
     )
   }
 
+  #################################
+  ##
+  ##  __ _                   
+  ## / _\ |_ __ _  __ _  ___ 
+  ## \ \| __/ _` |/ _` |/ _ \
+  ## _\ \ || (_| | (_| |  __/
+  ## \__/\__\__,_|\__, |\___|
+  ##              |___/              
+  ##
+  #################################              
+
+  stage = merge(
+    {
+      ## Applications to deploy.
+      apps = local.globals.apps
+      services = local.globals.services
+    },
+    {
+      ## Passwords that need to be generated for this environment.
+      ## These will actually use the sha256 result from the random module.
+      passwords = {
+        hash_salt = {
+          length = 32
+        }
+        cron_key = {
+          length = 32
+        }
+      }
+    }
+  )
+
   ## Map of the 'all' environement and the current workspace settings.
   env = merge(try(local.envs.all, {}), try(local.envs[terraform.workspace], {}))