fix(cloudtrail): Invalid resource for policy when using sendToCloudWatchLogs #1851
Conversation
This file contains 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
…tchLogs Sets `this.cloudWatchLogsGroupArn` before using it, such that a correct resource ARN is used in the policy generated for CloudTrail to be able to create and use the required log stream. Fixes #1848
rix0rrr
reviewed
Feb 25, 2019
| @@ -149,14 +149,13 @@ export class CloudTrail extends cdk.Construct { | |||
| }); | |||
| this.cloudWatchLogsGroupArn = logGroup.logGroupArn; | |||
|
|
|||
| const logsRole = new iam.Role(this, 'LogsRole', {assumedBy: new iam.ServicePrincipal(cloudTrailPrincipal) }); | |||
| const logsRole = new iam.Role(this, 'LogsRole', { assumedBy: new iam.ServicePrincipal(cloudTrailPrincipal) }); | |||
| this.cloudWatchLogsRoleArn = logsRole.roleArn; | |||
|
|
|||
| const streamArn = `${this.cloudWatchLogsRoleArn}:log-stream:*`; | |||
There was a problem hiding this comment.
Wait why was this not a static analysis error?
There was a problem hiding this comment.
The field is string | undefined (there is no value if you don't enable CloudWatch/Logs output) - and unassigned it is undefined, which is valid. Interpolating undefined is totally valid (and it'll output a literal undefined).
rix0rrr
approved these changes
Feb 25, 2019
eladb
reviewed
Feb 25, 2019
| @@ -149,14 +149,13 @@ export class CloudTrail extends cdk.Construct { | |||
| }); | |||
| this.cloudWatchLogsGroupArn = logGroup.logGroupArn; | |||
|
|
|||
| const logsRole = new iam.Role(this, 'LogsRole', {assumedBy: new iam.ServicePrincipal(cloudTrailPrincipal) }); | |||
| const logsRole = new iam.Role(this, 'LogsRole', { assumedBy: new iam.ServicePrincipal(cloudTrailPrincipal) }); | |||
| this.cloudWatchLogsRoleArn = logsRole.roleArn; | |||
There was a problem hiding this comment.
Why is cloudWatchLogsArn optional?
There was a problem hiding this comment.
Because it is meaningless if you do not enable output in CloudWatch Logs.
|
The real question in fact was why do we have private members that are only ever accessed from the constructor. I'm removing those and that'll make the code a lot safer. |
eladb
approved these changes
Feb 25, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Sets
this.cloudWatchLogsGroupArnbefore using it, such that a correctresource ARN is used in the policy generated for CloudTrail to be able
to create and use the required log stream.
Fixes #1848
Pull Request Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license.