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

feat(cloudtrail): add configuration for IsOrganizationTrail #21625

Merged
merged 5 commits into from
Aug 17, 2022
Merged

feat(cloudtrail): add configuration for IsOrganizationTrail #21625

merged 5 commits into from
Aug 17, 2022

Conversation

daschaa
Copy link
Contributor

@daschaa daschaa commented Aug 16, 2022 •
edited
Loading

Fixes #21578

Please add pr-linter/exempt-readme label since this property needs no entry in the README imho.

All Submissions:

Adding new Unconventional Dependencies:

  • This PR adds new unconventional dependencies following the process described here

New Features

  • Have you added the new feature to an integration test?
    • Did you use yarn integ to deploy the infrastructure and generate the snapshot (i.e. yarn integ without --dry-run)?

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@gitpod-io
Copy link

gitpod-io bot commented Aug 16, 2022

@aws-cdk-automation aws-cdk-automation requested a review from a team August 16, 2022 16:33
@github-actions github-actions bot added effort/small Small work item – less than a day of effort feature-request A feature should be added or improved. p2 labels Aug 16, 2022
TheRealAmazonKendra
TheRealAmazonKendra previously requested changes Aug 16, 2022
View reviewed changes
Copy link
Contributor

@TheRealAmazonKendra TheRealAmazonKendra left a comment

Choose a reason for hiding this comment

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

I think I would actually like a README update on this because the CloudFormation documentation isn't clear enough. I would have been inclined to agree with you if it hadn't taken me multiple times reading it to understand what the actual behavior was.

packages/@aws-cdk/aws-cloudtrail/lib/cloudtrail.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/aws-cloudtrail/lib/cloudtrail.ts Outdated
@@ -285,6 +296,7 @@ export class Trail extends Resource {
cloudWatchLogsRoleArn: logsRole?.roleArn,
snsTopicName: this.topic?.topicName,
eventSelectors: this.eventSelectors,
isOrganizationTrail: props.isOrganizationTrail ?? false,
Copy link
Contributor

Choose a reason for hiding this comment

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

What's the behavior here if the account isn't the owner of an organization and this gets set to true? Does it just fail silently? If so, do we have a way to validate that the account is actually the owner of an organization?

packages/@aws-cdk/aws-cloudtrail/lib/cloudtrail.ts Outdated Show resolved Hide resolved
@mergify mergify bot dismissed TheRealAmazonKendra’s stale review August 17, 2022 07:52

Pull request has been modified.

@daschaa
Copy link
Contributor Author

daschaa commented Aug 17, 2022

@TheRealAmazonKendra I have added an entry in the README, updated the docstring and implemented your suggestion to not use the ?? false operator. Thanks for your valuable feedback!
Regarding the check if an account manages an organization, i did not find anything that could solve this problem. Do you know any way to check this?

@TheRealAmazonKendra
Copy link
Contributor

@TheRealAmazonKendra I have added an entry in the README, updated the docstring and implemented your suggestion to not use the ?? false operator. Thanks for your valuable feedback! Regarding the check if an account manages an organization, i did not find anything that could solve this problem. Do you know any way to check this?

I'm not sure that there is a good way without introducing a LOT of extra complexity to this.

@mergify
Copy link
Contributor

mergify bot commented Aug 17, 2022

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).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 3b8ffe0
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify mergify bot merged commit f5a1057 into aws:main Aug 17, 2022
@mergify
Copy link
Contributor

mergify bot commented Aug 17, 2022

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).

josephedward pushed a commit to josephedward/aws-cdk that referenced this pull request Aug 30, 2022
@daschaa @josephedward
feat(cloudtrail): add configuration for IsOrganizationTrail (aws#21625)
294431b 
Fixes aws#21578

Please add `pr-linter/exempt-readme` label since this property needs no entry in the README imho.

----

### All Submissions:

* [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [x] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)?
	* [x] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheRealAmazonKendra TheRealAmazonKendra TheRealAmazonKendra approved these changes

Assignees
No one assigned
Labels
effort/small Small work item – less than a day of effort feature-request A feature should be added or improved. p2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

(cloudtrail): (configuration for IsOrganizationTrail is failed)
3 participants
@daschaa @TheRealAmazonKendra @aws-cdk-automation