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(integ-tests): apply correct IAM policy to waiterProvider #28424

Merged
merged 8 commits into from
Dec 20, 2023
Merged

fix(integ-tests): apply correct IAM policy to waiterProvider #28424

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a429543
tmp
sakurai-ryo Dec 18, 2023
deaa5e1
fix: add test
sakurai-ryo Dec 18, 2023
4cb7d47
Merge branch 'master' of https://github.com/sakurai-ryo/aws-cdk into …
sakurai-ryo Dec 19, 2023
e7393a4
chore: update snapshot
sakurai-ryo Dec 19, 2023
a14033b
refactor: method, tests
sakurai-ryo Dec 19, 2023
df2b392
fix: typo
sakurai-ryo Dec 19, 2023
ddcdeab
chore: add docs
sakurai-ryo Dec 20, 2023
1844e3c
Merge branch 'main' into fix-integ-tests-invoke
mergify[bot] Dec 20, 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
17 changes: 15 additions & 2 deletions packages/@aws-cdk/integ-tests-alpha/lib/assertions/sdk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ export interface LambdaInvokeFunctionProps {

/**
* An AWS Lambda Invoke function API call.
* Use this istead of the generic AwsApiCall in order to
* Use this instead of the generic AwsApiCall in order to
* invoke a lambda function. This will automatically create
* the correct permissions to invoke the function
*/
Expand Down Expand Up @@ -250,6 +250,19 @@ export class LambdaInvokeFunction extends AwsApiCall {
arnFormat: ArnFormat.COLON_RESOURCE_NAME,
resourceName: props.functionName,
})]);

// If using `waitForAssertions`, do the same for `waiterProvider` as above.
Aspects.of(this).add({
Copy link
Contributor Author

@sakurai-ryo sakurai-ryo Dec 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Resource-based policy for Lambda is created in the part shown in the link, but it is not created here because invoking Lambda from Lambda is possible if the appropriate Policy is granted to the execution role of the invoking Lambda.

aws-cdk/packages/@aws-cdk/integ-tests-alpha/lib/assertions/sdk.ts

Line 236 in 52a5579

new CfnResource(this, 'Invoke', {

If you have any concerns, I would really appreciate it if you could let me know.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with this but -- can you document why you've used an Aspect so that others who stumble on your code will understand the decision please

visit(node: IConstruct) {
if (node instanceof AwsApiCall && node.waiterProvider) {
node.waiterProvider.addPolicyStatementFromSdkCall('Lambda', 'invokeFunction', [stack.formatArn({
service: 'lambda',
resource: 'function',
arnFormat: ArnFormat.COLON_RESOURCE_NAME,
resourceName: props.functionName,
})]);
}
},
});
}
}

32 changes: 32 additions & 0 deletions ...function-assertions.js.snapshot/AssertionsTestDefaultTestDeployAssertDC0672BB.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading