fix(secretsmanager): hosted rotation with fromSecretNameV2() does not create correct iam policy#28379
Merged
mergify[bot] merged 9 commits intoaws:mainfrom Dec 20, 2023
Conversation
… with imported secret as master secret
…cret-hosted-schedule-from-method
aws-cdk-automation
previously requested changes
Dec 15, 2023
Collaborator
aws-cdk-automation
left a comment
There was a problem hiding this comment.
The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.
A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.
✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.
go-to-k
commented
Dec 16, 2023
Comment on lines
+329
to
+333
| if (this.masterSecret?.secretFullArn) { | ||
| masterSecretArn = this.masterSecret.secretArn; | ||
| } else if (this.masterSecret) { // ISecret as an imported secret with partial ARN | ||
| masterSecretArn = this.masterSecret.secretArn + '-??????'; | ||
| } |
Contributor
Author
There was a problem hiding this comment.
if (this.masterSecret?.secretFullArn)- If we call a secret construct for
this.masterSecretin the stack, here is true. - Otherwise
this.masterSecretis generated fromfromSecretArn(),fromSecretCompleteArn()methods, etc. They also have a full ARN, so here is also true.- This
ifstatement will be true even if the arg (so it is the arn) for the methods is a token or not.
- This
- If we call a secret construct for
else if (this.masterSecret)- The secret is
ISecretas an imported secret with partial ARN. It is generated fromfromSecretNameV2(). - The
secretArnin this block will be a token. But processing this string is not a problem because the CloudFormation template can useFn::Jointo combine them properly. (see the unit tests.)
- The secret is
Collaborator
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
Contributor
|
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
paulhcsun
pushed a commit
to paulhcsun/aws-cdk
that referenced
this pull request
Jan 5, 2024
… create correct iam policy (aws#28379) In the case for a hosted rotation with a master secret by `fromSecretNameV2()`, IAM policy for lambda is not correct. The secret by the method has a partial ARN, so a generated IAM policy should use an ARN with `'-??????'`, but it will not use the ARN. Closes aws#28308. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
In the case for a hosted rotation with a master secret by
fromSecretNameV2(), IAM policy for lambda is not correct.The secret by the method has a partial ARN, so a generated IAM policy should use an ARN with
'-??????', but it will not use the ARN.Closes #28308.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license