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

r/aws_guardduty_organization_configuration: add auto_enable_organization_members attribute #30736

Merged
merged 6 commits into from
May 4, 2023
Merged

r/aws_guardduty_organization_configuration: add auto_enable_organization_members attribute #30736

merged 6 commits into from
May 4, 2023

Conversation

roberth-k
Copy link
Contributor

Description

  • Adds auto_enable_organization_members.
  • Deprecates auto_enable.

Relations

Closes #30680
Closes #30428

References

Output from Acceptance Testing

$ make testacc ACCTEST_PARALLELISM=1 TESTS=TestAccGuardDuty_ PKG=guardduty
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/guardduty/... -v -count 1 -parallel 1 -run='TestAccGuardDuty_'  -timeout 180m
=== RUN   TestAccGuardDuty_serial
=== PAUSE TestAccGuardDuty_serial
=== CONT  TestAccGuardDuty_serial
=== RUN   TestAccGuardDuty_serial/InviteAccepter
=== RUN   TestAccGuardDuty_serial/InviteAccepter/basic
    guardduty_test.go:69: Environment variable AWS_GUARDDUTY_MEMBER_ACCOUNT_ID is not set. To properly test inviting GuardDuty member accounts, a valid AWS account ID must be provided.
=== RUN   TestAccGuardDuty_serial/OrganizationConfiguration
=== RUN   TestAccGuardDuty_serial/OrganizationConfiguration/basic
=== RUN   TestAccGuardDuty_serial/OrganizationConfiguration/autoEnableOrganizationMembers
=== RUN   TestAccGuardDuty_serial/OrganizationConfiguration/s3Logs
=== RUN   TestAccGuardDuty_serial/OrganizationConfiguration/kubernetes
=== RUN   TestAccGuardDuty_serial/OrganizationConfiguration/malwareProtection
=== RUN   TestAccGuardDuty_serial/Detector
=== RUN   TestAccGuardDuty_serial/Detector/datasource_basic
=== RUN   TestAccGuardDuty_serial/Detector/datasource_id
=== RUN   TestAccGuardDuty_serial/Detector/basic
=== RUN   TestAccGuardDuty_serial/Detector/datasources_s3logs
=== RUN   TestAccGuardDuty_serial/Detector/datasources_kubernetes_audit_logs
=== RUN   TestAccGuardDuty_serial/Detector/datasources_malware_protection
=== RUN   TestAccGuardDuty_serial/Detector/datasources_all
=== RUN   TestAccGuardDuty_serial/Detector/tags
=== RUN   TestAccGuardDuty_serial/Filter
=== RUN   TestAccGuardDuty_serial/Filter/disappears
=== RUN   TestAccGuardDuty_serial/Filter/basic
=== RUN   TestAccGuardDuty_serial/Filter/update
=== RUN   TestAccGuardDuty_serial/Filter/tags
=== RUN   TestAccGuardDuty_serial/IPSet
=== RUN   TestAccGuardDuty_serial/IPSet/tags
=== RUN   TestAccGuardDuty_serial/IPSet/basic
=== RUN   TestAccGuardDuty_serial/OrganizationAdminAccount
=== RUN   TestAccGuardDuty_serial/OrganizationAdminAccount/basic
=== RUN   TestAccGuardDuty_serial/ThreatIntelSet
=== RUN   TestAccGuardDuty_serial/ThreatIntelSet/basic
=== RUN   TestAccGuardDuty_serial/ThreatIntelSet/tags
=== RUN   TestAccGuardDuty_serial/Member
=== RUN   TestAccGuardDuty_serial/Member/inviteDisassociate
    guardduty_test.go:69: Environment variable AWS_GUARDDUTY_MEMBER_ACCOUNT_ID is not set. To properly test inviting GuardDuty member accounts, a valid AWS account ID must be provided.
=== RUN   TestAccGuardDuty_serial/Member/invitationMessage
    guardduty_test.go:69: Environment variable AWS_GUARDDUTY_MEMBER_ACCOUNT_ID is not set. To properly test inviting GuardDuty member accounts, a valid AWS account ID must be provided.
=== RUN   TestAccGuardDuty_serial/Member/basic
=== RUN   TestAccGuardDuty_serial/Member/inviteOnUpdate
    guardduty_test.go:69: Environment variable AWS_GUARDDUTY_MEMBER_ACCOUNT_ID is not set. To properly test inviting GuardDuty member accounts, a valid AWS account ID must be provided.
=== RUN   TestAccGuardDuty_serial/PublishingDestination
=== RUN   TestAccGuardDuty_serial/PublishingDestination/basic
=== RUN   TestAccGuardDuty_serial/PublishingDestination/disappears
--- PASS: TestAccGuardDuty_serial (546.53s)
    --- PASS: TestAccGuardDuty_serial/InviteAccepter (0.00s)
        --- SKIP: TestAccGuardDuty_serial/InviteAccepter/basic (0.00s)
    --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration (196.19s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/basic (33.84s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/autoEnableOrganizationMembers (70.51s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/s3Logs (26.56s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/kubernetes (28.93s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/malwareProtection (36.36s)
    --- PASS: TestAccGuardDuty_serial/Detector (132.97s)
        --- PASS: TestAccGuardDuty_serial/Detector/datasource_basic (12.55s)
        --- PASS: TestAccGuardDuty_serial/Detector/datasource_id (7.83s)
        --- PASS: TestAccGuardDuty_serial/Detector/basic (25.23s)
        --- PASS: TestAccGuardDuty_serial/Detector/datasources_s3logs (14.25s)
        --- PASS: TestAccGuardDuty_serial/Detector/datasources_kubernetes_audit_logs (14.14s)
        --- PASS: TestAccGuardDuty_serial/Detector/datasources_malware_protection (14.08s)
        --- PASS: TestAccGuardDuty_serial/Detector/datasources_all (25.57s)
        --- PASS: TestAccGuardDuty_serial/Detector/tags (19.32s)
    --- PASS: TestAccGuardDuty_serial/Filter (57.19s)
        --- PASS: TestAccGuardDuty_serial/Filter/disappears (8.36s)
        --- PASS: TestAccGuardDuty_serial/Filter/basic (14.80s)
        --- PASS: TestAccGuardDuty_serial/Filter/update (13.27s)
        --- PASS: TestAccGuardDuty_serial/Filter/tags (20.77s)
    --- PASS: TestAccGuardDuty_serial/IPSet (49.69s)
        --- PASS: TestAccGuardDuty_serial/IPSet/tags (28.72s)
        --- PASS: TestAccGuardDuty_serial/IPSet/basic (20.96s)
    --- PASS: TestAccGuardDuty_serial/OrganizationAdminAccount (23.59s)
        --- PASS: TestAccGuardDuty_serial/OrganizationAdminAccount/basic (23.59s)
    --- PASS: TestAccGuardDuty_serial/ThreatIntelSet (49.30s)
        --- PASS: TestAccGuardDuty_serial/ThreatIntelSet/basic (25.09s)
        --- PASS: TestAccGuardDuty_serial/ThreatIntelSet/tags (24.22s)
    --- PASS: TestAccGuardDuty_serial/Member (9.22s)
        --- SKIP: TestAccGuardDuty_serial/Member/inviteDisassociate (0.00s)
        --- SKIP: TestAccGuardDuty_serial/Member/invitationMessage (0.00s)
        --- PASS: TestAccGuardDuty_serial/Member/basic (9.22s)
        --- SKIP: TestAccGuardDuty_serial/Member/inviteOnUpdate (0.00s)
    --- PASS: TestAccGuardDuty_serial/PublishingDestination (28.36s)
        --- PASS: TestAccGuardDuty_serial/PublishingDestination/basic (14.98s)
        --- PASS: TestAccGuardDuty_serial/PublishingDestination/disappears (13.38s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/guardduty  548.597s

@roberth-k
r/aws_guardduty_organization_configuration: fix race condition in acc…
b927244 
…eptance tests

Attempting to delete a detector fails when the organization admin account is still enabled.
@roberth-k
r/aws_guardduty_organization_configuration: consolidate acceptance te…
a82b3f5 
…st base configuration
@roberth-k
r/aws_guardduty_organization_configuration: add auto_enable_organizat…
15d111f 
…ion_members attribute
@roberth-k
r/aws_guardduty_organization_admin_account: ensure that the admin acc…
ebfbd8b 
…ount is disabled before the detector is destroyed
@github-actions
Copy link

Community Note

Voting for Prioritization

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

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • 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 documentation Introduces or discusses updates to documentation. service/guardduty Issues and PRs that pertain to the guardduty service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/L Managed by automation to categorize the size of a PR. needs-triage Waiting for first response or review from a maintainer. and removed documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/guardduty Issues and PRs that pertain to the guardduty service. labels Apr 14, 2023
@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. service/guardduty Issues and PRs that pertain to the guardduty service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Apr 14, 2023
@ewbankkit ewbankkit 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 Apr 17, 2023
@ewbankkit ewbankkit added this to the v5.0.0 milestone Apr 17, 2023
@ewbankkit
Copy link
Contributor

Added this to the upcoming v5.0.0 milestone as it's an attribute deprecation.

@ewbankkit ewbankkit changed the base branch from main to prerelease/5.x May 3, 2023 18:28
ewbankkit
ewbankkit approved these changes May 4, 2023
View reviewed changes
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

@roberth-k Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 5478cf2 into hashicorp:prerelease/5.x May 4, 2023
@ewbankkit ewbankkit mentioned this pull request May 4, 2023
Open
This was referenced May 23, 2023
Closed
Closed
@github-actions
Copy link

This functionality has been released in v5.0.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!

@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ewbankkit ewbankkit ewbankkit 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/guardduty Issues and PRs that pertain to the guardduty 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
v5.0.0
2 participants
@roberth-k @ewbankkit