Skip to content
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

fix(secretsmanager): fix cross-region policy arn for imported secrets #26813

Merged
merged 3 commits into from
Aug 23, 2023
Merged

fix(secretsmanager): fix cross-region policy arn for imported secrets #26813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5aef3cc
fix(secretsmanager): fix cross-region policyArn for imported secrets
rv2673 Aug 18, 2023
32c62f7
Update packages/aws-cdk-lib/aws-secretsmanager/test/secret.test.ts
mrgrain Aug 23, 2023
8d94045
Merge branch 'main' into fix/#26811-fix-cross-region-import-secret-po…
mrgrain Aug 23, 2023
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
2 changes: 2 additions & 0 deletions packages/aws-cdk-lib/aws-secretsmanager/lib/secret.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,8 @@ export class Secret extends SecretBase {
public readonly secretName = parseSecretName(scope, secretArn);
protected readonly autoCreatePolicy = false;
public get secretFullArn() { return secretArnIsPartial ? undefined : secretArn; }
protected get arnForPolicies() { return secretArnIsPartial ? `${secretArn}-??????` : secretArn; }

}(scope, id, { environmentFromArn: secretArn });
}

Expand Down
56 changes: 56 additions & 0 deletions packages/aws-cdk-lib/aws-secretsmanager/test/secret.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,3 +1390,59 @@ test('cross-environment grant with direct object reference', () => {
});

});

test('cross-environment grant with imported from completeArn', () => {
// GIVEN
const secretCompleteArn = 'arn:aws:secretsmanager:foobar:1111111111:secret:secret-name-suffix';
const producerStack = new cdk.Stack(app, 'ProducerStack', { env: { region: 'foo', account: '1111111111' } });
const consumerStack = new cdk.Stack(app, 'ConsumerStack', { env: { region: 'bar', account: '1111111111' } });
const secret = secretsmanager.Secret.fromSecretCompleteArn(producerStack, 'Secret', secretCompleteArn);
const role = new iam.Role(consumerStack, 'Role', { assumedBy: new iam.AccountRootPrincipal() });

// WHEN
secret.grantRead(role);

// THEN
Template.fromStack(consumerStack).hasResourceProperties('AWS::IAM::Policy', {
PolicyDocument: {
Version: '2012-10-17',
Statement: [{
Action: [
'secretsmanager:GetSecretValue',
'secretsmanager:DescribeSecret',
],
Effect: 'Allow',
Resource: secretCompleteArn,
}],
},
});

});

test('cross-environment grant with imported from partialArn', () => {
// GIVEN
const secretPartialArn = 'arn:aws:secretsmanager:foobar:1111111111:secret:secret-name';
const producerStack = new cdk.Stack(app, 'ProducerStack', { env: { region: 'foo', account: '1111111111' } });
const consumerStack = new cdk.Stack(app, 'ConsumerStack', { env: { region: 'bar', account: '1111111111' } });
const secret = secretsmanager.Secret.fromSecretPartialArn(producerStack, 'Secret', secretPartialArn);
const role = new iam.Role(consumerStack, 'Role', { assumedBy: new iam.AccountRootPrincipal() });

// WHEN
secret.grantRead(role);

// THEN
Template.fromStack(consumerStack).hasResourceProperties('AWS::IAM::Policy', {
PolicyDocument: {
Version: '2012-10-17',
Statement: [{
Action: [
'secretsmanager:GetSecretValue',
'secretsmanager:DescribeSecret',
],
Effect: 'Allow',
Resource: `${secretPartialArn}-??????`,
}],
},
});

});