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

New resource: aws_guardduty_organization_configuration_feature #33913

Merged
merged 12 commits into from
Oct 12, 2023
Merged

New resource: aws_guardduty_organization_configuration_feature #33913

merged 12 commits into from
Oct 12, 2023

Conversation

ewbankkit
Copy link
Contributor

Description

Adds a new resource, aws_guardduty_organization_configuration_feature, to manage a single Amazon GuardDuty organization configuration feature.

Relations

Closes #33817.
Relates #31463.

References

Output from Acceptance Testing

% make testacc TESTARGS='-run=TestAccGuardDuty_serial/^OrganizationConfigurationFeature$$' PKG=guardduty
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/guardduty/... -v -count 1 -parallel 20  -run=TestAccGuardDuty_serial/^OrganizationConfigurationFeature$ -timeout 360m
=== RUN   TestAccGuardDuty_serial
=== PAUSE TestAccGuardDuty_serial
=== CONT  TestAccGuardDuty_serial
=== RUN   TestAccGuardDuty_serial/OrganizationConfigurationFeature
=== RUN   TestAccGuardDuty_serial/OrganizationConfigurationFeature/basic
=== RUN   TestAccGuardDuty_serial/OrganizationConfigurationFeature/additional_configuration
=== RUN   TestAccGuardDuty_serial/OrganizationConfigurationFeature/multiple
--- PASS: TestAccGuardDuty_serial (143.82s)
    --- PASS: TestAccGuardDuty_serial/OrganizationConfigurationFeature (143.82s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfigurationFeature/basic (30.68s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfigurationFeature/additional_configuration (49.60s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfigurationFeature/multiple (74.44s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/guardduty	149.619s

@ewbankkit
r/aws_guardduty_organization_configuration: Alphabetize attributes.
52676cb
@ewbankkit
r/aws_guardduty_organization_configuration: Tidy up acceptance tests.
92d9db7
@ewbankkit
Fix semgrep 'ci.caps3-in-func-name'.
8c83a48
@ewbankkit
Acceptance test output:
454e9ce 
% make testacc TESTARGS='-run=TestAccGuardDuty_serial/^OrganizationConfiguration$$' PKG=guardduty
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/guardduty/... -v -count 1 -parallel 20  -run=TestAccGuardDuty_serial/^OrganizationConfiguration$ -timeout 360m
=== RUN   TestAccGuardDuty_serial
=== PAUSE TestAccGuardDuty_serial
=== CONT  TestAccGuardDuty_serial
=== RUN   TestAccGuardDuty_serial/OrganizationConfiguration
=== RUN   TestAccGuardDuty_serial/OrganizationConfiguration/s3Logs
=== RUN   TestAccGuardDuty_serial/OrganizationConfiguration/kubernetes
=== RUN   TestAccGuardDuty_serial/OrganizationConfiguration/malwareProtection
=== RUN   TestAccGuardDuty_serial/OrganizationConfiguration/basic
=== RUN   TestAccGuardDuty_serial/OrganizationConfiguration/autoEnableOrganizationMembers
--- PASS: TestAccGuardDuty_serial (338.25s)
    --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration (338.25s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/s3Logs (55.80s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/kubernetes (51.32s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/malwareProtection (47.81s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/basic (53.18s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/autoEnableOrganizationMembers (130.14s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/guardduty	343.041s
@ewbankkit
guardduty: Add 'FindOrganizationConfigurationByID'.
39f82d3
@ewbankkit
r/aws_guardduty_organization_configuration_feature: New resource.
111da26
@ewbankkit
r/aws_guardduty_organization_configuration_feature: Add documentation.
14ea380
@ewbankkit
r/aws_guardduty_organization_configuration_feature: Add acceptance te…
a94246e 
…sts.
@ewbankkit
Add CHANGELOG entry.
109adf1
@ewbankkit ewbankkit changed the title New resource aws_guardduty_organization_configuration_feature New resource: aws_guardduty_organization_configuration_feature Oct 12, 2023
@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 size/XL Managed by automation to categorize the size of a PR. 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. generators Relates to code generators. labels Oct 12, 2023
@terraform-aws-provider terraform-aws-provider bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Oct 12, 2023
jar-b
jar-b approved these changes Oct 12, 2023
View reviewed changes
Copy link
Member

@jar-b jar-b left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

% make testacc TESTARGS='-run=TestAccGuardDuty_serial/^OrganizationConfigurationFeature$$' PKG=guardduty
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/guardduty/... -v -count 1 -parallel 20  -run=TestAccGuardDuty_serial/^OrganizationConfigurationFeature$ -timeout 360m
=== RUN   TestAccGuardDuty_serial
=== PAUSE TestAccGuardDuty_serial
=== CONT  TestAccGuardDuty_serial
=== RUN   TestAccGuardDuty_serial/OrganizationConfigurationFeature
=== RUN   TestAccGuardDuty_serial/OrganizationConfigurationFeature/basic
=== RUN   TestAccGuardDuty_serial/OrganizationConfigurationFeature/additional_configuration
=== RUN   TestAccGuardDuty_serial/OrganizationConfigurationFeature/multiple
--- PASS: TestAccGuardDuty_serial (128.11s)
    --- PASS: TestAccGuardDuty_serial/OrganizationConfigurationFeature (128.11s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfigurationFeature/basic (25.33s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfigurationFeature/additional_configuration (46.59s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfigurationFeature/multiple (56.19s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/guardduty  131.264s

@ewbankkit
r/aws_guardduty_organization_configuration(_feature): Add a mutex to …
6956b3b 
…ensure that multiple features being updated concurrently don't trample on each other.
@ewbankkit
Copy link
Contributor Author

After adding detector mutex:

% make testacc TESTARGS='-run=TestAccGuardDuty_serial/^OrganizationConfiguration' PKG=guardduty 
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/guardduty/... -v -count 1 -parallel 20  -run=TestAccGuardDuty_serial/^OrganizationConfiguration -timeout 360m
=== RUN   TestAccGuardDuty_serial
=== PAUSE TestAccGuardDuty_serial
=== CONT  TestAccGuardDuty_serial
=== 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/OrganizationConfigurationFeature
=== RUN   TestAccGuardDuty_serial/OrganizationConfigurationFeature/multiple
=== RUN   TestAccGuardDuty_serial/OrganizationConfigurationFeature/basic
=== RUN   TestAccGuardDuty_serial/OrganizationConfigurationFeature/additional_configuration
--- PASS: TestAccGuardDuty_serial (502.62s)
    --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration (342.80s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/basic (50.71s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/autoEnableOrganizationMembers (129.34s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/s3Logs (48.43s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/kubernetes (54.07s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration/malwareProtection (60.24s)
    --- PASS: TestAccGuardDuty_serial/OrganizationConfigurationFeature (159.82s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfigurationFeature/multiple (84.28s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfigurationFeature/basic (28.80s)
        --- PASS: TestAccGuardDuty_serial/OrganizationConfigurationFeature/additional_configuration (46.74s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/guardduty	508.026s

@ewbankkit ewbankkit merged commit 1477108 into main Oct 12, 2023
41 checks passed
@ewbankkit ewbankkit deleted the f-aws_guardduty_organization_configuration.features branch October 12, 2023 19:03
@github-actions github-actions bot added this to the v5.21.0 milestone Oct 12, 2023
github-actions bot pushed a commit that referenced this pull request Oct 12, 2023
Update CHANGELOG.md for #33913
4463f90
@github-actions
Copy link

This functionality has been released in v5.21.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 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 Nov 12, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jar-b jar-b jar-b approved these changes

Assignees
No one assigned
Labels
documentation Introduces or discusses updates to documentation. generators Relates to code generators. prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. service/guardduty Issues and PRs that pertain to the guardduty service. size/XL 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.21.0
Development

Successfully merging this pull request may close these issues.

[Enhancement]: Support GuardDuty Organization Feature Configuration
2 participants
@ewbankkit @jar-b