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

resource/aws_cloudtrail: Add is_organization_trail argument and refactor import testing #6580

Merged
merged 4 commits into from
Nov 30, 2018
Merged

resource/aws_cloudtrail: Add is_organization_trail argument and refactor import testing #6580

merged 4 commits into from
Nov 30, 2018

Conversation

bflad
Copy link
Contributor

@bflad bflad commented Nov 26, 2018 •
edited
Loading

Closes #6579

Changes proposed in this pull request:

  • resource/aws_cloudtrail: Add is_organization_trail argument
  • tests/resource/aws_cloudtrail: Add import TestStep to all acceptance tests and add include_global_service_events to serialization

Output from acceptance testing (regular acceptance testing account):

--- PASS: TestAccAWSCloudTrail (612.66s)
    --- PASS: TestAccAWSCloudTrail/Trail (612.66s)
        --- PASS: TestAccAWSCloudTrail/Trail/cloudwatch (77.06s)
        --- SKIP: TestAccAWSCloudTrail/Trail/isOrganization (0.96s)
            provider_test.go:242: skipping tests; this AWS account must not be an existing member of an AWS Organization
        --- PASS: TestAccAWSCloudTrail/Trail/logValidation (62.78s)
        --- PASS: TestAccAWSCloudTrail/Trail/eventSelector (67.81s)
        --- PASS: TestAccAWSCloudTrail/Trail/basic (58.55s)
        --- PASS: TestAccAWSCloudTrail/Trail/enableLogging (83.97s)
        --- PASS: TestAccAWSCloudTrail/Trail/includeGlobalServiceEvents (38.29s)
        --- PASS: TestAccAWSCloudTrail/Trail/isMultiRegion (80.90s)
        --- PASS: TestAccAWSCloudTrail/Trail/kmsKey (59.54s)
        --- PASS: TestAccAWSCloudTrail/Trail/tags (82.79s)

Output from acceptance testing (Organizations acceptance testing account):

--- PASS: TestAccAWSCloudTrail (61.47s)
    --- PASS: TestAccAWSCloudTrail/Trail (61.47s)
        --- PASS: TestAccAWSCloudTrail/Trail/isOrganization (61.47s)

@bflad bflad added enhancement Requests to existing resources that expand the functionality or scope. service/cloudtrail Issues and PRs that pertain to the cloudtrail service. labels Nov 26, 2018
@ghost ghost added size/L Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. documentation Introduces or discusses updates to documentation. labels Nov 26, 2018
This was referenced Nov 26, 2018
Closed
Merged
@bflad
Copy link
Contributor Author

bflad commented Nov 26, 2018

Submitted #6581 to implement Organizations AWS service access management in aws_organizations_organization

@bflad
tests/resource/aws_cloudtrail: Add import TestStep to all acceptance …
19fc376 
…tests and add include_global_service_events to serialization

```
--- PASS: TestAccAWSCloudTrail (588.21s)
    --- PASS: TestAccAWSCloudTrail/Trail (588.21s)
        --- PASS: TestAccAWSCloudTrail/Trail/kmsKey (61.26s)
        --- PASS: TestAccAWSCloudTrail/Trail/tags (82.74s)
        --- PASS: TestAccAWSCloudTrail/Trail/eventSelector (81.10s)
        --- PASS: TestAccAWSCloudTrail/Trail/basic (59.84s)
        --- PASS: TestAccAWSCloudTrail/Trail/cloudwatch (78.41s)
        --- PASS: TestAccAWSCloudTrail/Trail/enableLogging (82.74s)
        --- PASS: TestAccAWSCloudTrail/Trail/isMultiRegion (82.19s)
        --- PASS: TestAccAWSCloudTrail/Trail/logValidation (59.94s)
        --- PASS: TestAccAWSCloudTrail/Trail/includeGlobalServiceEvents (37.18s)
```
@bflad
resource/aws_cloudtrail: Add is_organization_trail argument
f55e310
@bflad
docs/resource/aws_cloudtrail: Document is_organization_trail and add …
dd5e66d 
…notes for multi-region/organization trails
@bflad
tests/resource/aws_cloudtrail: Finish testAccAWSCloudTrail_is_organiz…
ec54005 
…ation

```
        --- PASS: TestAccAWSCloudTrail/Trail/isOrganization (61.47s)
```
@bflad bflad force-pushed the f-aws_cloudtrail-is_organization_trail branch from d8dbed7 to ec54005 Compare November 26, 2018 07:18
@bflad bflad requested a review from a team November 26, 2018 07:30
@bflad bflad changed the title [WIP] resource/aws_cloudtrail: Add is_organization_trail argument and refactor import testing resource/aws_cloudtrail: Add is_organization_trail argument and refactor import testing Nov 26, 2018
@bflad bflad added this to the v1.51.0 milestone Nov 30, 2018
@bflad bflad merged commit 088d72f into master Nov 30, 2018
@bflad bflad deleted the f-aws_cloudtrail-is_organization_trail branch November 30, 2018 01:41
bflad added a commit that referenced this pull request Nov 30, 2018
@bflad
Update CHANGELOG for #6580
547a88a
@bflad
Copy link
Contributor Author

bflad commented Dec 5, 2018

This has been released in version 1.51.0 of the AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

@ghost
Copy link

ghost commented Apr 1, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked and limited conversation to collaborators Apr 1, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@radeksimko radeksimko radeksimko approved these changes

Assignees
No one assigned
Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. service/cloudtrail Issues and PRs that pertain to the cloudtrail service. size/L Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v1.51.0
Development

Successfully merging this pull request may close these issues.

Feature Request: CloudTrail Organizations Trail Support
2 participants
@bflad @radeksimko