eli-445 tidying up workflows

Author: eddalmond1

.github/workflows/base-deploy.yml

@@ -194,13 +194,9 @@ jobs:
           aws-region: eu-west-2
 
       - name: "Deploy IAM roles (iams-developer-roles stack)"
-        env:
-          ENVIRONMENT: ${{ needs.metadata.outputs.environment }}
         working-directory: ./infrastructure
         run: |
-          make terraform-init env=$ENVIRONMENT stack=iams-developer-roles
-          terraform -chdir=./stacks/iams-developer-roles plan -var="environment=$ENVIRONMENT" -out=tfplan
-          terraform -chdir=./stacks/iams-developer-roles apply -auto-approve tfplan
+          make terraform env=${{ needs.metadata.outputs.environment }} stack=iams-developer-roles tf-command=apply workspace=default
 
       - name: "Configure AWS Credentials (Main Deployment Role)"
         uses: aws-actions/configure-aws-credentials@v6

.github/workflows/cicd-2-publish.yaml

@@ -94,13 +94,9 @@ jobs:
           aws-region: eu-west-2
 
       - name: "Deploy IAM roles (iams-developer-roles stack)"
-        env:
-          ENVIRONMENT: dev
         working-directory: ./infrastructure
         run: |
-          make terraform-init env=$ENVIRONMENT stack=iams-developer-roles
-          terraform -chdir=./stacks/iams-developer-roles plan -var="environment=$ENVIRONMENT" -out=tfplan
-          terraform -chdir=./stacks/iams-developer-roles apply -auto-approve tfplan
+          make terraform env=dev stack=iams-developer-roles tf-command=apply workspace=default
 
       - name: "Configure AWS Credentials (Main Deployment Role)"
         uses: aws-actions/configure-aws-credentials@v6