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

Support AISERVICES_OPT_OUT_POLICY for the organization policy #14528

Merged
merged 1 commit into from
Aug 12, 2020
Merged

Support AISERVICES_OPT_OUT_POLICY for the organization policy #14528

merged 1 commit into from
Aug 12, 2020

Conversation

shuheiktgw
Copy link
Collaborator

@shuheiktgw shuheiktgw commented Aug 8, 2020 •
edited
Loading

Community Note

  • Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Closes #14142

Release note for CHANGELOG:

ENHANCEMENTS
- resource/aws_organizations_policy: Support `AISERVICES_OPT_OUT_POLICY` for for the type attribute

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccAWSOrganizations_serial'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSOrganizations_serial -timeout 120m
=== RUN   TestAccAWSOrganizations_serial
=== RUN   TestAccAWSOrganizations_serial/PolicyAttachment
=== RUN   TestAccAWSOrganizations_serial/PolicyAttachment/Account
=== RUN   TestAccAWSOrganizations_serial/PolicyAttachment/OrganizationalUnit
=== RUN   TestAccAWSOrganizations_serial/PolicyAttachment/Root
=== RUN   TestAccAWSOrganizations_serial/Organization
=== RUN   TestAccAWSOrganizations_serial/Organization/basic
=== RUN   TestAccAWSOrganizations_serial/Organization/AwsServiceAccessPrincipals
=== RUN   TestAccAWSOrganizations_serial/Organization/EnabledPolicyTypes
=== RUN   TestAccAWSOrganizations_serial/Organization/FeatureSet
=== RUN   TestAccAWSOrganizations_serial/Organization/DataSource
=== RUN   TestAccAWSOrganizations_serial/Account
=== RUN   TestAccAWSOrganizations_serial/Account/basic
    TestAccAWSOrganizations_serial/Account/basic: provider_test.go:30: AWS Organizations Account testing is not currently automated due to manual account deletion steps.
=== RUN   TestAccAWSOrganizations_serial/Account/ParentId
    TestAccAWSOrganizations_serial/Account/ParentId: provider_test.go:30: AWS Organizations Account testing is not currently automated due to manual account deletion steps.
=== RUN   TestAccAWSOrganizations_serial/Account/Tags
    TestAccAWSOrganizations_serial/Account/Tags: provider_test.go:30: AWS Organizations Account testing is not currently automated due to manual account deletion steps.
=== RUN   TestAccAWSOrganizations_serial/OrganizationalUnit
=== RUN   TestAccAWSOrganizations_serial/OrganizationalUnit/basic
=== RUN   TestAccAWSOrganizations_serial/OrganizationalUnit/Name
=== RUN   TestAccAWSOrganizations_serial/OrganizationalUnits
=== RUN   TestAccAWSOrganizations_serial/OrganizationalUnits/DataSource
=== PAUSE TestAccAWSOrganizations_serial/OrganizationalUnits/DataSource
=== CONT  TestAccAWSOrganizations_serial/OrganizationalUnits/DataSource
=== RUN   TestAccAWSOrganizations_serial/Policy
=== RUN   TestAccAWSOrganizations_serial/Policy/Description
=== RUN   TestAccAWSOrganizations_serial/Policy/Type_AI_OPT_OUT
=== RUN   TestAccAWSOrganizations_serial/Policy/Type_Backup
=== RUN   TestAccAWSOrganizations_serial/Policy/Type_SCP
=== RUN   TestAccAWSOrganizations_serial/Policy/Type_Tag
=== RUN   TestAccAWSOrganizations_serial/Policy/basic
=== RUN   TestAccAWSOrganizations_serial/Policy/concurrent
--- PASS: TestAccAWSOrganizations_serial (1085.49s)
    --- PASS: TestAccAWSOrganizations_serial/PolicyAttachment (177.22s)
        --- PASS: TestAccAWSOrganizations_serial/PolicyAttachment/Account (76.63s)
        --- PASS: TestAccAWSOrganizations_serial/PolicyAttachment/OrganizationalUnit (53.24s)
        --- PASS: TestAccAWSOrganizations_serial/PolicyAttachment/Root (47.36s)
    --- PASS: TestAccAWSOrganizations_serial/Organization (407.22s)
        --- PASS: TestAccAWSOrganizations_serial/Organization/basic (35.24s)
        --- PASS: TestAccAWSOrganizations_serial/Organization/AwsServiceAccessPrincipals (84.26s)
        --- PASS: TestAccAWSOrganizations_serial/Organization/EnabledPolicyTypes (192.50s)
        --- PASS: TestAccAWSOrganizations_serial/Organization/FeatureSet (31.78s)
        --- PASS: TestAccAWSOrganizations_serial/Organization/DataSource (63.44s)
    --- PASS: TestAccAWSOrganizations_serial/Account (0.00s)
        --- SKIP: TestAccAWSOrganizations_serial/Account/basic (0.00s)
        --- SKIP: TestAccAWSOrganizations_serial/Account/ParentId (0.00s)
        --- SKIP: TestAccAWSOrganizations_serial/Account/Tags (0.00s)
    --- PASS: TestAccAWSOrganizations_serial/OrganizationalUnit (113.24s)
        --- PASS: TestAccAWSOrganizations_serial/OrganizationalUnit/basic (44.24s)
        --- PASS: TestAccAWSOrganizations_serial/OrganizationalUnit/Name (69.00s)
    --- PASS: TestAccAWSOrganizations_serial/OrganizationalUnits (0.00s)
        --- PASS: TestAccAWSOrganizations_serial/OrganizationalUnits/DataSource (45.18s)
    --- PASS: TestAccAWSOrganizations_serial/Policy (342.62s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/Description (60.70s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/Type_AI_OPT_OUT (37.88s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/Type_Backup (37.66s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/Type_SCP (59.40s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/Type_Tag (38.06s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/basic (60.76s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/concurrent (48.16s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	1087.162s

...

Thank you for yore review! 👍

@shuheiktgw shuheiktgw requested a review from a team August 8, 2020 09:13
@ghost ghost added size/S Managed by automation to categorize the size of a PR. service/organizations Issues and PRs that pertain to the organizations service. needs-triage Waiting for first response or review from a maintainer. documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Aug 8, 2020
@shuheiktgw shuheiktgw mentioned this pull request Aug 8, 2020
Closed
@bflad bflad added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Aug 12, 2020
@bflad bflad added this to the v3.2.0 milestone Aug 12, 2020
@bflad bflad self-assigned this Aug 12, 2020
bflad
bflad approved these changes Aug 12, 2020
View reviewed changes
Copy link
Contributor

@bflad bflad left a comment

Choose a reason for hiding this comment

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

Looks great, thank you @shuheiktgw 🚀

Output from acceptance testing:

    --- PASS: TestAccAWSOrganizations_serial/Policy (204.83s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/Description (34.52s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/Type_AI_OPT_OUT (19.36s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/Type_Backup (30.05s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/Type_SCP (34.20s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/Type_Tag (20.00s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/basic (34.68s)
        --- PASS: TestAccAWSOrganizations_serial/Policy/concurrent (32.01s)

@bflad bflad merged commit 6e798fb into hashicorp:master Aug 12, 2020
bflad added a commit that referenced this pull request Aug 12, 2020
@bflad
Update CHANGELOG for #14528
d5dfe9b
@ghost
Copy link

ghost commented Aug 14, 2020

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

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks!

@ghost
Copy link

ghost commented Sep 12, 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 Sep 12, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@bflad bflad bflad approved these changes

Assignees

@bflad bflad

Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. service/organizations Issues and PRs that pertain to the organizations service. size/S 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
v3.2.0
Development

Successfully merging this pull request may close these issues.

AISERVICES_OPT_OUT_POLICY not yet supported by aws_organizations enabled_policy_types attribute
2 participants
@shuheiktgw @bflad