Migrate `macie2` service to AWS SDK for Go v2 #37999

theipster · 2024-06-16T03:55:49Z

Description

As per the title, this PR migrates the macie2 service to AWS SDK for Go v2.

Additionally, this PR adds some fixes / improvements to the awssdkpatch tool to make the generated patch more accurate. (I'm happy to split these awssdkpatch changes into a separate PR if necessary.)

Relations

Relates to #32976
Closes #36184

Unblocks #26762 (new resource)
Unblocks #34938 (new resource)

References

Output from Acceptance Testing

Note to reviewers: this is as far as I can get without hitting multi-account errors, as well as the pre-existing errors described below. Can someone with a fully working environment please verify the tests again! 🙂

$ git describe --always --dirty
2305ee4beb

$ make testacc PKG=macie2
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.2 test ./internal/service/macie2/... -v -count 1 -parallel 20   -timeout 360m
=== RUN   TestAccMacie2_serial
=== PAUSE TestAccMacie2_serial
=== RUN   TestEndpointConfiguration
=== RUN   TestEndpointConfiguration/package_name_endpoint_config_overrides_service_config_file
=== RUN   TestEndpointConfiguration/service_aws_envvar
=== RUN   TestEndpointConfiguration/service_aws_envvar_overrides_base_envvar
=== RUN   TestEndpointConfiguration/package_name_endpoint_config
=== RUN   TestEndpointConfiguration/base_endpoint_envvar_overrides_service_config_file
=== RUN   TestEndpointConfiguration/base_endpoint_envvar_overrides_base_config_file
=== RUN   TestEndpointConfiguration/service_config_file
=== RUN   TestEndpointConfiguration/base_endpoint_config_file
=== RUN   TestEndpointConfiguration/package_name_endpoint_config_overrides_aws_service_envvar
=== RUN   TestEndpointConfiguration/service_config_file_overrides_base_config_file
=== RUN   TestEndpointConfiguration/use_fips_config
=== RUN   TestEndpointConfiguration/use_fips_config_with_package_name_endpoint_config
=== RUN   TestEndpointConfiguration/package_name_endpoint_config_overrides_base_config_file
=== RUN   TestEndpointConfiguration/package_name_endpoint_config_overrides_base_envvar
=== RUN   TestEndpointConfiguration/service_aws_envvar_overrides_service_config_file
=== RUN   TestEndpointConfiguration/service_aws_envvar_overrides_base_config_file
=== RUN   TestEndpointConfiguration/base_endpoint_envvar
=== RUN   TestEndpointConfiguration/no_config
--- PASS: TestEndpointConfiguration (0.81s)
    --- PASS: TestEndpointConfiguration/package_name_endpoint_config_overrides_service_config_file (0.05s)
    --- PASS: TestEndpointConfiguration/service_aws_envvar (0.04s)
    --- PASS: TestEndpointConfiguration/service_aws_envvar_overrides_base_envvar (0.04s)
    --- PASS: TestEndpointConfiguration/package_name_endpoint_config (0.06s)
    --- PASS: TestEndpointConfiguration/base_endpoint_envvar_overrides_service_config_file (0.04s)
    --- PASS: TestEndpointConfiguration/base_endpoint_envvar_overrides_base_config_file (0.04s)
    --- PASS: TestEndpointConfiguration/service_config_file (0.03s)
    --- PASS: TestEndpointConfiguration/base_endpoint_config_file (0.05s)
    --- PASS: TestEndpointConfiguration/package_name_endpoint_config_overrides_aws_service_envvar (0.05s)
    --- PASS: TestEndpointConfiguration/service_config_file_overrides_base_config_file (0.05s)
    --- PASS: TestEndpointConfiguration/use_fips_config (0.04s)
    --- PASS: TestEndpointConfiguration/use_fips_config_with_package_name_endpoint_config (0.05s)
    --- PASS: TestEndpointConfiguration/package_name_endpoint_config_overrides_base_config_file (0.06s)
    --- PASS: TestEndpointConfiguration/package_name_endpoint_config_overrides_base_envvar (0.05s)
    --- PASS: TestEndpointConfiguration/service_aws_envvar_overrides_service_config_file (0.04s)
    --- PASS: TestEndpointConfiguration/service_aws_envvar_overrides_base_config_file (0.04s)
    --- PASS: TestEndpointConfiguration/base_endpoint_envvar (0.05s)
    --- PASS: TestEndpointConfiguration/no_config (0.04s)
=== CONT  TestAccMacie2_serial
=== RUN   TestAccMacie2_serial/ClassificationJob
=== RUN   TestAccMacie2_serial/ClassificationJob/name_prefix
=== RUN   TestAccMacie2_serial/ClassificationJob/disappears
=== RUN   TestAccMacie2_serial/ClassificationJob/status
=== RUN   TestAccMacie2_serial/ClassificationJob/complete
=== RUN   TestAccMacie2_serial/ClassificationJob/tags
=== RUN   TestAccMacie2_serial/ClassificationJob/bucket_criteria
=== RUN   TestAccMacie2_serial/ClassificationJob/basic
=== RUN   TestAccMacie2_serial/ClassificationJob/name_generated
=== RUN   TestAccMacie2_serial/CustomDataIdentifier
=== RUN   TestAccMacie2_serial/CustomDataIdentifier/name_prefix
=== RUN   TestAccMacie2_serial/CustomDataIdentifier/classification_job
=== RUN   TestAccMacie2_serial/CustomDataIdentifier/tags
=== RUN   TestAccMacie2_serial/CustomDataIdentifier/basic
=== RUN   TestAccMacie2_serial/CustomDataIdentifier/name_generated
=== RUN   TestAccMacie2_serial/CustomDataIdentifier/disappears
=== RUN   TestAccMacie2_serial/FindingsFilter
=== RUN   TestAccMacie2_serial/FindingsFilter/date
    findings_filter_test.go:227: Step 3/3 error running import: ImportStateVerify attributes not equivalent. Difference is shown below. The - symbol indicates attributes missing after import.
        
          map[string]string{
        +       "finding_criteria.0.criterion.0.gt":  "",
        +       "finding_criteria.0.criterion.0.gte": "",
        +       "finding_criteria.0.criterion.0.lt":  "",
        +       "finding_criteria.0.criterion.0.lte": "",
          }
=== RUN   TestAccMacie2_serial/FindingsFilter/number
    findings_filter_test.go:304: Step 3/3 error running import: ImportStateVerify attributes not equivalent. Difference is shown below. The - symbol indicates attributes missing after import.
        
          map[string]string{
        +       "finding_criteria.0.criterion.0.gt":  "",
        +       "finding_criteria.0.criterion.0.gte": "",
        +       "finding_criteria.0.criterion.0.lt":  "",
        +       "finding_criteria.0.criterion.0.lte": "",
          }
=== RUN   TestAccMacie2_serial/FindingsFilter/tags
=== RUN   TestAccMacie2_serial/FindingsFilter/basic
=== RUN   TestAccMacie2_serial/FindingsFilter/name_generated
=== RUN   TestAccMacie2_serial/FindingsFilter/name_prefix
=== RUN   TestAccMacie2_serial/FindingsFilter/disappears
=== RUN   TestAccMacie2_serial/FindingsFilter/complete
=== RUN   TestAccMacie2_serial/OrganizationAdminAccount
=== RUN   TestAccMacie2_serial/OrganizationAdminAccount/basic
    organization_admin_account_test.go:27: skipping tests; this AWS account must not be an existing member of an AWS Organization
=== RUN   TestAccMacie2_serial/OrganizationAdminAccount/disappears
    organization_admin_account_test.go:56: skipping tests; this AWS account must not be an existing member of an AWS Organization
=== RUN   TestAccMacie2_serial/Member
=== RUN   TestAccMacie2_serial/Member/status
    member_test.go:255: Step 1/3 error: Error running apply: exit status 1
        
        Error: waiting for Macie Member ([REDACTED]) invitation: unexpected state 'EmailVerificationFailed', wanted target 'Invited, Enabled, Paused'. last error: %!s(<nil>)
        
          with aws_macie2_member.member,
          on terraform_plugin_test.tf line 33, in resource "aws_macie2_member" "member":
          33: resource "aws_macie2_member" "member" {
        
=== RUN   TestAccMacie2_serial/Member/basic
=== RUN   TestAccMacie2_serial/Member/disappears
=== RUN   TestAccMacie2_serial/Member/tags
=== RUN   TestAccMacie2_serial/Member/invitation_disable_email_notification
    member_test.go:103: Step 1/3 error: Error running apply: exit status 1
        
        Error: waiting for Macie Member ([REDACTED]) invitation: unexpected state 'EmailVerificationFailed', wanted target 'Invited, Enabled, Paused'. last error: %!s(<nil>)
        
          with aws_macie2_member.member,
          on terraform_plugin_test.tf line 33, in resource "aws_macie2_member" "member":
          33: resource "aws_macie2_member" "member" {
        
=== RUN   TestAccMacie2_serial/Member/invite
    member_test.go:145: Step 2/3 error: Error running apply: exit status 1
        
        Error: waiting for Macie Member ([REDACTED]) invitation: unexpected state 'EmailVerificationFailed', wanted target 'Invited, Enabled, Paused'. last error: %!s(<nil>)
        
          with aws_macie2_member.member,
          on terraform_plugin_test.tf line 33, in resource "aws_macie2_member" "member":
          33: resource "aws_macie2_member" "member" {
        
=== RUN   TestAccMacie2_serial/Member/invite_removed
    member_test.go:200: Step 1/3 error: Error running apply: exit status 1
        
        Error: waiting for Macie Member ([REDACTED]) invitation: unexpected state 'EmailVerificationFailed', wanted target 'Invited, Enabled, Paused'. last error: %!s(<nil>)
        
          with aws_macie2_member.member,
          on terraform_plugin_test.tf line 33, in resource "aws_macie2_member" "member":
          33: resource "aws_macie2_member" "member" {
        
=== RUN   TestAccMacie2_serial/InvitationAccepter
=== RUN   TestAccMacie2_serial/InvitationAccepter/basic
    invitation_accepter_test.go:28: Step 1/2 error: Error running apply: exit status 1
        
        Error: waiting for Macie Member ([REDACTED]) invitation: unexpected state 'EmailVerificationFailed', wanted target 'Invited, Enabled, Paused'. last error: %!s(<nil>)
        
          with aws_macie2_member.member,
          on terraform_plugin_test.tf line 33, in resource "aws_macie2_member" "member":
          33: resource "aws_macie2_member" "member" {
        
=== RUN   TestAccMacie2_serial/Account
=== RUN   TestAccMacie2_serial/Account/basic
=== RUN   TestAccMacie2_serial/Account/finding_publishing_frequency
=== RUN   TestAccMacie2_serial/Account/status
=== RUN   TestAccMacie2_serial/Account/finding_and_status
=== RUN   TestAccMacie2_serial/Account/disappears
=== RUN   TestAccMacie2_serial/ClassificationExportConfiguration
=== RUN   TestAccMacie2_serial/ClassificationExportConfiguration/basic
--- FAIL: TestAccMacie2_serial (558.04s)
    --- PASS: TestAccMacie2_serial/ClassificationJob (136.08s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/name_prefix (13.42s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/disappears (11.29s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/status (20.83s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/complete (21.39s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/tags (21.18s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/bucket_criteria (18.94s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/basic (15.53s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/name_generated (13.50s)
    --- PASS: TestAccMacie2_serial/CustomDataIdentifier (81.50s)
        --- PASS: TestAccMacie2_serial/CustomDataIdentifier/name_prefix (11.85s)
        --- PASS: TestAccMacie2_serial/CustomDataIdentifier/classification_job (21.59s)
        --- PASS: TestAccMacie2_serial/CustomDataIdentifier/tags (13.88s)
        --- PASS: TestAccMacie2_serial/CustomDataIdentifier/basic (11.83s)
        --- PASS: TestAccMacie2_serial/CustomDataIdentifier/name_generated (12.10s)
        --- PASS: TestAccMacie2_serial/CustomDataIdentifier/disappears (10.26s)
    --- FAIL: TestAccMacie2_serial/FindingsFilter (117.30s)
        --- FAIL: TestAccMacie2_serial/FindingsFilter/date (18.38s)
        --- FAIL: TestAccMacie2_serial/FindingsFilter/number (18.34s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/tags (11.68s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/basic (11.60s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/name_generated (11.68s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/name_prefix (11.68s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/disappears (10.05s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/complete (23.89s)
    --- PASS: TestAccMacie2_serial/OrganizationAdminAccount (0.64s)
        --- SKIP: TestAccMacie2_serial/OrganizationAdminAccount/basic (0.46s)
        --- SKIP: TestAccMacie2_serial/OrganizationAdminAccount/disappears (0.19s)
    --- FAIL: TestAccMacie2_serial/Member (113.46s)
        --- FAIL: TestAccMacie2_serial/Member/status (9.99s)
        --- PASS: TestAccMacie2_serial/Member/basic (21.38s)
        --- PASS: TestAccMacie2_serial/Member/disappears (18.30s)
        --- PASS: TestAccMacie2_serial/Member/tags (21.59s)
        --- FAIL: TestAccMacie2_serial/Member/invitation_disable_email_notification (10.25s)
        --- FAIL: TestAccMacie2_serial/Member/invite (22.21s)
        --- FAIL: TestAccMacie2_serial/Member/invite_removed (9.73s)
    --- FAIL: TestAccMacie2_serial/InvitationAccepter (9.89s)
        --- FAIL: TestAccMacie2_serial/InvitationAccepter/basic (9.89s)
    --- PASS: TestAccMacie2_serial/Account (74.46s)
        --- PASS: TestAccMacie2_serial/Account/basic (11.30s)
        --- PASS: TestAccMacie2_serial/Account/finding_publishing_frequency (17.60s)
        --- PASS: TestAccMacie2_serial/Account/status (17.85s)
        --- PASS: TestAccMacie2_serial/Account/finding_and_status (17.75s)
        --- PASS: TestAccMacie2_serial/Account/disappears (9.97s)
    --- PASS: TestAccMacie2_serial/ClassificationExportConfiguration (24.71s)
        --- PASS: TestAccMacie2_serial/ClassificationExportConfiguration/basic (24.71s)
FAIL
FAIL    github.com/hashicorp/terraform-provider-aws/internal/service/macie2     558.969s
FAIL
make: *** [GNUmakefile:626: testacc] Error 1

See docs/aws-go-sdk-migrations.md.

Run `PKG=macie2 make awssdkpatch-apply`

github-actions · 2024-06-16T03:56:03Z

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 · 2024-06-16T03:56:23Z

Thank you for your contribution! 🚀

Please note that typically Go dependency changes are handled in this repository by dependabot or the maintainers. This is to prevent pull request merge conflicts and further delay reviews of contributions. Remove any changes to the go.mod or go.sum files and commit them into this pull request.

Additional details:

Check open pull requests with the dependencies label to view other dependency updates.
If this pull request includes an update the AWS Go SDK (or any other dependency) version, only updates submitted via dependabot will be merged. This pull request will need to remove these changes and will need to be rebased after the existing dependency update via dependabot has been merged for this pull request to be reviewed.
If this pull request is for supporting a new AWS service:
- Ensure the new AWS service changes are following the Contributing Guide section on new services, in particular that the dependency addition and initial provider support are in a separate pull request from other changes (e.g. new resources). Contributions not following this item will not be reviewed until the changes are split.
- If this pull request is already a separate pull request from the above item, you can ignore this message.

theipster · 2024-06-17T00:28:06Z

Interesting baseline test results: 😏

$ git describe --always --dirty
b3e80bab10

$ make testacc PKG=macie2 TESTS=TestAccMacie2_serial/FindingsFilter
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.2 test ./internal/service/macie2/... -v -count 1 -parallel 20 -run='TestAccMacie2_serial/FindingsFilter'  -timeout 360m
=== RUN   TestAccMacie2_serial
=== PAUSE TestAccMacie2_serial
=== CONT  TestAccMacie2_serial
=== RUN   TestAccMacie2_serial/FindingsFilter
=== RUN   TestAccMacie2_serial/FindingsFilter/tags
=== RUN   TestAccMacie2_serial/FindingsFilter/basic
=== RUN   TestAccMacie2_serial/FindingsFilter/name_generated
=== RUN   TestAccMacie2_serial/FindingsFilter/name_prefix
=== RUN   TestAccMacie2_serial/FindingsFilter/disappears
=== RUN   TestAccMacie2_serial/FindingsFilter/complete
=== RUN   TestAccMacie2_serial/FindingsFilter/date
    findings_filter_test.go:226: Step 3/3 error running import: ImportStateVerify attributes not equivalent. Difference is shown below. The - symbol indicates attributes missing after import.
        
          map[string]string{
        +       "finding_criteria.0.criterion.0.gt":  "",
        +       "finding_criteria.0.criterion.0.gte": "",
        +       "finding_criteria.0.criterion.0.lt":  "",
        +       "finding_criteria.0.criterion.0.lte": "",
          }
=== RUN   TestAccMacie2_serial/FindingsFilter/number
    findings_filter_test.go:303: Step 3/3 error running import: ImportStateVerify attributes not equivalent. Difference is shown below. The - symbol indicates attributes missing after import.
        
          map[string]string{
        +       "finding_criteria.0.criterion.0.gt":  "",
        +       "finding_criteria.0.criterion.0.gte": "",
        +       "finding_criteria.0.criterion.0.lt":  "",
        +       "finding_criteria.0.criterion.0.lte": "",
          }
--- FAIL: TestAccMacie2_serial (117.87s)
    --- FAIL: TestAccMacie2_serial/FindingsFilter (117.87s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/tags (12.00s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/basic (11.69s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/name_generated (11.70s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/name_prefix (11.74s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/disappears (9.95s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/complete (23.98s)
        --- FAIL: TestAccMacie2_serial/FindingsFilter/date (18.47s)
        --- FAIL: TestAccMacie2_serial/FindingsFilter/number (18.33s)
FAIL
FAIL    github.com/hashicorp/terraform-provider-aws/internal/service/macie2     117.962s
FAIL
make: *** [GNUmakefile:626: testacc] Error 1

Technically, this patch would "solve" the failing tests:

diff --git a/internal/service/macie2/findings_filter_test.go b/internal/service/macie2/findings_filter_test.go
index 088f1ebaf5..737b54efaf 100644
--- a/internal/service/macie2/findings_filter_test.go
+++ b/internal/service/macie2/findings_filter_test.go
@@ -285,6 +285,12 @@ func testAccFindingsFilter_WithDate(t *testing.T) {
                                ResourceName:      resourceName,
                                ImportState:       true,
                                ImportStateVerify: true,
+                               ImportStateVerifyIgnore: []string{
+                                       "finding_criteria.0.criterion.0.gt",
+                                       "finding_criteria.0.criterion.0.gte",
+                                       "finding_criteria.0.criterion.0.lt",
+                                       "finding_criteria.0.criterion.0.lte",
+                               },
                        },
                },
        })
@@ -357,6 +363,12 @@ func testAccFindingsFilter_WithNumber(t *testing.T) {
                                ResourceName:      resourceName,
                                ImportState:       true,
                                ImportStateVerify: true,
+                               ImportStateVerifyIgnore: []string{
+                                       "finding_criteria.0.criterion.0.gt",
+                                       "finding_criteria.0.criterion.0.gte",
+                                       "finding_criteria.0.criterion.0.lt",
+                                       "finding_criteria.0.criterion.0.lte",
+                               },
                        },
                },
        })

# Conflicts: # go.mod # go.sum # internal/conns/awsclient_gen.go # internal/service/macie2/service_endpoints_gen_test.go # internal/service/macie2/service_package_gen.go # names/data/names_data.csv # names/names.go # tools/awssdkpatch/patch.tmpl

ewbankkit

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccMacie2_serial' PKG=macie2
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/macie2/... -v -count 1 -parallel 20  -run=TestAccMacie2_serial -timeout 360m
=== RUN   TestAccMacie2_serial
=== PAUSE TestAccMacie2_serial
=== CONT  TestAccMacie2_serial
=== RUN   TestAccMacie2_serial/Account
=== RUN   TestAccMacie2_serial/Account/finding_publishing_frequency
=== RUN   TestAccMacie2_serial/Account/status
=== RUN   TestAccMacie2_serial/Account/finding_and_status
=== RUN   TestAccMacie2_serial/Account/disappears
=== RUN   TestAccMacie2_serial/Account/basic
=== RUN   TestAccMacie2_serial/ClassificationExportConfiguration
=== RUN   TestAccMacie2_serial/ClassificationExportConfiguration/basic
=== RUN   TestAccMacie2_serial/ClassificationJob
=== RUN   TestAccMacie2_serial/ClassificationJob/name_prefix
=== RUN   TestAccMacie2_serial/ClassificationJob/disappears
=== RUN   TestAccMacie2_serial/ClassificationJob/status
=== RUN   TestAccMacie2_serial/ClassificationJob/complete
=== RUN   TestAccMacie2_serial/ClassificationJob/tags
=== RUN   TestAccMacie2_serial/ClassificationJob/bucket_criteria
=== RUN   TestAccMacie2_serial/ClassificationJob/basic
=== RUN   TestAccMacie2_serial/ClassificationJob/name_generated
=== RUN   TestAccMacie2_serial/CustomDataIdentifier
=== RUN   TestAccMacie2_serial/CustomDataIdentifier/tags
=== RUN   TestAccMacie2_serial/CustomDataIdentifier/basic
=== RUN   TestAccMacie2_serial/CustomDataIdentifier/name_generated
=== RUN   TestAccMacie2_serial/CustomDataIdentifier/disappears
=== RUN   TestAccMacie2_serial/CustomDataIdentifier/name_prefix
=== RUN   TestAccMacie2_serial/CustomDataIdentifier/classification_job
=== RUN   TestAccMacie2_serial/FindingsFilter
=== RUN   TestAccMacie2_serial/FindingsFilter/date
=== RUN   TestAccMacie2_serial/FindingsFilter/number
=== RUN   TestAccMacie2_serial/FindingsFilter/tags
=== RUN   TestAccMacie2_serial/FindingsFilter/basic
=== RUN   TestAccMacie2_serial/FindingsFilter/name_generated
=== RUN   TestAccMacie2_serial/FindingsFilter/name_prefix
=== RUN   TestAccMacie2_serial/FindingsFilter/disappears
=== RUN   TestAccMacie2_serial/FindingsFilter/complete
=== RUN   TestAccMacie2_serial/OrganizationAdminAccount
=== RUN   TestAccMacie2_serial/OrganizationAdminAccount/basic
    organization_admin_account_test.go:27: skipping tests; this AWS account must not be an existing member of an AWS Organization
=== RUN   TestAccMacie2_serial/OrganizationAdminAccount/disappears
    organization_admin_account_test.go:56: skipping tests; this AWS account must not be an existing member of an AWS Organization
=== RUN   TestAccMacie2_serial/Member
=== RUN   TestAccMacie2_serial/Member/invitation_disable_email_notification
    member_test.go:101: skipping test; environment variable AWS_MACIE2_ALTERNATE_ACCOUNT_EMAIL must be set. Usage: Environment variable AWS_MACIE2_ALTERNATE_ACCOUNT_EMAIL is not set. To properly test inviting Macie member account must be provided.
=== RUN   TestAccMacie2_serial/Member/invite
    member_test.go:143: skipping test; environment variable AWS_MACIE2_ALTERNATE_ACCOUNT_EMAIL must be set. Usage: Environment variable AWS_MACIE2_ALTERNATE_ACCOUNT_EMAIL is not set. To properly test inviting Macie member account must be provided.
=== RUN   TestAccMacie2_serial/Member/invite_removed
    member_test.go:198: skipping test; environment variable AWS_MACIE2_ALTERNATE_ACCOUNT_EMAIL must be set. Usage: Environment variable AWS_MACIE2_ALTERNATE_ACCOUNT_EMAIL is not set. To properly test inviting Macie member account must be provided.
=== RUN   TestAccMacie2_serial/Member/status
    member_test.go:253: skipping test; environment variable AWS_MACIE2_ALTERNATE_ACCOUNT_EMAIL must be set. Usage: Environment variable AWS_MACIE2_ALTERNATE_ACCOUNT_EMAIL is not set. To properly test inviting Macie member account must be provided.
=== RUN   TestAccMacie2_serial/Member/basic
=== RUN   TestAccMacie2_serial/Member/disappears
=== RUN   TestAccMacie2_serial/Member/tags
=== RUN   TestAccMacie2_serial/InvitationAccepter
=== RUN   TestAccMacie2_serial/InvitationAccepter/basic
    invitation_accepter_test.go:26: skipping test; environment variable AWS_MACIE2_ACCOUNT_EMAIL must be set. Usage: Environment variable AWS_MACIE2_ACCOUNT_EMAIL is not set. To properly test inviting Macie member account must be provided.
--- PASS: TestAccMacie2_serial (545.02s)
    --- PASS: TestAccMacie2_serial/Account (78.11s)
        --- PASS: TestAccMacie2_serial/Account/finding_publishing_frequency (18.62s)
        --- PASS: TestAccMacie2_serial/Account/status (17.02s)
        --- PASS: TestAccMacie2_serial/Account/finding_and_status (17.81s)
        --- PASS: TestAccMacie2_serial/Account/disappears (11.58s)
        --- PASS: TestAccMacie2_serial/Account/basic (13.09s)
    --- PASS: TestAccMacie2_serial/ClassificationExportConfiguration (30.21s)
        --- PASS: TestAccMacie2_serial/ClassificationExportConfiguration/basic (30.21s)
    --- PASS: TestAccMacie2_serial/ClassificationJob (173.34s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/name_prefix (17.41s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/disappears (13.97s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/status (31.51s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/complete (27.60s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/tags (27.24s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/bucket_criteria (18.75s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/basic (17.19s)
        --- PASS: TestAccMacie2_serial/ClassificationJob/name_generated (19.68s)
    --- PASS: TestAccMacie2_serial/CustomDataIdentifier (101.16s)
        --- PASS: TestAccMacie2_serial/CustomDataIdentifier/tags (22.57s)
        --- PASS: TestAccMacie2_serial/CustomDataIdentifier/basic (12.41s)
        --- PASS: TestAccMacie2_serial/CustomDataIdentifier/name_generated (13.86s)
        --- PASS: TestAccMacie2_serial/CustomDataIdentifier/disappears (11.24s)
        --- PASS: TestAccMacie2_serial/CustomDataIdentifier/name_prefix (11.58s)
        --- PASS: TestAccMacie2_serial/CustomDataIdentifier/classification_job (29.50s)
    --- PASS: TestAccMacie2_serial/FindingsFilter (117.08s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/date (18.58s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/number (18.90s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/tags (13.03s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/basic (11.98s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/name_generated (11.21s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/name_prefix (11.11s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/disappears (9.34s)
        --- PASS: TestAccMacie2_serial/FindingsFilter/complete (22.93s)
    --- PASS: TestAccMacie2_serial/OrganizationAdminAccount (0.31s)
        --- SKIP: TestAccMacie2_serial/OrganizationAdminAccount/basic (0.21s)
        --- SKIP: TestAccMacie2_serial/OrganizationAdminAccount/disappears (0.11s)
    --- PASS: TestAccMacie2_serial/Member (44.80s)
        --- SKIP: TestAccMacie2_serial/Member/invitation_disable_email_notification (0.00s)
        --- SKIP: TestAccMacie2_serial/Member/invite (0.00s)
        --- SKIP: TestAccMacie2_serial/Member/invite_removed (0.00s)
        --- SKIP: TestAccMacie2_serial/Member/status (0.00s)
        --- PASS: TestAccMacie2_serial/Member/basic (16.01s)
        --- PASS: TestAccMacie2_serial/Member/disappears (14.41s)
        --- PASS: TestAccMacie2_serial/Member/tags (16.43s)
    --- PASS: TestAccMacie2_serial/InvitationAccepter (0.00s)
        --- SKIP: TestAccMacie2_serial/InvitationAccepter/basic (0.00s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/macie2	549.827s

ewbankkit · 2024-08-21T18:41:05Z

@theipster Thanks for the contribution 🎉 👏.

github-actions · 2024-08-22T20:39:59Z

This functionality has been released in v5.64.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 · 2024-10-05T02:20:16Z

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.

Alan Ip added 6 commits June 15, 2024 14:37

Re-generate Service Client

dda6ad8

See docs/aws-go-sdk-migrations.md.

Add an EndpointID Constant

46653be

Patch Generation

73d37a0

Run `PKG=macie2 make awssdkpatch-apply`

Imports

e155823

Generate tagging functions

cbcd908

WithContext functions

b312b80

terraform-aws-provider bot added the needs-triage Waiting for first response or review from a maintainer. label Jun 16, 2024

theipster force-pushed the macie-sdk-v2 branch from a648faf to 546d174 Compare June 17, 2024 01:54

Alan Ip added 6 commits June 17, 2024 02:05

Input enums

d3ab138

Acc test attribute checks

4261b3d

Replace ValidateFunc with ValidateDiagFunc

31841fc

Paginators

a6e100f

Various fixes

f424800

Reinstate all tests

acbc5eb

theipster force-pushed the macie-sdk-v2 branch from 546d174 to acbc5eb Compare June 17, 2024 02:14

Fix lint

22de672

theipster force-pushed the macie-sdk-v2 branch from d4751ae to 22de672 Compare June 17, 2024 03:21

Fix existing bug

2305ee4

theipster marked this pull request as ready for review June 17, 2024 04:26

theipster requested a review from a team as a code owner June 17, 2024 04:26

ewbankkit added the aws-sdk-go-migration Issues that are related to the providers migration to AWS SDK for Go v2. label Jun 21, 2024

justinretzolk removed the needs-triage Waiting for first response or review from a maintainer. label Jun 26, 2024

Merge branch 'main' into HEAD

3c402c3

# Conflicts: # go.mod # go.sum # internal/conns/awsclient_gen.go # internal/service/macie2/service_endpoints_gen_test.go # internal/service/macie2/service_package_gen.go # names/data/names_data.csv # names/names.go # tools/awssdkpatch/patch.tmpl

ewbankkit self-assigned this Aug 21, 2024

github-actions bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Aug 21, 2024

ewbankkit added 3 commits August 21, 2024 13:03

macie2: Reduce visibility.

0645281

macie2: Fix acceptance tests.

4f27f81

r/aws_macie2_member: Fix membership-not-found error handling.

8526080

ewbankkit approved these changes Aug 21, 2024

View reviewed changes

ewbankkit merged commit 2d83506 into hashicorp:main Aug 21, 2024
38 of 39 checks passed

github-actions bot added this to the v5.64.0 milestone Aug 21, 2024

github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Aug 22, 2024

theipster deleted the macie-sdk-v2 branch September 2, 2024 18:47

github-actions bot locked as resolved and limited conversation to collaborators Oct 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate `macie2` service to AWS SDK for Go v2 #37999

Migrate `macie2` service to AWS SDK for Go v2 #37999

theipster commented Jun 16, 2024 •

edited

Loading

github-actions bot commented Jun 16, 2024

github-actions bot commented Jun 16, 2024

theipster commented Jun 17, 2024 •

edited

Loading

ewbankkit left a comment

ewbankkit commented Aug 21, 2024

github-actions bot commented Aug 22, 2024

github-actions bot commented Oct 5, 2024

Migrate macie2 service to AWS SDK for Go v2 #37999

Migrate macie2 service to AWS SDK for Go v2 #37999

Conversation

theipster commented Jun 16, 2024 • edited Loading

Description

Relations

References

Output from Acceptance Testing

github-actions bot commented Jun 16, 2024

Community Note

github-actions bot commented Jun 16, 2024

theipster commented Jun 17, 2024 • edited Loading

ewbankkit left a comment

Choose a reason for hiding this comment

ewbankkit commented Aug 21, 2024

github-actions bot commented Aug 22, 2024

github-actions bot commented Oct 5, 2024

Migrate `macie2` service to AWS SDK for Go v2 #37999

Migrate `macie2` service to AWS SDK for Go v2 #37999

theipster commented Jun 16, 2024 •

edited

Loading

theipster commented Jun 17, 2024 •

edited

Loading