NRL-1595 Pull target branch and environment from inputs - needs testing once merged

Author: atrace

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

@@ -1,9 +1,5 @@
 name: Deploy Account-wide infrastructure
-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
+run-name: Account-wide infra deployment to ${{ inputs.environment }} of ${{ inputs.branch_name }} by ${{ github.actor }}
 
 on:
   workflow_dispatch:
@@ -16,9 +12,6 @@ on:
       branch_name:
         description: Branch to deploy
         required: true
-  push:
-    branches:
-      - NRL-1595**
 
 permissions:
   id-token: write
@@ -32,7 +25,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
@@ -41,16 +34,16 @@ 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 }}
 
     steps:
-      - name: Git clone - ${{ github.ref_name }}
+      - name: Git clone - ${{ inputs.branch_name }}
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.ref_name }}
+          ref: ${{ inputs.branch_name }}
 
       - name: Setup environment
         run: |
@@ -62,7 +55,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:
@@ -98,16 +91,16 @@ 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 - ${{ '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 }}
+      - name: Git clone - ${{ inputs.branch_name }}
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.ref_name }}
+          ref: ${{ inputs.branch_name }}
 
       - name: Setup environment
         run: |
@@ -119,7 +112,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: