Skip to content

Fix for AWS_ACCOUNT defaulting to incorrect account #628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Valswyn-NHS merged 8 commits into from
Jul 10, 2026
Merged

Fix for AWS_ACCOUNT defaulting to incorrect account #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
781acd2
Bump cryptography from 46.0.7 to 48.0.1
dependabot[bot] Jun 19, 2026
e40997a
Merge branch 'master' into dependabot/pip/cryptography-48.0.1
slr655 Jul 2, 2026
f6e560e
Merge pull request #620 from NHSDigital/dependabot/pip/cryptography-4…
slr655 Jul 2, 2026
e04f425
upgrade awscli and idna (#626)
slr655 Jul 3, 2026
b0d27ef
Fix AWS account parameter usage and improve role existence check in a…
sathiya-nhs Jul 10, 2026
03b7fc0
Refactor account ID retrieval for clarity in assume role step
sathiya-nhs Jul 10, 2026
5a438e5
Fix account parameter usage in assume role step for improved clarity
sathiya-nhs Jul 10, 2026
1da0be0
Merge pull request #627 from NHSDigital/APIM-AWS-Assume-Role-Hotfix
Valswyn-NHS Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions azure/components/aws-assume-role.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [[ "${ACCOUNT}" =~ ^(prod|dev)$ ]]; then
echo "account is ${ACCOUNT}"
account_id="$(aws ssm get-parameter --name /account-ids/${ACCOUNT} --query Parameter.Value --output text)"
if [[ "${aws_role}" != arn:aws:iam:* ]]; then
aws_role="arn:aws:iam::${account_id}:role/${aws_role}"
fi
Expand All @@ -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
Expand Down Expand Up @@ -94,7 +94,7 @@ steps:
sed -i "s#\[default\]#\[profile ${profile}\]#" ~/.aws/config
fi
env:
AWS_ACCOUNT: ${{ parameters.aws_account }}
PROFILE: ${{ parameters.profile }}
ACCOUNT: ${{ parameters.aws_account }}
displayName: assume role
condition: and(succeeded(), eq(variables['ROLE_EXISTS'], 'true'))
Loading
Loading