Fork Sync: Update from parent repository #35

mbialon · 2023-09-29T16:26:54Z

No description provided.

This addresses issue #19893.

This reverts commit 931f43f.

# Conflicts: # website/docs/r/guardduty_detector.html.markdown

% make testacc TESTARGS='-run=TestAccGuardDuty_serial/Filter' 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/Filter -timeout 360m === RUN TestAccGuardDuty_serial === PAUSE TestAccGuardDuty_serial === CONT TestAccGuardDuty_serial === RUN TestAccGuardDuty_serial/Filter === RUN TestAccGuardDuty_serial/Filter/basic === RUN TestAccGuardDuty_serial/Filter/update === RUN TestAccGuardDuty_serial/Filter/tags === RUN TestAccGuardDuty_serial/Filter/disappears --- PASS: TestAccGuardDuty_serial (172.71s) --- PASS: TestAccGuardDuty_serial/Filter (172.71s) --- PASS: TestAccGuardDuty_serial/Filter/basic (49.88s) --- PASS: TestAccGuardDuty_serial/Filter/update (38.80s) --- PASS: TestAccGuardDuty_serial/Filter/tags (58.11s) --- PASS: TestAccGuardDuty_serial/Filter/disappears (25.92s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/guardduty 177.788s

% make testacc TESTARGS='-run=TestAccGuardDuty_serial' 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 -timeout 360m === RUN TestAccGuardDuty_serial === PAUSE TestAccGuardDuty_serial === CONT TestAccGuardDuty_serial === RUN TestAccGuardDuty_serial/InviteAccepter === RUN TestAccGuardDuty_serial/InviteAccepter/basic guardduty_test.go:84: 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/IPSet === RUN TestAccGuardDuty_serial/IPSet/basic guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/IPSet/tags guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/OrganizationConfiguration === RUN TestAccGuardDuty_serial/OrganizationConfiguration/s3Logs acctest.go:926: skipping tests; this AWS account must not be an existing member of an AWS Organization === RUN TestAccGuardDuty_serial/OrganizationConfiguration/kubernetes acctest.go:926: skipping tests; this AWS account must not be an existing member of an AWS Organization === RUN TestAccGuardDuty_serial/OrganizationConfiguration/malwareProtection acctest.go:926: skipping tests; this AWS account must not be an existing member of an AWS Organization === RUN TestAccGuardDuty_serial/OrganizationConfiguration/basic acctest.go:926: skipping tests; this AWS account must not be an existing member of an AWS Organization === RUN TestAccGuardDuty_serial/OrganizationConfiguration/autoEnableOrganizationMembers acctest.go:926: skipping tests; this AWS account must not be an existing member of an AWS Organization === RUN TestAccGuardDuty_serial/Detector === RUN TestAccGuardDuty_serial/Detector/features_ebs_malware_protection guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Detector/features_rds_login_events guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Detector/features_eks_runtime_monitoring guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Detector/datasource_basic guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Detector/datasource_id guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Detector/datasources_malware_protection guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Detector/datasources_all guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Detector/features_eks_audit_logs guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Detector/features_s3_data_events guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Detector/tags guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Detector/basic guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Detector/datasources_s3logs guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Detector/datasources_kubernetes_audit_logs guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Filter === RUN TestAccGuardDuty_serial/Filter/basic guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Filter/update guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Filter/tags guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Filter/disappears guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/FindingIDs === RUN TestAccGuardDuty_serial/FindingIDs/datasource_basic === RUN TestAccGuardDuty_serial/OrganizationAdminAccount === RUN TestAccGuardDuty_serial/OrganizationAdminAccount/basic acctest.go:926: skipping tests; this AWS account must not be an existing member of an AWS Organization === RUN TestAccGuardDuty_serial/ThreatIntelSet === RUN TestAccGuardDuty_serial/ThreatIntelSet/basic guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/ThreatIntelSet/tags guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Member === RUN TestAccGuardDuty_serial/Member/basic guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/Member/inviteOnUpdate guardduty_test.go:84: 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/inviteDisassociate guardduty_test.go:84: 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:84: 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 guardduty_test.go:128: this AWS account has a GuardDuty Detector === RUN TestAccGuardDuty_serial/PublishingDestination/disappears guardduty_test.go:128: this AWS account has a GuardDuty Detector --- PASS: TestAccGuardDuty_serial (72.79s) --- PASS: TestAccGuardDuty_serial/InviteAccepter (0.00s) --- SKIP: TestAccGuardDuty_serial/InviteAccepter/basic (0.00s) --- PASS: TestAccGuardDuty_serial/IPSet (1.15s) --- SKIP: TestAccGuardDuty_serial/IPSet/basic (1.03s) --- SKIP: TestAccGuardDuty_serial/IPSet/tags (0.12s) --- PASS: TestAccGuardDuty_serial/OrganizationConfiguration (5.03s) --- SKIP: TestAccGuardDuty_serial/OrganizationConfiguration/s3Logs (0.21s) --- SKIP: TestAccGuardDuty_serial/OrganizationConfiguration/kubernetes (0.11s) --- SKIP: TestAccGuardDuty_serial/OrganizationConfiguration/malwareProtection (1.96s) --- SKIP: TestAccGuardDuty_serial/OrganizationConfiguration/basic (0.11s) --- SKIP: TestAccGuardDuty_serial/OrganizationConfiguration/autoEnableOrganizationMembers (2.64s) --- PASS: TestAccGuardDuty_serial/Detector (1.45s) --- SKIP: TestAccGuardDuty_serial/Detector/features_ebs_malware_protection (0.11s) --- SKIP: TestAccGuardDuty_serial/Detector/features_rds_login_events (0.11s) --- SKIP: TestAccGuardDuty_serial/Detector/features_eks_runtime_monitoring (0.12s) --- SKIP: TestAccGuardDuty_serial/Detector/datasource_basic (0.11s) --- SKIP: TestAccGuardDuty_serial/Detector/datasource_id (0.11s) --- SKIP: TestAccGuardDuty_serial/Detector/datasources_malware_protection (0.11s) --- SKIP: TestAccGuardDuty_serial/Detector/datasources_all (0.12s) --- SKIP: TestAccGuardDuty_serial/Detector/features_eks_audit_logs (0.11s) --- SKIP: TestAccGuardDuty_serial/Detector/features_s3_data_events (0.11s) --- SKIP: TestAccGuardDuty_serial/Detector/tags (0.12s) --- SKIP: TestAccGuardDuty_serial/Detector/basic (0.11s) --- SKIP: TestAccGuardDuty_serial/Detector/datasources_s3logs (0.11s) --- SKIP: TestAccGuardDuty_serial/Detector/datasources_kubernetes_audit_logs (0.10s) --- PASS: TestAccGuardDuty_serial/Filter (0.47s) --- SKIP: TestAccGuardDuty_serial/Filter/basic (0.12s) --- SKIP: TestAccGuardDuty_serial/Filter/update (0.11s) --- SKIP: TestAccGuardDuty_serial/Filter/tags (0.12s) --- SKIP: TestAccGuardDuty_serial/Filter/disappears (0.11s) --- PASS: TestAccGuardDuty_serial/FindingIDs (63.93s) --- PASS: TestAccGuardDuty_serial/FindingIDs/datasource_basic (63.93s) --- PASS: TestAccGuardDuty_serial/OrganizationAdminAccount (0.21s) --- SKIP: TestAccGuardDuty_serial/OrganizationAdminAccount/basic (0.21s) --- PASS: TestAccGuardDuty_serial/ThreatIntelSet (0.22s) --- SKIP: TestAccGuardDuty_serial/ThreatIntelSet/basic (0.11s) --- SKIP: TestAccGuardDuty_serial/ThreatIntelSet/tags (0.11s) --- PASS: TestAccGuardDuty_serial/Member (0.13s) --- SKIP: TestAccGuardDuty_serial/Member/basic (0.13s) --- SKIP: TestAccGuardDuty_serial/Member/inviteOnUpdate (0.00s) --- SKIP: TestAccGuardDuty_serial/Member/inviteDisassociate (0.00s) --- SKIP: TestAccGuardDuty_serial/Member/invitationMessage (0.00s) --- PASS: TestAccGuardDuty_serial/PublishingDestination (0.21s) --- SKIP: TestAccGuardDuty_serial/PublishingDestination/basic (0.11s) --- SKIP: TestAccGuardDuty_serial/PublishingDestination/disappears (0.11s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/guardduty 78.326s

…'aws_guardduty_detector_feature'.

% make testacc TESTARGS='-run=TestAccGuardDuty_serial/DetectorFeature' 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/DetectorFeature -timeout 360m === RUN TestAccGuardDuty_serial === PAUSE TestAccGuardDuty_serial === CONT TestAccGuardDuty_serial === RUN TestAccGuardDuty_serial/DetectorFeature === RUN TestAccGuardDuty_serial/DetectorFeature/basic --- PASS: TestAccGuardDuty_serial (26.71s) --- PASS: TestAccGuardDuty_serial/DetectorFeature (26.71s) --- PASS: TestAccGuardDuty_serial/DetectorFeature/basic (26.71s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/guardduty 32.307s

% make testacc TESTARGS='-run=TestAccGuardDuty_serial/DetectorFeature/multiple' 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/DetectorFeature/multiple -timeout 360m === RUN TestAccGuardDuty_serial === PAUSE TestAccGuardDuty_serial === CONT TestAccGuardDuty_serial === RUN TestAccGuardDuty_serial/DetectorFeature === RUN TestAccGuardDuty_serial/DetectorFeature/multiple --- PASS: TestAccGuardDuty_serial (62.34s) --- PASS: TestAccGuardDuty_serial/DetectorFeature (62.34s) --- PASS: TestAccGuardDuty_serial/DetectorFeature/multiple (62.34s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/guardduty 67.776s

…tector." This reverts commit 10be4c2.

% make testacc TESTARGS='-run=TestAccGuardDuty_serial/DetectorFeature/multiple' 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/DetectorFeature/multiple -timeout 360m === RUN TestAccGuardDuty_serial === PAUSE TestAccGuardDuty_serial === CONT TestAccGuardDuty_serial === RUN TestAccGuardDuty_serial/DetectorFeature === RUN TestAccGuardDuty_serial/DetectorFeature/multiple --- PASS: TestAccGuardDuty_serial (57.49s) --- PASS: TestAccGuardDuty_serial/DetectorFeature (57.49s) --- PASS: TestAccGuardDuty_serial/DetectorFeature/multiple (57.49s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/guardduty 62.908s

% make testacc TESTARGS='-run=TestAccGuardDuty_serial/^Detector$$/datasource_' 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/^Detector$/datasource_ -timeout 360m === RUN TestAccGuardDuty_serial === PAUSE TestAccGuardDuty_serial === CONT TestAccGuardDuty_serial === RUN TestAccGuardDuty_serial/Detector === RUN TestAccGuardDuty_serial/Detector/datasource_basic === RUN TestAccGuardDuty_serial/Detector/datasource_id --- PASS: TestAccGuardDuty_serial (43.59s) --- PASS: TestAccGuardDuty_serial/Detector (43.59s) --- PASS: TestAccGuardDuty_serial/Detector/datasource_basic (22.86s) --- PASS: TestAccGuardDuty_serial/Detector/datasource_id (20.73s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/guardduty 48.907s

… a single newline character'.

…2023 Support for features in GuardDuty Detector

github-actions · 2023-09-29T16:27:10Z

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 · 2023-10-30T02:02:13Z

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.

maxvt and others added 30 commits September 24, 2021 11:27

fix: add validation of GuardDuty filter name

931f43f

This addresses issue #19893.

Support for features in GuardDuty Detector

399a612

Additional test for new detector features

835f068

Fix test expectations

50676ad

Adding the features property to the detector datasource

af620be

Updated the GuardDuty detector resource & datasource

8ae9a49

Revert "fix: add validation of GuardDuty filter name"

4d0b83f

This reverts commit 931f43f.

Merge branch 'main' into HEAD

ed33675

# Conflicts: # website/docs/r/guardduty_detector.html.markdown

Merge commit '4d0b83f964a4edea485b2a2f11aa871a345c8c59' into HEAD

67e3d65

r/aws_guardduty_filter: Alphabetize attributes.

ef26485

r/aws_guardduty_filter: Add plan-time validation of name.

0c57c34

guardduty: Add 'FindDetector'.

774d374

guardduty: Add 'testAccPreCheckDetectorNotExists'.

c3c684b

r/aws_guardduty_detector: Alphabetize attributes.

84b6b3c

r/aws_guardduty_detector: Add 'FindDetectorByID'.

c56ee3d

r/aws_guardduty_detector: Tidy up flex.

3d5208f

Add CHANGELOG entry.

bce6c0c

Replace 'aws_guardduty_detector.feature' attribute with new resource …

1324027

…'aws_guardduty_detector_feature'.

r/aws_guardduty_detector_feature: Start to add acceptance tests.

f85835e

Add 'testAccDetectorFeature_additionalConfiguration'.

0f6f312

Add 'testAccDetectorFeature_multiple'.

caddb58

r/aws_guardduty_detector_feature: Serialize calls to UpdateDetector.

10be4c2

Revert "r/aws_guardduty_detector_feature: Serialize calls to UpdateDe…

f48dc59

…tector." This reverts commit 10be4c2.

d/aws_guardduty_detector: Correct 'features' schema.

5577fe9

d/aws_guardduty_detector: Tidy up acceptance tests.

cb9532f

ewbankkit and others added 6 commits September 28, 2023 17:06

Fix markdownlint 'MD047/single-trailing-newline Files should end with…

5a114e4

… a single newline character'.

Fix semgrep 'ci.caps3-in-func-name'.

1eaf3c5

Merge pull request #31463 from ringods/b-aws_guardduty_detector-march…

d91e495

…2023 Support for features in GuardDuty Detector

aws_servicequotas: update to aws sdk v2 (#33656)

a154e1b

Update CHANGELOG.md for #33656

d80ba0c

mbialon merged commit d5a85f6 into opentofu:main Sep 29, 2023
31 of 43 checks passed

github-actions bot added size/XL documentation Improvements or additions to documentation generators provider tests client-connections service/guardduty service/servicequotas labels Sep 29, 2023

github-actions bot locked as resolved and limited conversation to collaborators Oct 30, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fork Sync: Update from parent repository #35

Fork Sync: Update from parent repository #35

mbialon commented Sep 29, 2023

github-actions bot commented Sep 29, 2023

github-actions bot commented Oct 30, 2023

Fork Sync: Update from parent repository #35

Fork Sync: Update from parent repository #35

Conversation

mbialon commented Sep 29, 2023

github-actions bot commented Sep 29, 2023

Community Note

github-actions bot commented Oct 30, 2023