This reverts commit 041e73c.

…2 && go mod tidy'.

… v2.

… v2.

…Go v2.

# Conflicts:
#	go.mod
#	go.sum

% make testacc TESTARGS='-run=TestAccCloudHSMV2_serial/Cluster/basic' PKG=cloudhsmv2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/cloudhsmv2/... -v -count 1 -parallel 20  -run=TestAccCloudHSMV2_serial/Cluster/basic -timeout 360m
=== RUN   TestAccCloudHSMV2_serial
=== PAUSE TestAccCloudHSMV2_serial
=== CONT  TestAccCloudHSMV2_serial
=== RUN   TestAccCloudHSMV2_serial/Cluster
=== RUN   TestAccCloudHSMV2_serial/Cluster/basic
--- PASS: TestAccCloudHSMV2_serial (200.15s)
    --- PASS: TestAccCloudHSMV2_serial/Cluster (200.15s)
        --- PASS: TestAccCloudHSMV2_serial/Cluster/basic (200.15s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/cloudhsmv2	211.122s

…ecorderException' error when stopping Configuration Recorder.

…rror when deleting Delivery Channel.

…deleting Config Rule.

…n' sweepers.

…rationException' error when deleting Remediation Configuration.

… to hashicorp#31656).

…g Rules.

… part of 'TestAccConfigService_serial'.

…rganization Config Rule.

# Conflicts:
#	go.mod
#	go.sum

% make testacc TESTARGS='-run=TestAccConfigService_serial/^ConfigRule$$/basic' PKG=configservice
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/configservice/... -v -count 1 -parallel 20  -run=TestAccConfigService_serial/^ConfigRule$/basic -timeout 360m
=== RUN   TestAccConfigService_serial
=== PAUSE TestAccConfigService_serial
=== CONT  TestAccConfigService_serial
=== RUN   TestAccConfigService_serial/ConfigRule
=== RUN   TestAccConfigService_serial/ConfigRule/basic
--- PASS: TestAccConfigService_serial (97.53s)
    --- PASS: TestAccConfigService_serial/ConfigRule (97.53s)
        --- PASS: TestAccConfigService_serial/ConfigRule/basic (97.53s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/configservice	108.514s

% make testacc TESTARGS='-run=TestAccConfigServiceAggregateAuthorization_' PKG=configservice ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/configservice/... -v -count 1 -parallel 2  -run=TestAccConfigServiceAggregateAuthorization_ -timeout 360m
=== RUN   TestAccConfigServiceAggregateAuthorization_basic
=== PAUSE TestAccConfigServiceAggregateAuthorization_basic
=== RUN   TestAccConfigServiceAggregateAuthorization_disappears
=== PAUSE TestAccConfigServiceAggregateAuthorization_disappears
=== RUN   TestAccConfigServiceAggregateAuthorization_tags
=== PAUSE TestAccConfigServiceAggregateAuthorization_tags
=== CONT  TestAccConfigServiceAggregateAuthorization_basic
=== CONT  TestAccConfigServiceAggregateAuthorization_tags
--- PASS: TestAccConfigServiceAggregateAuthorization_basic (22.53s)
=== CONT  TestAccConfigServiceAggregateAuthorization_disappears
--- PASS: TestAccConfigServiceAggregateAuthorization_disappears (16.91s)
--- PASS: TestAccConfigServiceAggregateAuthorization_tags (47.46s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/configservice	59.457s

% make testacc TESTARGS='-run=TestAccConfigService_serial/RemediationConfiguration/disappears' PKG=configservice
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/configservice/... -v -count 1 -parallel 20  -run=TestAccConfigService_serial/RemediationConfiguration/disappears -timeout 360m
=== RUN   TestAccConfigService_serial
=== PAUSE TestAccConfigService_serial
=== CONT  TestAccConfigService_serial
=== RUN   TestAccConfigService_serial/RemediationConfiguration
=== RUN   TestAccConfigService_serial/RemediationConfiguration/disappears
--- PASS: TestAccConfigService_serial (100.07s)
    --- PASS: TestAccConfigService_serial/RemediationConfiguration (100.06s)
        --- PASS: TestAccConfigService_serial/RemediationConfiguration/disappears (100.06s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/configservice	111.860s

… required when Owner is CUSTOM_POLICY` errors on resource Update.

% make testacc TESTARGS='-run=TestAccConfigService_serial/ConfigRule' PKG=configservice
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/configservice/... -v -count 1 -parallel 20  -run=TestAccConfigService_serial/ConfigRule -timeout 360m
=== RUN   TestAccConfigService_serial
=== PAUSE TestAccConfigService_serial
=== CONT  TestAccConfigService_serial
=== RUN   TestAccConfigService_serial/ConfigRule
=== RUN   TestAccConfigService_serial/ConfigRule/basic
=== RUN   TestAccConfigService_serial/ConfigRule/disappears
=== RUN   TestAccConfigService_serial/ConfigRule/evaluationMode
=== RUN   TestAccConfigService_serial/ConfigRule/scopeTagKey
=== RUN   TestAccConfigService_serial/ConfigRule/scopeTagKeyEmpty
=== RUN   TestAccConfigService_serial/ConfigRule/scopeTagValue
=== RUN   TestAccConfigService_serial/ConfigRule/tags
=== RUN   TestAccConfigService_serial/ConfigRule/ownerAws
=== RUN   TestAccConfigService_serial/ConfigRule/customlambda
=== RUN   TestAccConfigService_serial/ConfigRule/customPolicy
--- PASS: TestAccConfigService_serial (1055.80s)
    --- PASS: TestAccConfigService_serial/ConfigRule (1055.79s)
        --- PASS: TestAccConfigService_serial/ConfigRule/basic (97.99s)
        --- PASS: TestAccConfigService_serial/ConfigRule/disappears (97.10s)
        --- PASS: TestAccConfigService_serial/ConfigRule/evaluationMode (108.91s)
        --- PASS: TestAccConfigService_serial/ConfigRule/scopeTagKey (109.03s)
        --- PASS: TestAccConfigService_serial/ConfigRule/scopeTagKeyEmpty (96.78s)
        --- PASS: TestAccConfigService_serial/ConfigRule/scopeTagValue (108.59s)
        --- PASS: TestAccConfigService_serial/ConfigRule/tags (125.16s)
        --- PASS: TestAccConfigService_serial/ConfigRule/ownerAws (100.72s)
        --- PASS: TestAccConfigService_serial/ConfigRule/customlambda (126.20s)
        --- PASS: TestAccConfigService_serial/ConfigRule/customPolicy (114.57s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/configservice	1067.334s

…ionAggregator' if only 'tags' change.

% make testacc TESTARGS='-run=TestAccConfigServiceConfigurationAggregator_' PKG=configservice ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/configservice/... -v -count 1 -parallel 2  -run=TestAccConfigServiceConfigurationAggregator_ -timeout 360m
=== RUN   TestAccConfigServiceConfigurationAggregator_account
=== PAUSE TestAccConfigServiceConfigurationAggregator_account
=== RUN   TestAccConfigServiceConfigurationAggregator_organization
    configuration_aggregator_test.go:66: skipping tests; this AWS account must not be an existing member of an AWS Organization
--- SKIP: TestAccConfigServiceConfigurationAggregator_organization (0.61s)
=== RUN   TestAccConfigServiceConfigurationAggregator_switch
    configuration_aggregator_test.go:96: skipping tests; this AWS account must not be an existing member of an AWS Organization
--- SKIP: TestAccConfigServiceConfigurationAggregator_switch (0.12s)
=== RUN   TestAccConfigServiceConfigurationAggregator_tags
=== PAUSE TestAccConfigServiceConfigurationAggregator_tags
=== RUN   TestAccConfigServiceConfigurationAggregator_disappears
=== PAUSE TestAccConfigServiceConfigurationAggregator_disappears
=== CONT  TestAccConfigServiceConfigurationAggregator_account
=== CONT  TestAccConfigServiceConfigurationAggregator_disappears
--- PASS: TestAccConfigServiceConfigurationAggregator_disappears (17.13s)
=== CONT  TestAccConfigServiceConfigurationAggregator_tags
--- PASS: TestAccConfigServiceConfigurationAggregator_account (20.29s)
--- PASS: TestAccConfigServiceConfigurationAggregator_tags (41.72s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/configservice	70.217s