NRL-1595 attempt to fix bad apply command

Author: atrace

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

@@ -1,5 +1,9 @@
 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 }}
+
+# Tidy up your commit history gurl!!
+
+# Put together better PR desceriptuion https://github.com/NHSDigital/NRLF/pull/1098
 
 on:
   workflow_dispatch:
@@ -28,7 +32,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 +41,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 +62,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:
@@ -94,10 +98,10 @@ jobs:
           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,12 +119,12 @@ 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:
           ACCOUNT_NAME: ${{ vars.ACCOUNT_NAME }}
-        run: aws s3 cp s3://nhsd-nrlf--mgmt--github-ci-logging/acc-$ACCOUNT_NAME/${{ github.run_id }}/tfplan terraform/account-wide-infrastructure/tfplan
+        run: aws s3 cp s3://nhsd-nrlf--mgmt--github-ci-logging/acc-$ACCOUNT_NAME/${{ github.run_id }}/tfplan terraform/account-wide-infrastructure/${ACCOUNT_NAME}/tfplan
 
       - name: Retrieve Server Certificates
         env:
@@ -141,9 +145,7 @@ jobs:
           ACCOUNT_NAME: ${{ vars.ACCOUNT_NAME }}
           ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
         run: |
-          terraform -chdir=terraform/account-wide-infrastructure/${ACCOUNT_NAME} apply tfplan \
-            -var assume_account=${ACCOUNT_ID} \
-            -var assume_role=terraform
+          terraform -chdir=terraform/account-wide-infrastructure/${ACCOUNT_NAME} apply tfplan
 
       - name: Update environment config version
         env: