Skip to content

Conversation

@tabito-hara
Copy link
Contributor

Rollback Plan

If a change needs to be reverted, we will publish an updated version of the library.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

Description

This PR includes the following enhancements:

  • Documentation updates to include newly added policy types:
    • SECURITYHUB_POLICY
    • INSPECTOR_POLICY
    • UPGRADE_ROLLOUT_POLICY
      for both enabled_policy_types in aws_organizations_organization and type in aws_organizations_policy
  • Additional acceptance tests to validate these policy types

These policy types are automatically supported due to the AWS SDK Go v2 update.
Support for SECURITYHUB_POLICY in aws_organizations_organization was already added in #45135.

Relations

Closes #45189
Closes #45234
Relates #45135

References

https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_inspector.html
https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_security_hub.html
https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_upgrade_rollout.html

Output from Acceptance Testing

$  make testacc TESTS='TestAccOrganizations_serial/Organization/EnabledPolicyTypes' PKG=organizations
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 td-aws_organizations-add_new_policies 🌿...
TF_ACC=1 go1.24.10 test ./internal/service/organizations/... -v -count 1 -parallel 20 -run='TestAccOrganizations_serial/Organization/EnabledPolicyTypes'  -timeout 360m -vet=off
2025/11/27 01:13:09 Creating Terraform AWS Provider (SDKv2-style)...
2025/11/27 01:13:09 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccOrganizations_serial
=== PAUSE TestAccOrganizations_serial
=== CONT  TestAccOrganizations_serial
=== RUN   TestAccOrganizations_serial/OrganizationalUnit
=== RUN   TestAccOrganizations_serial/Organization
=== RUN   TestAccOrganizations_serial/Organization/EnabledPolicyTypes
--- PASS: TestAccOrganizations_serial (220.68s)
    --- PASS: TestAccOrganizations_serial/OrganizationalUnit (0.00s)
    --- PASS: TestAccOrganizations_serial/Organization (220.68s)
        --- PASS: TestAccOrganizations_serial/Organization/EnabledPolicyTypes (220.68s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/organizations      225.683s
$ make testacc TESTS='TestAccOrganizations_serial/Policy/Type_(SecurityHub|Inspector|UpgradeRollout)' PKG=organizations
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_vpn_connection-add_bgp_log 🌿...
TF_ACC=1 go1.24.10 test ./internal/service/organizations/... -v -count 1 -parallel 20 -run='TestAccOrganizations_serial/Policy/Type_(SecurityHub|Inspector|UpgradeRollout)'  -timeout 360m -vet=off
2025/11/27 00:56:11 Creating Terraform AWS Provider (SDKv2-style)...
2025/11/27 00:56:11 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccOrganizations_serial
=== PAUSE TestAccOrganizations_serial
=== CONT  TestAccOrganizations_serial
=== RUN   TestAccOrganizations_serial/Policy
=== RUN   TestAccOrganizations_serial/Policy/Type_SecurityHub
=== RUN   TestAccOrganizations_serial/Policy/Type_Inspector
=== RUN   TestAccOrganizations_serial/Policy/Type_UpgradeRollout
=== RUN   TestAccOrganizations_serial/PolicyAttachment
=== RUN   TestAccOrganizations_serial/PolicyDataSource
=== RUN   TestAccOrganizations_serial/ResourcePolicy
--- PASS: TestAccOrganizations_serial (72.67s)
    --- PASS: TestAccOrganizations_serial/Policy (72.66s)
        --- PASS: TestAccOrganizations_serial/Policy/Type_SecurityHub (29.11s)
        --- PASS: TestAccOrganizations_serial/Policy/Type_Inspector (21.98s)
        --- PASS: TestAccOrganizations_serial/Policy/Type_UpgradeRollout (21.57s)
    --- PASS: TestAccOrganizations_serial/PolicyAttachment (0.00s)
    --- PASS: TestAccOrganizations_serial/PolicyDataSource (0.00s)
    --- PASS: TestAccOrganizations_serial/ResourcePolicy (0.00s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/organizations      76.825s

@github-actions
Copy link
Contributor

Community Guidelines

This comment is added to every new Pull Request to provide quick reference to how the Terraform AWS Provider is maintained. Please review the information below, and thank you for contributing to the community that keeps the provider thriving! 🚀

Voting for Prioritization

  • Please vote on this Pull Request by adding a 👍 reaction to the original post to help the community and maintainers prioritize it.
  • Please see our prioritization guide for additional information on how the maintainers handle prioritization.
  • Please do not leave +1 or other comments that do not add relevant new information or questions; they generate extra noise for others following the Pull Request and do not help prioritize the request.

Pull Request Authors

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added 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. service/organizations Issues and PRs that pertain to the organizations service. size/L Managed by automation to categorize the size of a PR. labels Nov 26, 2025
@tabito-hara tabito-hara changed the title [Docs/Tests] aws_organizations_organization/aws_organizations_policy: Add tests and documentation for SECURITYHUB_POLICY, INSPECTOR_POLICY and UPGRADE_ROLLOUT_POLICY [Docs/Tests] aws_organizations_organization/aws_organizations_policy: Add tests and update documentation for SECURITYHUB_POLICY, INSPECTOR_POLICY and UPGRADE_ROLLOUT_POLICY Nov 26, 2025
@tabito-hara tabito-hara marked this pull request as ready for review November 26, 2025 17:47
@tabito-hara tabito-hara requested a review from a team as a code owner November 26, 2025 17:47
@ewbankkit ewbankkit removed the needs-triage Waiting for first response or review from a maintainer. label Nov 26, 2025
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

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

LGTM 🚀.

@ewbankkit
Copy link
Contributor

@tabito-hara Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit eb8611c into hashicorp:main Nov 26, 2025
43 checks passed
@github-actions
Copy link
Contributor

Warning

This Issue has been closed, meaning that any additional comments are much easier for the maintainers to miss. Please assume that the maintainers will not see them.

Ongoing conversations amongst community members are welcome, however, the issue will be locked after 30 days. Moving conversations to another venue, such as the AWS Provider forum, is recommended. If you have additional concerns, please open a new issue, referencing this one where needed.

@github-actions github-actions bot added this to the v6.23.0 milestone Nov 26, 2025
@tabito-hara tabito-hara deleted the td-aws_organizations-add_new_policies branch November 26, 2025 18:03
@github-actions
Copy link
Contributor

This functionality has been released in v6.23.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. Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Introduces or discusses updates to documentation. service/organizations Issues and PRs that pertain to the organizations 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

Development

Successfully merging this pull request may close these issues.

UPGRADE_ROLLOUT_POLICY support in aws_organizations_policy [inspector2] organization policy support

2 participants