From 4ec792a352ac2179b892799252f76e3651c69504 Mon Sep 17 00:00:00 2001
From: Sathiyakumar Ganesan <sathiyakumar.ganesan1@nhs.net>
Date: Tue, 19 May 2026 11:51:03 +0100
Subject: [PATCH] Add role existence check in aws-assume-role.yml

---
 azure/components/aws-assume-role.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/azure/components/aws-assume-role.yml b/azure/components/aws-assume-role.yml
index 76fc3c1a..e80e678d 100644
--- a/azure/components/aws-assume-role.yml
+++ b/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'))