Merge pull request #606 from NHSDigital/master

Merge Master to edge

Author: sathiya-nhs

azure/components/aws-assume-role.yml

@@ -18,6 +18,16 @@ steps:
       role: ${{ parameters.role }}
     displayName: get role name
 
+  - bash: |
+      if [ -z "$(ROLE)" ]; then
+        echo "ROLE is empty"
+        echo "##vso[task.setvariable variable=ROLE_EXISTS]false"
+      else
+        echo "ROLE value: $(ROLE)"
+        echo "##vso[task.setvariable variable=ROLE_EXISTS]true"
+      fi
+    displayName: "Set ROLE value (empty or not)"
+
   - bash: |
       set -e
 
@@ -85,4 +95,4 @@ steps:
       AWS_ACCOUNT: ${{ parameters.aws_account }}
       PROFILE: ${{ parameters.profile }}
     displayName: assume role
-    condition: and(succeeded(), ne(variables['ROLE'], ''))
+    condition: and(succeeded(), eq(variables['ROLE_EXISTS'], 'true'))