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.

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

Allows enabling support of tag policies #11535

Merged
merged 8 commits into from
Jan 17, 2020

Conversation

nikolaifa
Copy link
Contributor

This will allow support of tag policies (https://aws.amazon.com/about-aws/whats-new/2019/11/aws-launches-tag-policies/) to be enabled.

The change allows the keyword "TAG_POLICY" to be used in enabled_policy_types list for the aws_organizations_organization resource. Tests for policy types are slightly changed to allow for more flexible use and tests for the new value is added.

Related feature requests #11202 and #11032

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

Relates OR Closes #0000

Release note for CHANGELOG:


Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccXXX'

...

@nikolaifa nikolaifa requested a review from a team January 9, 2020 14:44
@ghost ghost added size/S Managed by automation to categorize the size of a PR. needs-triage Waiting for first response or review from a maintainer. service/organizations Issues and PRs that pertain to the organizations service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Jan 9, 2020
@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 Jan 10, 2020
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.

Hi @nikolaifa 👋 Thank you for submitting this. Please see the below feedback items and let us know if you have any questions or do not have time to implement them.

aws/resource_aws_organizations_organization_test.go Outdated Show resolved Hide resolved
@bflad bflad added the waiting-response Maintainers are waiting on response from community or contributor. label Jan 10, 2020
@bflad bflad self-assigned this Jan 10, 2020
@ghost ghost added size/XS Managed by automation to categorize the size of a PR. and removed size/S Managed by automation to categorize the size of a PR. labels Jan 13, 2020
@ghost ghost added the documentation Introduces or discusses updates to documentation. label Jan 13, 2020
@bflad bflad removed the waiting-response Maintainers are waiting on response from community or contributor. label Jan 13, 2020
@bflad bflad added this to the v2.46.0 milestone Jan 17, 2020
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.

LGTM, thanks @nikolaifa 🚀 Will fix documentation on merge.

Output from acceptance testing:

    --- PASS: TestAccAWSOrganizations/Organization (189.32s)
        --- PASS: TestAccAWSOrganizations/Organization/FeatureSet (16.63s)
        --- PASS: TestAccAWSOrganizations/Organization/DataSource (31.42s)
        --- PASS: TestAccAWSOrganizations/Organization/basic (19.31s)
        --- PASS: TestAccAWSOrganizations/Organization/AwsServiceAccessPrincipals (39.67s)
        --- PASS: TestAccAWSOrganizations/Organization/EnabledPolicyTypes (82.29s)

@@ -28,7 +28,7 @@ resource "aws_organizations_organization" "org" {
The following arguments are supported:

* `aws_service_access_principals` - (Optional) List of AWS service principal names for which you want to enable integration with your organization. This is typically in the form of a URL, such as service-abbreviation.amazonaws.com. Organization must have `feature_set` set to `ALL`. For additional information, see the [AWS Organizations User Guide](https://docs.aws.amazon.com/organizations/latest/userguide/orgs_integrate_services.html).
* `enabled_policy_types` - (Optional) List of Organizations policy types to enable in the Organization Root. Organization must have `feature_set` set to `ALL`. For additional information about valid policy types (e.g. `SERVICE_CONTROL_POLICY`), see the [AWS Organizations API Reference](https://docs.aws.amazon.com/organizations/latest/APIReference/API_EnablePolicyType.html).
* `enabled_policy_types` - (Optional) List of Organizations policy types to enable in the Organization Root. Organization must have `feature_set` set to `ALL`. For additional information about valid policy types (e.g. `SERVICE_CONTROL_POLICY` and `SERVICE_CONTROL_POLICY`), see the [AWS Organizations API Reference](https://docs.aws.amazon.com/organizations/latest/APIReference/API_EnablePolicyType.html).
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be TAG_POLICY -- will fix on merge.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@bflad Thank you 😆

@bflad bflad merged commit bcb5d21 into hashicorp:master Jan 17, 2020
bflad added a commit that referenced this pull request Jan 17, 2020
@ghost
Copy link

ghost commented Jan 23, 2020

This has been released in version 2.46.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 Feb 16, 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 Feb 16, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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/XS 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
Development

Successfully merging this pull request may close these issues.

2 participants