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

guardduty: Migrate to AWS SDK v2 #38400

Merged
merged 23 commits into from
Aug 2, 2024

Conversation

mattburgess
Copy link
Collaborator

@mattburgess mattburgess commented Jul 17, 2024

Description

Relations

Closes #36167
Relates #32976

References

Output from Acceptance Testing

% make testacc TESTS=TestAccXXX PKG=ec2

...

@mattburgess mattburgess added the aws-sdk-go-migration Issues that are related to the providers migration to AWS SDK for Go v2. label Jul 17, 2024
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.

@terraform-aws-provider terraform-aws-provider bot added tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/guardduty Issues and PRs that pertain to the guardduty service. sweeper Pertains to changes to or issues with the sweeper. tags Pertains to resource tagging. client-connections Pertains to the AWS Client and service connections. generators Relates to code generators. size/XL Managed by automation to categorize the size of a PR. labels Jul 17, 2024
@mattburgess mattburgess marked this pull request as ready for review July 17, 2024 22:43
@mattburgess mattburgess requested a review from a team as a code owner July 17, 2024 22:43
@justinretzolk justinretzolk added the external-maintainer Contribution from a trusted external contributor. label Jul 29, 2024
@johnsonaj johnsonaj self-assigned this Jul 31, 2024
@github-actions github-actions bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Jul 31, 2024
Copy link
Contributor

@johnsonaj johnsonaj 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" PKG=guardduty

make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.5 test ./internal/service/guardduty/... -v -count 1 -parallel 20  -run=TestAccGuardDuty -timeout 360m
=== NAME  TestAccGuardDuty_serial/OrganizationAdminAccount/basic
    organization_admin_account_test.go:28: skipping tests; this AWS account must not be an existing member of an AWS Organization
    guardduty_test.go:89: 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.
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:89: 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.
    guardduty_test.go:89: 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.
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:89: 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.
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    organization_configuration_test.go:193: skipping tests; this AWS account must not be an existing member of an AWS Organization
    organization_configuration_test.go:241: skipping tests; this AWS account must not be an existing member of an AWS Organization
    organization_configuration_test.go:27: skipping tests; this AWS account must not be an existing member of an AWS Organization
    organization_configuration_test.go:69: skipping tests; this AWS account must not be an existing member of an AWS Organization
    organization_configuration_test.go:147: skipping tests; this AWS account must not be an existing member of an AWS Organization
    organization_configuration_feature_test.go:26: skipping tests; this AWS account must not be an existing member of an AWS Organization
    organization_configuration_feature_test.go:54: skipping tests; this AWS account must not be an existing member of an AWS Organization
    organization_configuration_feature_test.go:96: skipping tests; this AWS account must not be an existing member of an AWS Organization
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
    guardduty_test.go:133: this AWS account has a GuardDuty Detector
--- PASS: TestAccGuardDuty_serial (21.94s)
    --- PASS: TestAccGuardDuty_serial/OrganizationAdminAccount (1.36s)
        --- SKIP: TestAccGuardDuty_serial/OrganizationAdminAccount/basic (1.36s)
    --- PASS: TestAccGuardDuty_serial/Member (0.07s)
        --- SKIP: TestAccGuardDuty_serial/Member/invitationMessage (0.00s)
        --- SKIP: TestAccGuardDuty_serial/Member/basic (0.07s)
        --- SKIP: TestAccGuardDuty_serial/Member/inviteOnUpdate (0.00s)
        --- SKIP: TestAccGuardDuty_serial/Member/inviteDisassociate (0.00s)
    --- PASS: TestAccGuardDuty_serial/DetectorFeature (0.20s)
        --- SKIP: TestAccGuardDuty_serial/DetectorFeature/basic (0.06s)
        --- SKIP: TestAccGuardDuty_serial/DetectorFeature/additional_configuration (0.07s)
        --- SKIP: TestAccGuardDuty_serial/DetectorFeature/multiple (0.07s)
    --- PASS: TestAccGuardDuty_serial/Filter (0.27s)
        --- SKIP: TestAccGuardDuty_serial/Filter/tags (0.07s)
        --- SKIP: TestAccGuardDuty_serial/Filter/disappears (0.07s)
        --- SKIP: TestAccGuardDuty_serial/Filter/basic (0.07s)
        --- SKIP: TestAccGuardDuty_serial/Filter/update (0.07s)
    --- PASS: TestAccGuardDuty_serial/FindingIDs (11.18s)
        --- PASS: TestAccGuardDuty_serial/FindingIDs/datasource_basic (11.18s)
    --- PASS: TestAccGuardDuty_serial/InviteAccepter (0.00s)
        --- SKIP: TestAccGuardDuty_serial/InviteAccepter/basic (0.00s)
    --- PASS: TestAccGuardDuty_serial/IPSet (0.13s)
        --- SKIP: TestAccGuardDuty_serial/IPSet/tags (0.07s)
        --- SKIP: TestAccGuardDuty_serial/IPSet/basic (0.07s)
    --- PASS: TestAccGuardDuty_serial/Detector (0.56s)
        --- SKIP: TestAccGuardDuty_serial/Detector/datasources_s3logs (0.07s)
        --- SKIP: TestAccGuardDuty_serial/Detector/datasources_kubernetes_audit_logs (0.07s)
        --- SKIP: TestAccGuardDuty_serial/Detector/datasources_malware_protection (0.07s)
        --- SKIP: TestAccGuardDuty_serial/Detector/datasources_all (0.07s)
        --- SKIP: TestAccGuardDuty_serial/Detector/tags (0.07s)
        --- SKIP: TestAccGuardDuty_serial/Detector/datasource_basic (0.07s)
        --- SKIP: TestAccGuardDuty_serial/Detector/datasource_id (0.08s)
        --- SKIP: TestAccGuardDuty_serial/Detector/basic (0.06s)
    --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration (4.55s)
        --- SKIP: TestAccGuardDuty_serial/OrganizationConfiguration/kubernetes (0.12s)
        --- SKIP: TestAccGuardDuty_serial/OrganizationConfiguration/malwareProtection (0.11s)
        --- SKIP: TestAccGuardDuty_serial/OrganizationConfiguration/basic (2.28s)
        --- SKIP: TestAccGuardDuty_serial/OrganizationConfiguration/autoEnableOrganizationMembers (0.12s)
        --- SKIP: TestAccGuardDuty_serial/OrganizationConfiguration/s3Logs (1.92s)
    --- PASS: TestAccGuardDuty_serial/OrganizationConfigurationFeature (3.34s)
        --- SKIP: TestAccGuardDuty_serial/OrganizationConfigurationFeature/basic (0.11s)
        --- SKIP: TestAccGuardDuty_serial/OrganizationConfigurationFeature/additional_configuration (1.32s)
        --- SKIP: TestAccGuardDuty_serial/OrganizationConfigurationFeature/multiple (1.91s)
    --- PASS: TestAccGuardDuty_serial/ThreatIntelSet (0.14s)
        --- SKIP: TestAccGuardDuty_serial/ThreatIntelSet/basic (0.07s)
        --- SKIP: TestAccGuardDuty_serial/ThreatIntelSet/tags (0.07s)
    --- PASS: TestAccGuardDuty_serial/PublishingDestination (0.13s)
        --- SKIP: TestAccGuardDuty_serial/PublishingDestination/basic (0.07s)
        --- SKIP: TestAccGuardDuty_serial/PublishingDestination/disappears (0.07s)
--- PASS: TestAccGuardDutyMalwareProtectionPlan_disappears (30.31s)
--- PASS: TestAccGuardDutyMalwareProtectionPlan_basic (33.03s)
--- PASS: TestAccGuardDutyMalwareProtectionPlan_role (45.58s)
--- PASS: TestAccGuardDutyMalwareProtectionPlan_protectedResourceS3BucketName (48.17s)
--- PASS: TestAccGuardDutyMalwareProtectionPlan_actionsTaggingStatus (52.37s)
--- PASS: TestAccGuardDutyMalwareProtectionPlan_tags (58.26s)
--- PASS: TestAccGuardDutyMalwareProtectionPlan_protectedResourceS3BucketObjectPrefix (59.05s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/guardduty	64.856s

@johnsonaj
Copy link
Contributor

@mattburgess thank you for the contribution! 🎉

@johnsonaj johnsonaj merged commit d5a0a58 into hashicorp:main Aug 2, 2024
34 checks passed
@github-actions github-actions bot added this to the v5.62.0 milestone Aug 2, 2024
@github-actions github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Aug 9, 2024
Copy link

github-actions bot commented Aug 9, 2024

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

Copy link

github-actions bot commented Sep 9, 2024

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 Sep 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
aws-sdk-go-migration Issues that are related to the providers migration to AWS SDK for Go v2. client-connections Pertains to the AWS Client and service connections. external-maintainer Contribution from a trusted external contributor. generators Relates to code generators. service/guardduty Issues and PRs that pertain to the guardduty service. size/XL Managed by automation to categorize the size of a PR. sweeper Pertains to changes to or issues with the sweeper. tags Pertains to resource tagging. 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.

[AWS SDK for Go Migration] GuardDuty Service
3 participants