feature/PI-43-stored-properties created per account dev and adjusted …

…variable names
NHSDigital · Oct 23, 2023 · 8a9b6d4 · 8a9b6d4
1 parent a8f31b3
commit 8a9b6d4
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 6 deletions.
diff --git a/.github/actions/terraform/action.yml b/.github/actions/terraform/action.yml
@@ -16,14 +16,14 @@ inputs:
     required: false
     default: ""
   parameter-deploy:
-    description: "If account wide parameter deploy then specify 'parameter-deploy'"
+    description: "If account wide parameter deploy then specify 'parameter_deploy'"
     required: false
     default: ""
 runs:
   using: "composite"
   steps:
     - uses: ./.github/actions/make/
       with:
-        command: terraform--${{ inputs.command }} TERRAFORM_WORKSPACE="${{ inputs.workspace }}" TERRAFORM_ACCOUNT_WIDE="${{ inputs.account-wide }} PARAMETER_DEPLOY="${{ inputs.parameter_deploy }}"
+        command: terraform--${{ inputs.command }} TERRAFORM_WORKSPACE="${{ inputs.workspace }}" TERRAFORM_ACCOUNT_WIDE="${{ inputs.account-wide }}" PARAMETER_DEPLOY="${{ inputs.parameter_deploy }}"
         requires-aws: true
         cache-suffix: ${{ inputs.cache-suffix }}
diff --git a/.github/workflows/_deploy.yml b/.github/workflows/_deploy.yml
@@ -9,6 +9,10 @@ on:
         required: false
         type: string
         default: ""
+      account_wide:
+        required: false
+        type: string
+        default: ""
 
 permissions:
   id-token: write
@@ -20,6 +24,7 @@ env:
   WORKSPACE: ${{ inputs.workspace }}
   CACHE_NAME: ${{ inputs.workspace }}-cache
   PARAMETER_DEPLOY: ${{ inputs.parameter_deploy }}
+  ACCOUNT_WIDE: ${{ inputs.account_wide }}
   # SLACK_WEBHOOK_URL: ${{ secrets.DEPLOY_ENV_SLACK_HOOK_URL }}
 
 jobs:
@@ -69,6 +74,7 @@ jobs:
         with:
           command: init
           workspace: ${{ env.WORKSPACE }}
+          account_wide: ${{ env.ACCOUNT_WIDE }}
           parameter_deploy: ${{ env.PARAMETER_DEPLOY }}
 
   terraform--plan:
@@ -82,6 +88,7 @@ jobs:
         with:
           command: plan
           workspace: ${{ env.WORKSPACE }}
+          account_wide: ${{ env.ACCOUNT_WIDE }}
           parameter_deploy: ${{ env.PARAMETER_DEPLOY }}
 
   terraform--apply:
@@ -95,6 +102,7 @@ jobs:
         with:
           command: apply
           workspace: ${{ env.WORKSPACE }}
+          account_wide: ${{ env.ACCOUNT_WIDE }}
           parameter_deploy: ${{ env.PARAMETER_DEPLOY }}
 
   test--smoke:

diff --git a/.github/workflows/deploy-parameters-nonprod.yml b/.github/workflows/deploy-parameters-nonprod.yml
@@ -18,5 +18,6 @@ jobs:
     uses: ./.github/workflows/_deploy.yml
     with:
       workspace: ${{ inputs.workspace }}
-      parameter_deploy: "parameter-deploy"
+      parameter_deploy: "parameter_deploy"
+      account_wide: "account_wide"
     secrets: inherit # pragma: allowlist secret
diff --git a/.github/workflows/deploy-parameters-prod.yml b/.github/workflows/deploy-parameters-prod.yml
@@ -8,5 +8,6 @@ jobs:
     uses: ./.github/workflows/_deploy.yml
     with:
       workspace: prod
-      parameter_deploy: "parameter-deploy"
+      parameter_deploy: "parameter_deploy"
+      account_wide: "account_wide"
     secrets: inherit # pragma: allowlist secret
diff --git a/infrastructure/terraform/per_account/main.tf → ...ructure/terraform/per_account/dev/main.tf b/infrastructure/terraform/per_account/main.tf → ...ructure/terraform/per_account/dev/main.tf
diff --git a/...aform/per_account/modules/placeholder.txt → ...m/per_account/dev/modules/placeholder.txt b/...aform/per_account/modules/placeholder.txt → ...m/per_account/dev/modules/placeholder.txt
diff --git a/...erraform/per_account/parameters/locals.tf → ...form/per_account/dev/parameters/locals.tf b/...erraform/per_account/parameters/locals.tf → ...form/per_account/dev/parameters/locals.tf
diff --git a/.../terraform/per_account/parameters/main.tf → ...raform/per_account/dev/parameters/main.tf b/.../terraform/per_account/parameters/main.tf → ...raform/per_account/dev/parameters/main.tf
diff --git a/...raform/per_account/parameters/provider.tf → ...rm/per_account/dev/parameters/provider.tf b/...raform/per_account/parameters/provider.tf → ...rm/per_account/dev/parameters/provider.tf
diff --git a/...aform/per_account/parameters/terraform.tf → ...m/per_account/dev/parameters/terraform.tf b/...aform/per_account/parameters/terraform.tf → ...m/per_account/dev/parameters/terraform.tf
diff --git a/.../terraform/per_account/parameters/vars.tf → ...raform/per_account/dev/parameters/vars.tf b/.../terraform/per_account/parameters/vars.tf → ...raform/per_account/dev/parameters/vars.tf
diff --git a/...ure/terraform/per_account/placeholder.txt → ...terraform/per_account/dev/placeholder.txt b/...ure/terraform/per_account/placeholder.txt → ...terraform/per_account/dev/placeholder.txt
diff --git a/scripts/infrastructure/terraform/terraform-utils.sh b/scripts/infrastructure/terraform/terraform-utils.sh
@@ -109,8 +109,8 @@ function _get_terraform_dir() {
   local dir=$(pwd)
   if [ "$RUNNING_IN_CI" = 1 ]; then
     echo "${dir}/infrastructure/terraform/per_workspace"
-  elif [ "$parameter_deploy" = "parameter-deploy"] && ["$account_wide" = "account_wide"]; then
-    echo "${dir}/infrastructure/terraform/per_account/parameters"
+  elif [ "$parameter_deploy" = "parameter_deploy"] && ["$account_wide" = "account_wide"]; then
+    echo "${dir}/infrastructure/terraform/per_account/$env/parameters"
   elif [ "$account_wide" = "account_wide" ]; then
     echo "${dir}/infrastructure/terraform/per_account/$env"
   elif [ "$account_wide" = "non_account_wide" ]; then