Fix reading existing organizations accounts

.changelog/24899.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_organizations_account: Fix reading account state for existing accounts
+```

internal/service/organizations/account.go

@@ -17,7 +17,6 @@ import (
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
-	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
 func ResourceAccount() *schema.Resource {
@@ -140,6 +139,7 @@ func resourceAccountCreate(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	d.SetId(aws.StringValue(output.AccountId))
+	d.Set("govcloud_id", output.GovCloudAccountId)
 
 	if v, ok := d.GetOk("parent_id"); ok {
 		oldParentAccountID, err := findParentAccountID(conn, d.Id())
@@ -196,14 +196,6 @@ func resourceAccountRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("parent_id", parentAccountID)
 	d.Set("status", account.Status)
 
-	s, err := findCreateAccountStatusByID(conn, d.Id())
-
-	if err != nil {
-		return names.Error(names.Organizations, "finding", "Create Account Status", d.Id(), err)
-	}
-
-	d.Set("govcloud_id", s.GovCloudAccountId)
-
 	tags, err := ListTags(conn, d.Id())
 
 	if err != nil {

internal/service/organizations/account_test.go

@@ -15,6 +15,19 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 )
 
+func testAccAccountImportStep(n string) resource.TestStep {
+	return resource.TestStep{
+		ResourceName:      n,
+		ImportState:       true,
+		ImportStateVerify: true,
+		ImportStateVerifyIgnore: []string{
+			"close_on_deletion",
+			"create_govcloud",
+			"govcloud_id",
+		},
+	}
+}
+
 func testAccAccount_basic(t *testing.T) {
 	key := "TEST_AWS_ORGANIZATION_ACCOUNT_EMAIL_DOMAIN"
 	orgsEmailDomain := os.Getenv(key)
@@ -48,12 +61,7 @@ func testAccAccount_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
 				),
 			},
-			{
-				ResourceName:            resourceName,
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"close_on_deletion"},
-			},
+			testAccAccountImportStep(resourceName),
 		},
 	})
 }
@@ -83,6 +91,7 @@ func testAccAccount_CloseOnDeletion(t *testing.T) {
 					testAccCheckAccountExists(resourceName, &v),
 					resource.TestCheckResourceAttrSet(resourceName, "arn"),
 					resource.TestCheckResourceAttr(resourceName, "email", email),
+					resource.TestCheckResourceAttr(resourceName, "govcloud_id", ""),
 					resource.TestCheckResourceAttrSet(resourceName, "joined_method"),
 					acctest.CheckResourceAttrRFC3339(resourceName, "joined_timestamp"),
 					resource.TestCheckResourceAttr(resourceName, "name", name),
@@ -91,12 +100,7 @@ func testAccAccount_CloseOnDeletion(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
 				),
 			},
-			{
-				ResourceName:            resourceName,
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"close_on_deletion"},
-			},
+			testAccAccountImportStep(resourceName),
 		},
 	})
 }
@@ -129,12 +133,7 @@ func testAccAccount_ParentID(t *testing.T) {
 					resource.TestCheckResourceAttrPair(resourceName, "parent_id", parentIdResourceName1, "id"),
 				),
 			},
-			{
-				ResourceName:            resourceName,
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"close_on_deletion"},
-			},
+			testAccAccountImportStep(resourceName),
 			{
 				Config: testAccAccountParentId2Config(name, email),
 				Check: resource.ComposeTestCheckFunc(
@@ -173,12 +172,7 @@ func testAccAccount_Tags(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"),
 				),
 			},
-			{
-				ResourceName:            resourceName,
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"close_on_deletion"},
-			},
+			testAccAccountImportStep(resourceName),
 			{
 				Config: testAccAccountTags2Config(name, email, "key1", "value1updated", "key2", "value2"),
 				Check: resource.ComposeTestCheckFunc(
@@ -226,6 +220,7 @@ func testAccAccount_govCloud(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "govcloud_id"),
 				),
 			},
+			testAccAccountImportStep(resourceName),
 		},
 	})
 }

internal/service/organizations/organizations_test.go

@@ -2,8 +2,22 @@ package organizations_test
 
 import (
 	"testing"
+
+	"github.com/aws/aws-sdk-go/service/organizations"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
 )
 
+func init() {
+	acctest.RegisterServiceErrorCheckFunc(organizations.EndpointsID, testAccErrorCheckSkip)
+}
+
+func testAccErrorCheckSkip(t *testing.T) resource.ErrorCheckFunc {
+	return acctest.ErrorCheckSkipMessagesContaining(t,
+		"MASTER_ACCOUNT_NOT_GOVCLOUD_ENABLED",
+	)
+}
+
 func TestAccOrganizations_serial(t *testing.T) {
 	testCases := map[string]map[string]func(t *testing.T){
 		"Organization": {