Merge pull request #29613 from hashicorp/t-fix-acceptance-tests

Acceptance tests fixes

.changelog/29613.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_acmpca_certificate_authority: `revocation_configuration.crl_configuration.expiration_in_days` is Optional
+```

internal/provider/provider.go

@@ -18,7 +18,6 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/experimental/nullable"
 	"github.com/hashicorp/terraform-provider-aws/internal/flex"
 	"github.com/hashicorp/terraform-provider-aws/internal/service/accessanalyzer"
-	"github.com/hashicorp/terraform-provider-aws/internal/service/account"
 	"github.com/hashicorp/terraform-provider-aws/internal/service/acm"
 	"github.com/hashicorp/terraform-provider-aws/internal/service/acmpca"
 	"github.com/hashicorp/terraform-provider-aws/internal/service/amp"
@@ -935,8 +934,6 @@ func New(ctx context.Context) (*schema.Provider, error) {
 			"aws_accessanalyzer_analyzer":     accessanalyzer.ResourceAnalyzer(),
 			"aws_accessanalyzer_archive_rule": accessanalyzer.ResourceArchiveRule(),
 
-			"aws_account_alternate_contact": account.ResourceAlternateContact(),
-
 			"aws_acm_certificate":            acm.ResourceCertificate(),
 			"aws_acm_certificate_validation": acm.ResourceCertificateValidation(),
 

internal/service/account/account_test.go

@@ -0,0 +1,21 @@
+package account_test
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
+)
+
+func TestAccAccount_serial(t *testing.T) {
+	t.Parallel()
+
+	testCases := map[string]map[string]func(t *testing.T){
+		"AlternateContact": {
+			"basic":      testAccAlternateContact_basic,
+			"disappears": testAccAlternateContact_disappears,
+			"AccountID":  testAccAlternateContact_accountID,
+		},
+	}
+
+	acctest.RunSerialTests2Levels(t, testCases, 0)
+}

internal/service/account/alternate_contact.go

@@ -18,6 +18,7 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
 )
 
+// @SDKResource("aws_account_alternate_contact")
 func ResourceAlternateContact() *schema.Resource {
 	return &schema.Resource{
 		CreateWithoutTimeout: resourceAlternateContactCreate,

internal/service/account/alternate_contact_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 )
 
-func TestAccAccountAlternateContact_basic(t *testing.T) {
+func testAccAlternateContact_basic(t *testing.T) {
 	ctx := acctest.Context(t)
 	resourceName := "aws_account_alternate_contact.test"
 	domain := acctest.RandomDomainName()
@@ -63,7 +63,7 @@ func TestAccAccountAlternateContact_basic(t *testing.T) {
 	})
 }
 
-func TestAccAccountAlternateContact_disappears(t *testing.T) {
+func testAccAlternateContact_disappears(t *testing.T) {
 	ctx := acctest.Context(t)
 	resourceName := "aws_account_alternate_contact.test"
 	domain := acctest.RandomDomainName()
@@ -88,7 +88,7 @@ func TestAccAccountAlternateContact_disappears(t *testing.T) {
 	})
 }
 
-func TestAccAccountAlternateContact_accountID(t *testing.T) {
+func testAccAlternateContact_accountID(t *testing.T) { // nosemgrep:ci.account-in-func-name
 	ctx := acctest.Context(t)
 	resourceName := "aws_account_alternate_contact.test"
 	domain := acctest.RandomDomainName()