NRL-1595 fix bad apply

Author: atrace

.github/workflows/deploy-account-wide-infra.yml

@@ -1,17 +1,30 @@
 name: Deploy Account-wide infrastructure
-run-name: Account-wide infra deployment to ${{ inputs.environment }} of ${{ github.ref_name }} by ${{ github.actor }}
+run-name: Account-wide infra deployment to ${{ 'account-dev' }} of ${{ github.ref_name }} by ${{ github.actor }}
+
+# An action environment would need
+#   name=acc-test
+# ACCOUNT_NAME=test
+# AWS_ACCOUNT_ID
+#   envs_to_pull: "qa" "ref" "int" "perftest" - use aws session assume.py - pull out
+# OR json format: ["qa", "ref", "int", "perftest"] - feels better
+# OR json obj lookup in repo-wide variable instead + same for below
+#   aws_account_id: 123456789 - get this from tf vars or something maybe? - use get_account_name script
+
+# MGMT_ROLE_ARN is in repo secrets, so not needed in env
+
+# Looping through envs to pull certs
 
 on:
-  workflow_dispatch:
-    inputs:
-      environment:
-        description: "Environment to deploy to"
-        required: true
-        default: "account-dev"
-        type: environment
-      branch_name:
-        description: Branch to deploy
-        required: true
+  # workflow_dispatch:
+  #   inputs:
+  #     environment:
+  #       description: "Environment to deploy to"
+  #       required: true
+  #       default: "account-dev"
+  #       type: environment
+  #     branch_name:
+  #       description: Branch to deploy
+  #       required: true
   push:
     branches:
       - NRL-1595**
@@ -28,7 +41,7 @@ jobs:
     steps:
       - name: Validate environment
         env:
-          IS_VALID_ENV: ${{ startsWith(inputs.environment, 'account-') }}
+          IS_VALID_ENV: ${{ startsWith('account-dev', 'account-') }}
         run: |
           echo "valid workflow environment selected:" $IS_VALID_ENV
           if [[ $IS_VALID_ENV == true ]]; then
@@ -37,8 +50,8 @@ jobs:
           exit 1
 
   terraform-plan:
-    name: Terraform Plan - ${{ inputs.environment }}
-    environment: ${{ inputs.environment }}
+    name: Terraform Plan - ${{ 'account-dev' }}
+    environment: ${{ 'account-dev' }}
     needs: [check-selected-environment]
     runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
 
@@ -58,7 +71,7 @@ jobs:
         with:
           aws-region: eu-west-2
           role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
-          role-session-name: github-actions-ci-${{ inputs.environment }}-${{ github.run_id }}
+          role-session-name: github-actions-ci-${{ 'account-dev' }}-${{ github.run_id }}
 
       - name: Retrieve Server Certificates
         env:
@@ -89,15 +102,15 @@ jobs:
           ACCOUNT_NAME: ${{ vars.ACCOUNT_NAME }}
         run: |
           terraform -chdir=terraform/account-wide-infrastructure/${ACCOUNT_NAME} show -no-color tfplan > terraform/account-wide-infrastructure/$ACCOUNT_NAME/tfplan.txt
-
+          ls terraform/account-wide-infrastructure/$ACCOUNT_NAME/
           aws s3 cp terraform/account-wide-infrastructure/$ACCOUNT_NAME/tfplan s3://nhsd-nrlf--mgmt--github-ci-logging/acc-$ACCOUNT_NAME/${{ github.run_id }}/tfplan
           aws s3 cp terraform/account-wide-infrastructure/$ACCOUNT_NAME/tfplan.txt s3://nhsd-nrlf--mgmt--github-ci-logging/acc-$ACCOUNT_NAME/${{ github.run_id }}/tfplan.txt
 
   terraform-apply:
-    name: Terraform Apply - ${{ inputs.environment }}
+    name: Terraform Apply - ${{ 'account-dev' }}
     needs: [terraform-plan]
     runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
-    environment: ${{ inputs.environment }}
+    environment: ${{ 'account-dev' }}
 
     steps:
       - name: Git clone - ${{ github.ref_name }}
@@ -115,7 +128,7 @@ jobs:
         with:
           aws-region: eu-west-2
           role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
-          role-session-name: github-actions-ci-${{ inputs.environment }}-${{ github.run_id}}
+          role-session-name: github-actions-ci-${{ 'account-dev' }}-${{ github.run_id}}
 
       - name: Download Terraform Plan artifact
         env:
@@ -151,3 +164,10 @@ jobs:
         run: |
           deployed_version=$(terraform -chdir=terraform/account-wide-infrastructure/${ACCOUNT_NAME} output --raw version)
           echo $deployed_version
+
+  # Slack notif: starting deploy of account-wide infra <branch deets>
+  # tf-plan: ensure output is visible in job output
+
+# pre-apply: check current commit deployed in state
+# post-apply: update current deployed commit in state
+#  no auto rollback