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

Jump to bottom

fix(iam): AccountPrincipal accepts values which aren't account IDs #20292

Merged
merged 9 commits into from
May 19, 2022
Merged

fix(iam): AccountPrincipal accepts values which aren't account IDs #20292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7938032
Changed type of accountId from any to string
tejasmr May 11, 2022
4f28f07
Added AccountPrincipal.<initializer> to allowed breaking changes
tejasmr May 11, 2022
34e2487
Added run time check, reverted type to any
tejasmr May 16, 2022
6b1fb11
Fixed formatting
tejasmr May 16, 2022
ad16abd
Changed Token to cdk.Token because of import
tejasmr May 16, 2022
fd5e1c5
Fixed 'A 'super' call must be the first statement'
tejasmr May 17, 2022
80bb437
Removed entry of AccountPrincipal from allowed breaking changes
tejasmr May 18, 2022
003c271
Added unit test for AccountPrincipal constructor
tejasmr May 18, 2022
23fa8f8
Merge branch 'master' into master
mergify[bot] May 19, 2022
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
3 changes: 3 additions & 0 deletions packages/@aws-cdk/aws-iam/lib/principals.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,9 @@ export class AccountPrincipal extends ArnPrincipal {
*/
constructor(public readonly accountId: any) {
super(new StackDependentToken(stack => `arn:${stack.partition}:iam::${accountId}:root`).toString());
if (!cdk.Token.isUnresolved(accountId) && typeof accountId !== 'string') {
throw new Error('accountId should be of type string');
}
this.principalAccount = accountId;
}

Expand Down
4 changes: 4 additions & 0 deletions packages/@aws-cdk/aws-iam/test/principals.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,10 @@ test('AccountPrincipal can specify an organization', () => {
});
});

test('Passing non-string as accountId parameter in AccountPrincipal constructor should throw error', () => {
expect(() => new iam.AccountPrincipal(1234)).toThrowError('accountId should be of type string');
});

test('ServicePrincipal in agnostic stack generates lookup table', () => {
// GIVEN
const stack = new Stack();
Expand Down