account: enable go-vcr support (#44700)

* account: enable `go-vcr` support

Enables `go-vcr` for the `account` service.

```console
% make testacc PKG=account VCR_MODE=RECORD_ONLY VCR_PATH=/tmp/account-vcr-testdata/
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-go-vcr-account 🌿...
TF_ACC=1 go1.24.8 test ./internal/service/account/... -v -count 1 -parallel 20   -timeout 360m -vet=off
2025/10/17 16:23:38 Creating Terraform AWS Provider (SDKv2-style)...
2025/10/17 16:23:38 Initializing Terraform AWS Provider (SDKv2-style)...

=== RUN   TestAccAccount_serial/Region/AccountID
    region_test.go:69: skipping test because at least one environment variable of [AWS_ALTERNATE_PROFILE AWS_ALTERNATE_ACCESS_KEY_ID] must be set. Usage: credentials for running acceptance testing in alternate AWS account.
    panic.go:636: provider meta not found for test TestAccAccount_serial/Region/AccountID
    panic.go:636: randomness source not found for test TestAccAccount_serial/Region/AccountID
=== RUN   TestAccAccount_serial/Region/basic
    region_test.go:24: Step 1/3 error: Error running apply: exit status 1

        Error: enabling Account Region (ap-southeast-3): operation error Account: EnableRegion, https response error StatusCode: 403, RequestID: 8bfd32c6-d078-49af-bb46-04238374fea1, AccessDeniedException: User: arn:aws:sts::<redacted>:assumed-role/<redacted> is not authorized to perform: account:EnableRegion on resource: arn:aws:account::<redacted>:account with an explicit deny in a service control policy

          with aws_account_region.test,
          on terraform_plugin_test.tf line 12, in resource "aws_account_region" "test":
          12: resource "aws_account_region" "test" {

    panic.go:636: randomness source not found for test TestAccAccount_serial/Region/basic
--- FAIL: TestAccAccount_serial (59.65s)
    --- PASS: TestAccAccount_serial/AlternateContact (29.70s)
        --- PASS: TestAccAccount_serial/AlternateContact/basic (19.58s)
        --- PASS: TestAccAccount_serial/AlternateContact/disappears (10.12s)
        --- SKIP: TestAccAccount_serial/AlternateContact/AccountID (0.00s)
    --- PASS: TestAccAccount_serial/PrimaryContact (26.36s)
        --- PASS: TestAccAccount_serial/PrimaryContact/basic (17.61s)
        --- PASS: TestAccAccount_serial/PrimaryContact/dataSourceBasic (8.75s)
        --- SKIP: TestAccAccount_serial/PrimaryContact/dataSourceAccountID (0.00s)
    --- FAIL: TestAccAccount_serial/Region (3.60s)
        --- SKIP: TestAccAccount_serial/Region/AccountID (0.00s)
        --- FAIL: TestAccAccount_serial/Region/basic (3.60s)
FAIL
FAIL	github.com/hashicorp/terraform-provider-aws/internal/service/account	66.853s
```

* docs: tweak go-vcr agent guide

Author: jar-b

docs/ai-agent-guides/go-vcr-migration.md

@@ -11,5 +11,7 @@ Follow the steps below to enable support for a single service.
 ```console
 % make testacc PKG=polly VCR_MODE=REPLAY_ONLY VCR_PATH=/tmp/polly-vcr-testdata/
 
+Enables `go-vcr` for the `<service-name>` service.
+
 <-- full results here -->
 ```

internal/service/account/alternate_contact.go

@@ -15,7 +15,6 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/account"
 	"github.com/aws/aws-sdk-go-v2/service/account/types"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	sdkretry "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
@@ -133,7 +132,7 @@ func resourceAlternateContactRead(ctx context.Context, d *schema.ResourceData, m
 
 	output, err := findAlternateContactByTwoPartKey(ctx, conn, accountID, contactType)
 
-	if !d.IsNewResource() && tfresource.NotFound(err) {
+	if !d.IsNewResource() && retry.NotFound(err) {
 		log.Printf("[WARN] Account Alternate Contact (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return diags
@@ -247,9 +246,8 @@ func findAlternateContactByTwoPartKey(ctx context.Context, conn *account.Client,
 	output, err := conn.GetAlternateContact(ctx, &input)
 
 	if errs.IsA[*types.ResourceNotFoundException](err) {
-		return nil, &sdkretry.NotFoundError{
-			LastError:   err,
-			LastRequest: input,
+		return nil, &retry.NotFoundError{
+			LastError: err,
 		}
 	}
 

internal/service/account/alternate_contact_test.go

@@ -9,13 +9,11 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go-v2/service/account/types"
-	sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
-	"github.com/hashicorp/terraform-provider-aws/internal/conns"
+	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	tfaccount "github.com/hashicorp/terraform-provider-aws/internal/service/account"
-	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
@@ -25,19 +23,19 @@ func testAccAlternateContact_basic(t *testing.T) {
 	domain := acctest.RandomDomainName()
 	emailAddress1 := acctest.RandomEmailAddress(domain)
 	emailAddress2 := acctest.RandomEmailAddress(domain)
-	rName1 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
-	rName2 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+	rName1 := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
+	rName2 := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
 
-	resource.Test(t, resource.TestCase{
+	acctest.Test(ctx, t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) },
 		ErrorCheck:               acctest.ErrorCheck(t, names.AccountServiceID),
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
-		CheckDestroy:             testAccCheckAlternateContactDestroy(ctx),
+		CheckDestroy:             testAccCheckAlternateContactDestroy(ctx, t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccAlternateContactConfig_basic(rName1, emailAddress1),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckAlternateContactExists(ctx, resourceName),
+					testAccCheckAlternateContactExists(ctx, t, resourceName),
 					resource.TestCheckResourceAttr(resourceName, names.AttrAccountID, ""),
 					resource.TestCheckResourceAttr(resourceName, "alternate_contact_type", "OPERATIONS"),
 					resource.TestCheckResourceAttr(resourceName, "email_address", emailAddress1),
@@ -54,7 +52,7 @@ func testAccAlternateContact_basic(t *testing.T) {
 			{
 				Config: testAccAlternateContactConfig_basic(rName2, emailAddress2),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckAlternateContactExists(ctx, resourceName),
+					testAccCheckAlternateContactExists(ctx, t, resourceName),
 					resource.TestCheckResourceAttr(resourceName, names.AttrAccountID, ""),
 					resource.TestCheckResourceAttr(resourceName, "alternate_contact_type", "OPERATIONS"),
 					resource.TestCheckResourceAttr(resourceName, "email_address", emailAddress2),
@@ -72,18 +70,18 @@ func testAccAlternateContact_disappears(t *testing.T) {
 	resourceName := "aws_account_alternate_contact.test"
 	domain := acctest.RandomDomainName()
 	emailAddress := acctest.RandomEmailAddress(domain)
-	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+	rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
 
-	resource.Test(t, resource.TestCase{
+	acctest.Test(ctx, t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) },
 		ErrorCheck:               acctest.ErrorCheck(t, names.AccountServiceID),
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
-		CheckDestroy:             testAccCheckAlternateContactDestroy(ctx),
+		CheckDestroy:             testAccCheckAlternateContactDestroy(ctx, t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccAlternateContactConfig_basic(rName, emailAddress),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckAlternateContactExists(ctx, resourceName),
+					testAccCheckAlternateContactExists(ctx, t, resourceName),
 					acctest.CheckResourceDisappears(ctx, acctest.Provider, tfaccount.ResourceAlternateContact(), resourceName),
 				),
 				ExpectNonEmptyPlan: true,
@@ -98,10 +96,10 @@ func testAccAlternateContact_accountID(t *testing.T) { // nosemgrep:ci.account-i
 	domain := acctest.RandomDomainName()
 	emailAddress1 := acctest.RandomEmailAddress(domain)
 	emailAddress2 := acctest.RandomEmailAddress(domain)
-	rName1 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
-	rName2 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+	rName1 := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
+	rName2 := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
 
-	resource.Test(t, resource.TestCase{
+	acctest.Test(ctx, t, resource.TestCase{
 		PreCheck: func() {
 			acctest.PreCheck(ctx, t)
 			acctest.PreCheckAlternateAccount(t)
@@ -110,12 +108,12 @@ func testAccAlternateContact_accountID(t *testing.T) { // nosemgrep:ci.account-i
 		},
 		ErrorCheck:               acctest.ErrorCheck(t, names.AccountServiceID),
 		ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t),
-		CheckDestroy:             testAccCheckAlternateContactDestroy(ctx),
+		CheckDestroy:             testAccCheckAlternateContactDestroy(ctx, t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccAlternateContactConfig_organization(rName1, emailAddress1),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckAlternateContactExists(ctx, resourceName),
+					testAccCheckAlternateContactExists(ctx, t, resourceName),
 					resource.TestCheckResourceAttrSet(resourceName, names.AttrAccountID),
 					resource.TestCheckResourceAttr(resourceName, "alternate_contact_type", "OPERATIONS"),
 					resource.TestCheckResourceAttr(resourceName, "email_address", emailAddress1),
@@ -132,7 +130,7 @@ func testAccAlternateContact_accountID(t *testing.T) { // nosemgrep:ci.account-i
 			{
 				Config: testAccAlternateContactConfig_organization(rName2, emailAddress2),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckAlternateContactExists(ctx, resourceName),
+					testAccCheckAlternateContactExists(ctx, t, resourceName),
 					resource.TestCheckResourceAttrSet(resourceName, names.AttrAccountID),
 					resource.TestCheckResourceAttr(resourceName, "alternate_contact_type", "OPERATIONS"),
 					resource.TestCheckResourceAttr(resourceName, "email_address", emailAddress2),
@@ -145,9 +143,9 @@ func testAccAlternateContact_accountID(t *testing.T) { // nosemgrep:ci.account-i
 	})
 }
 
-func testAccCheckAlternateContactDestroy(ctx context.Context) resource.TestCheckFunc {
+func testAccCheckAlternateContactDestroy(ctx context.Context, t *testing.T) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		conn := acctest.Provider.Meta().(*conns.AWSClient).AccountClient(ctx)
+		conn := acctest.ProviderMeta(ctx, t).AccountClient(ctx)
 
 		for _, rs := range s.RootModule().Resources {
 			if rs.Type != "aws_account_alternate_contact" {
@@ -162,7 +160,7 @@ func testAccCheckAlternateContactDestroy(ctx context.Context) resource.TestCheck
 
 			_, err = tfaccount.FindAlternateContactByTwoPartKey(ctx, conn, accountID, contactType)
 
-			if tfresource.NotFound(err) {
+			if retry.NotFound(err) {
 				continue
 			}
 
@@ -177,7 +175,7 @@ func testAccCheckAlternateContactDestroy(ctx context.Context) resource.TestCheck
 	}
 }
 
-func testAccCheckAlternateContactExists(ctx context.Context, n string) resource.TestCheckFunc {
+func testAccCheckAlternateContactExists(ctx context.Context, t *testing.T, n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
 		if !ok {
@@ -194,7 +192,7 @@ func testAccCheckAlternateContactExists(ctx context.Context, n string) resource.
 			return err
 		}
 
-		conn := acctest.Provider.Meta().(*conns.AWSClient).AccountClient(ctx)
+		conn := acctest.ProviderMeta(ctx, t).AccountClient(ctx)
 
 		_, err = tfaccount.FindAlternateContactByTwoPartKey(ctx, conn, accountID, contactType)
 
@@ -234,15 +232,15 @@ resource "aws_account_alternate_contact" "test" {
 }
 
 func testAccPreCheck(ctx context.Context, t *testing.T) {
-	conn := acctest.Provider.Meta().(*conns.AWSClient).AccountClient(ctx)
+	conn := acctest.ProviderMeta(ctx, t).AccountClient(ctx)
 
 	_, err := tfaccount.FindAlternateContactByTwoPartKey(ctx, conn, "", string(types.AlternateContactTypeOperations))
 
 	if acctest.PreCheckSkipError(err) {
 		t.Skipf("skipping acceptance testing: %s", err)
 	}
 
-	if err != nil && !tfresource.NotFound(err) {
+	if err != nil && !retry.NotFound(err) {
 		t.Fatalf("unexpected PreCheck error: %s", err)
 	}
 }

internal/service/account/primary_contact.go

@@ -12,12 +12,12 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/account"
 	"github.com/aws/aws-sdk-go-v2/service/account/types"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
+	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
 	"github.com/hashicorp/terraform-provider-aws/names"
@@ -163,7 +163,7 @@ func resourcePrimaryContactRead(ctx context.Context, d *schema.ResourceData, met
 
 	contactInformation, err := findContactInformation(ctx, conn, d.Get(names.AttrAccountID).(string))
 
-	if !d.IsNewResource() && tfresource.NotFound(err) {
+	if !d.IsNewResource() && retry.NotFound(err) {
 		log.Printf("[WARN] Account Primary Contact (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return diags
@@ -200,8 +200,7 @@ func findContactInformation(ctx context.Context, conn *account.Client, accountID
 
 	if errs.IsA[*types.ResourceNotFoundException](err) {
 		return nil, &retry.NotFoundError{
-			LastError:   err,
-			LastRequest: input,
+			LastError: err,
 		}
 	}
 

internal/service/account/primary_contact_data_source_test.go

@@ -16,7 +16,7 @@ func testAccPrimaryContactDataSource_basic(t *testing.T) {
 	resourceName := "aws_account_primary_contact.test"
 	dataSourceName := "data.aws_account_primary_contact.test"
 
-	resource.Test(t, resource.TestCase{
+	acctest.Test(ctx, t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(ctx, t) },
 		ErrorCheck:               acctest.ErrorCheck(t, names.AccountServiceID),
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -48,7 +48,7 @@ func testAccPrimaryContactDataSource_accountID(t *testing.T) {
 	resourceName := "aws_account_primary_contact.test"
 	dataSourceName := "data.aws_account_primary_contact.test"
 
-	resource.Test(t, resource.TestCase{
+	acctest.Test(ctx, t, resource.TestCase{
 		PreCheck: func() {
 			acctest.PreCheck(ctx, t)
 			acctest.PreCheckAlternateAccount(t)

internal/service/account/primary_contact_test.go

@@ -8,22 +8,20 @@ import (
 	"fmt"
 	"testing"
 
-	sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
-	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	tfaccount "github.com/hashicorp/terraform-provider-aws/internal/service/account"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
 func testAccPrimaryContact_basic(t *testing.T) {
 	ctx := acctest.Context(t)
 	resourceName := "aws_account_primary_contact.test"
-	rName1 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
-	rName2 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+	rName1 := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
+	rName2 := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
 
-	resource.Test(t, resource.TestCase{
+	acctest.Test(ctx, t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) },
 		ErrorCheck:               acctest.ErrorCheck(t, names.AccountServiceID),
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -32,7 +30,7 @@ func testAccPrimaryContact_basic(t *testing.T) {
 			{
 				Config: testAccPrimaryConfig_basic(rName1),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckPrimaryContactExists(ctx, resourceName),
+					testAccCheckPrimaryContactExists(ctx, t, resourceName),
 					resource.TestCheckResourceAttr(resourceName, names.AttrAccountID, ""),
 					resource.TestCheckResourceAttr(resourceName, "address_line_1", "123 Any Street"),
 					resource.TestCheckResourceAttr(resourceName, "city", "Seattle"),
@@ -54,7 +52,7 @@ func testAccPrimaryContact_basic(t *testing.T) {
 			{
 				Config: testAccPrimaryConfig_basic(rName2),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckPrimaryContactExists(ctx, resourceName),
+					testAccCheckPrimaryContactExists(ctx, t, resourceName),
 					resource.TestCheckResourceAttr(resourceName, names.AttrAccountID, ""),
 					resource.TestCheckResourceAttr(resourceName, "address_line_1", "123 Any Street"),
 					resource.TestCheckResourceAttr(resourceName, "city", "Seattle"),
@@ -72,7 +70,7 @@ func testAccPrimaryContact_basic(t *testing.T) {
 	})
 }
 
-func testAccCheckPrimaryContactExists(ctx context.Context, n string) resource.TestCheckFunc {
+func testAccCheckPrimaryContactExists(ctx context.Context, t *testing.T, n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
 		if !ok {
@@ -83,7 +81,7 @@ func testAccCheckPrimaryContactExists(ctx context.Context, n string) resource.Te
 			return fmt.Errorf("No Account Primary Contact ID is set")
 		}
 
-		conn := acctest.Provider.Meta().(*conns.AWSClient).AccountClient(ctx)
+		conn := acctest.ProviderMeta(ctx, t).AccountClient(ctx)
 
 		_, err := tfaccount.FindContactInformation(ctx, conn, rs.Primary.Attributes[names.AttrAccountID])
 

internal/service/account/region.go

@@ -12,12 +12,12 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/account"
 	"github.com/aws/aws-sdk-go-v2/service/account/types"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/enum"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
 	"github.com/hashicorp/terraform-provider-aws/internal/flex"
+	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
 	"github.com/hashicorp/terraform-provider-aws/names"
@@ -193,11 +193,11 @@ func findRegionOptStatus(ctx context.Context, conn *account.Client, accountID, r
 	return output, nil
 }
 
-func statusRegionOptStatus(ctx context.Context, conn *account.Client, accountID, region string) retry.StateRefreshFunc {
-	return func() (any, string, error) {
+func statusRegionOptStatus(conn *account.Client, accountID, region string) retry.StateRefreshFunc {
+	return func(ctx context.Context) (any, string, error) {
 		output, err := findRegionOptStatus(ctx, conn, accountID, region)
 
-		if tfresource.NotFound(err) {
+		if retry.NotFound(err) {
 			return nil, "", nil
 		}
 
@@ -213,7 +213,7 @@ func waitRegionEnabled(ctx context.Context, conn *account.Client, accountID, reg
 	stateConf := &retry.StateChangeConf{
 		Pending:      enum.Slice(types.RegionOptStatusEnabling),
 		Target:       enum.Slice(types.RegionOptStatusEnabled),
-		Refresh:      statusRegionOptStatus(ctx, conn, accountID, region),
+		Refresh:      statusRegionOptStatus(conn, accountID, region),
 		Timeout:      timeout,
 		PollInterval: 30 * time.Second,
 	}
@@ -231,7 +231,7 @@ func waitRegionDisabled(ctx context.Context, conn *account.Client, accountID, re
 	stateConf := &retry.StateChangeConf{
 		Pending:      enum.Slice(types.RegionOptStatusDisabling),
 		Target:       enum.Slice(types.RegionOptStatusDisabled),
-		Refresh:      statusRegionOptStatus(ctx, conn, accountID, region),
+		Refresh:      statusRegionOptStatus(conn, accountID, region),
 		Timeout:      timeout,
 		PollInterval: 30 * time.Second,
 	}

internal/service/account/region_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/hashicorp/aws-sdk-go-base/v2/endpoints"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
-	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	tfaccount "github.com/hashicorp/terraform-provider-aws/internal/service/account"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
@@ -22,7 +21,7 @@ func testAccRegion_basic(t *testing.T) {
 	resourceName := "aws_account_region.test"
 	regionName := endpoints.ApSoutheast3RegionID
 
-	resource.Test(t, resource.TestCase{
+	acctest.Test(ctx, t, resource.TestCase{
 		PreCheck: func() {
 			acctest.PreCheck(ctx, t)
 			testAccPreCheckRegionDisabled(ctx, t, regionName)
@@ -64,7 +63,7 @@ func testAccRegion_accountID(t *testing.T) { // nosemgrep:ci.account-in-func-nam
 	resourceName := "aws_account_region.test"
 	regionName := endpoints.ApSoutheast3RegionID
 
-	resource.Test(t, resource.TestCase{
+	acctest.Test(ctx, t, resource.TestCase{
 		PreCheck: func() {
 			acctest.PreCheck(ctx, t)
 			acctest.PreCheckAlternateAccount(t)
@@ -105,7 +104,7 @@ func testAccRegion_accountID(t *testing.T) { // nosemgrep:ci.account-in-func-nam
 func testAccPreCheckRegionDisabled(ctx context.Context, t *testing.T, region string) {
 	t.Helper()
 
-	conn := acctest.Provider.Meta().(*conns.AWSClient).AccountClient(ctx)
+	conn := acctest.ProviderMeta(ctx, t).AccountClient(ctx)
 
 	output, err := tfaccount.FindRegionOptStatus(ctx, conn, "", region)