NRL-1595 tidy up + remove hardcoded references. This commit's run will fail because no manual inputs. Will need a test running manually once merged into develop but hopefully ready for PR

Author: atrace

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

@@ -1,30 +1,17 @@
 name: Deploy Account-wide infrastructure
-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
+run-name: Account-wide infra deployment to ${{ inputs.environment }} of ${{ github.ref_name }} by ${{ github.actor }}
 
 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**
@@ -41,7 +28,7 @@ jobs:
     steps:
       - name: Validate environment
         env:
-          IS_VALID_ENV: ${{ startsWith('account-dev', 'account-') }}
+          IS_VALID_ENV: ${{ startsWith(inputs.environment, 'account-') }}
         run: |
           echo "valid workflow environment selected:" $IS_VALID_ENV
           if [[ $IS_VALID_ENV == true ]]; then
@@ -50,8 +37,8 @@ jobs:
           exit 1
 
   terraform-plan:
-    name: Terraform Plan - ${{ 'account-dev' }}
-    environment: ${{ 'account-dev' }}
+    name: Terraform Plan - ${{ inputs.environment }}
+    environment: ${{ inputs.environment }}
     needs: [check-selected-environment]
     runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
 
@@ -71,7 +58,7 @@ jobs:
         with:
           aws-region: eu-west-2
           role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
-          role-session-name: github-actions-ci-${{ 'account-dev' }}-${{ github.run_id }}
+          role-session-name: github-actions-ci-${{ inputs.environment }}-${{ github.run_id }}
 
       - name: Retrieve Server Certificates
         env:
@@ -102,15 +89,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 - ${{ 'account-dev' }}
+    name: Terraform Apply - ${{ inputs.environment }}
     needs: [terraform-plan]
     runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
-    environment: ${{ 'account-dev' }}
+    environment: ${{ inputs.environment }}
 
     steps:
       - name: Git clone - ${{ github.ref_name }}
@@ -128,7 +115,7 @@ jobs:
         with:
           aws-region: eu-west-2
           role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
-          role-session-name: github-actions-ci-${{ 'account-dev' }}-${{ github.run_id}}
+          role-session-name: github-actions-ci-${{ inputs.environment }}-${{ github.run_id}}
 
       - name: Download Terraform Plan artifact
         env:
@@ -164,10 +151,3 @@ 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