Fix AWS account parameter usage and improve role existence check in assume role step

Author: sathiya-nhs

azure/components/aws-assume-role.yml

@@ -34,9 +34,9 @@ steps:
       aws_role="$(ROLE)"
       echo "assume role: '${aws_role}'"
 
-      if [[ "$AWS_ACCOUNT" =~ ^(prod|dev)$ ]]; then
-          echo "account is $AWS_ACCOUNT"
-          account_id="$(aws ssm get-parameter --name /account-ids/$AWS_ACCOUNT --query Parameter.Value --output text)"
+      if [[ "${{ parameters.aws_account }}" =~ ^(prod|dev)$ ]]; then # NOSONAR
+          echo "account is ${{ parameters.aws_account }}"
+          account_id="$(aws ssm get-parameter --name /account-ids/${{ parameters.aws_account }} --query Parameter.Value --output text)"
           if [[ "${aws_role}" != arn:aws:iam:* ]]; then
               aws_role="arn:aws:iam::${account_id}:role/${aws_role}"
           fi
@@ -46,7 +46,7 @@ steps:
           echo "check if role exists"
           # iam synchronisation issues can take a few to make the role appear
           for i in {1..15}; do
-            if aws iam get-role --role-name ${aws_role} > /dev/null; then
+            if aws iam get-role --role-name "${aws_role}" > /dev/null; then
               echo role exists
               sleep 2
               break
@@ -94,7 +94,6 @@ steps:
         sed -i "s#\[default\]#\[profile ${profile}\]#" ~/.aws/config
       fi
     env:
-      AWS_ACCOUNT: ${{ parameters.aws_account }}
       PROFILE: ${{ parameters.profile }}
     displayName: assume role
     condition: and(succeeded(), eq(variables['ROLE_EXISTS'], 'true'))