-
Notifications
You must be signed in to change notification settings - Fork 1
Chore: [AEA-0000] - use new exports #2266
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.
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
Open
anthony-nhs
wants to merge
2
commits into
main
Choose a base branch
from
use_new_exports
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,14 +6,23 @@ echo "$COMMIT_ID" | |
| AWS_MAX_ATTEMPTS=10 | ||
| export AWS_MAX_ATTEMPTS | ||
|
|
||
| artifact_bucket=$(aws cloudformation list-exports --output json | jq -r '.Exports[] | select(.Name == "account-resources:ArtifactsBucket") | .Value' | grep -o '[^:]*$') | ||
| CF_LONDON_EXPORTS=$(aws cloudformation list-exports --region eu-west-2 --output json) | ||
| # change this to account-resources-cdk-uk:Bucket:ArtifactsBucket:Arn once other change is merged | ||
| artifact_bucket_arn=$(echo "$CF_LONDON_EXPORTS" | \ | ||
| jq \ | ||
| --arg EXPORT_NAME "account-resources:ArtifactsBucket" \ | ||
| -r '.Exports[] | select(.Name == $EXPORT_NAME) | .Value') | ||
| artifact_bucket=$(echo "$artifact_bucket_arn" | cut -d: -f6 | cut -d/ -f1) | ||
| if [ -z "${artifact_bucket}" ]; then | ||
| echo "could not retrieve artifact_bucket from aws cloudformation list-exports" | ||
| exit 1 | ||
| fi | ||
| export artifact_bucket | ||
|
|
||
| cloud_formation_execution_role=$(aws cloudformation list-exports --output json | jq -r '.Exports[] | select(.Name == "ci-resources:CloudFormationExecutionRole") | .Value' ) | ||
| cloud_formation_execution_role=$(echo "$CF_LONDON_EXPORTS" | \ | ||
| jq \ | ||
| --arg EXPORT_NAME "iam-cdk:IAM:CloudFormationExecutionRole:Arn" \ | ||
| -r '.Exports[] | select(.Name == $EXPORT_NAME) | .Value') | ||
| if [ -z "${cloud_formation_execution_role}" ]; then | ||
|
Comment on lines
+22
to
26
|
||
| echo "could not retrieve cloud_formation_execution_role from aws cloudformation list-exports" | ||
| exit 1 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -152,7 +152,7 @@ Resources: | |||||
| Effect: Allow | ||||||
| Principal: | ||||||
| AWS: | ||||||
| - !ImportValue ci-resources:CloudFormationExecutionRole | ||||||
| - !ImportValue iam-cdk:IAM:CloudFormationExecutionRole:Arn | ||||||
| - !Sub arn:aws:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-eu-west-2 | ||||||
| Action: | ||||||
| - kms:DescribeKey | ||||||
|
|
@@ -255,9 +255,9 @@ Resources: | |||||
| Type: AWS::IAM::ManagedPolicy | ||||||
| Properties: | ||||||
| Roles: | ||||||
| - !ImportValue ci-resources:CloudFormationExecutionRoleName | ||||||
| - !ImportValue ci-resources:CloudFormationPrepareChangesetRoleName | ||||||
| - !ImportValue ci-resources:CloudFormationDeployRoleName | ||||||
| - !ImportValue iam-cdk:IAM:CloudFormationExecutionRole:Name | ||||||
| - !ImportValue iam-cdk:IAM:CloudFormationPrepareChangesetRole:Name | ||||||
| - !ImportValue iam-cdk:IAM:CloudFormationDeployRole:Name | ||||||
| PolicyDocument: | ||||||
| Version: 2012-10-17 | ||||||
| Statement: | ||||||
|
|
@@ -326,9 +326,9 @@ Resources: | |||||
| - Effect: Allow | ||||||
| Principal: | ||||||
| AWS: | ||||||
| - !ImportValue ci-resources:CloudFormationDeployRole | ||||||
| - !ImportValue ci-resources:CloudFormationExecutionRole | ||||||
| - !ImportValue ci-resources:CloudFormationPrepareChangesetRole | ||||||
| - !ImportValue iam-cdk:IAM:CloudFormationDeployRole:Arn | ||||||
| - !ImportValue iam-cdk:IAM:CloudFormationExecutionRole:Arn | ||||||
| - !ImportValue iam-cdk:IAM:CloudFormationPrepareChangesetRole:Arn | ||||||
| Action: | ||||||
| - s3:GetObject* | ||||||
| - s3:PutObject* | ||||||
|
|
@@ -340,7 +340,7 @@ Resources: | |||||
| - Effect: Allow | ||||||
| Principal: | ||||||
| AWS: | ||||||
| - !ImportValue ci-resources:CloudFormationDeployRole | ||||||
| - !ImportValue ciam-cdk:IAM:CloudFormationDeployRole:Arn | ||||||
|
||||||
| - !ImportValue ciam-cdk:IAM:CloudFormationDeployRole:Arn | |
| - !ImportValue iam-cdk:IAM:CloudFormationDeployRole:Arn |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -149,34 +149,34 @@ Resources: | |||||
| Action: | ||||||
| - secretsmanager:GetSecretValue | ||||||
| Resource: | ||||||
| - !ImportValue account-resources:PfpClientKeySecret | ||||||
| - !ImportValue account-resources:PfpClientCertSecret | ||||||
| - !ImportValue account-resources:PfpClientSandboxKeySecret | ||||||
| - !ImportValue account-resources:PfpClientSandboxCertSecret | ||||||
| - !ImportValue account-resources:PsuClientKeySecret | ||||||
| - !ImportValue account-resources:PsuClientSandboxKeySecret | ||||||
| - !ImportValue account-resources:PsuCACertSecret | ||||||
| - !ImportValue account-resources:PsuCAKeySecret | ||||||
| - !ImportValue account-resources:PsuClientCertSecret | ||||||
| - !ImportValue account-resources:PsuClientSandboxCertSecret | ||||||
| - !ImportValue account-resources:PSUProxygenPrivateKey | ||||||
| - !ImportValue account-resources:PSUProxygenPublicKey | ||||||
| - !ImportValue account-resources:CPSUProxygenPrivateKey | ||||||
| - !ImportValue account-resources:CPSUProxygenPublicKey | ||||||
| - !ImportValue account-resources:ClinicalTrackerClientKeySecret | ||||||
| - !ImportValue account-resources:ClinicalTrackerClientSandboxKeySecret | ||||||
| - !ImportValue account-resources:ClinicalTrackerCACertSecret | ||||||
| - !ImportValue account-resources:ClinicalTrackerCAKeySecret | ||||||
| - !ImportValue account-resources:ClinicalTrackerClientCertSecret | ||||||
| - !ImportValue account-resources:ClinicalTrackerClientSandboxCertSecret | ||||||
| - !ImportValue account-resources:ClinicalTrackerProxygenPrivateKey | ||||||
| - !ImportValue account-resources:ClinicalTrackerProxygenPublicKey | ||||||
| - !ImportValue account-resources:FhirFacadeClientKeySecret | ||||||
| - !ImportValue account-resources:FhirFacadeClientSandboxKeySecret | ||||||
| - !ImportValue account-resources:FhirFacadeCACertSecret | ||||||
| - !ImportValue account-resources:FhirFacadeCAKeySecret | ||||||
| - !ImportValue account-resources:FhirFacadeClientCertSecret | ||||||
| - !ImportValue account-resources:FhirFacadeClientSandboxCertSecret | ||||||
| - !ImportValue secrets-cdk:Secrets:PfpClientKeySecret:Arn | ||||||
| - !ImportValue secrets-cdk:Secrets:PfpClientSandboxCertSecret:Arn | ||||||
|
||||||
| - !ImportValue secrets-cdk:Secrets:PfpClientSandboxCertSecret:Arn | |
| - !ImportValue secrets-cdk:Secrets:PfpClientCertSecret:Arn |
Copilot
AI
Apr 27, 2026
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The PSU sandbox secret imports appear incorrect: PsuClientSandboxKeySecret is missing, while PsuClientSandboxCertSecret is listed twice. This will grant permissions to the wrong set of secrets and may break workflows that expect access to the sandbox key secret.
Suggested change
| - !ImportValue secrets-cdk:Secrets:PsuClientSandboxCertSecret:Arn | |
| - !ImportValue secrets-cdk:Secrets:PsuClientSandboxKeySecret:Arn |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jq -rreturns the literal stringnullwhen the export name is not found, and the current-zcheck won’t catch that. Add a guard that also treatsnull(and ideally non-ARN values) as failure before deriving the bucket name, otherwise the script can proceed with an invalid bucket and fail later in less obvious ways.