r/aws_organizations_organization: Fix regression caused by checking for correct Org ID in Read

[ewbankkit]

Description

Moves the checking of the Org ID specified during terraform import to the import alone, preventing errors during terraform refresh if an existing resource had been imported with an invalid id.

Relations

Closes #33083.

Output from Acceptance Testing

% make testacc TESTARGS='-run=TestAccOrganizations_serial/^Organization$$' PKG=organizations
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20  -run=TestAccOrganizations_serial/^Organization$ -timeout 180m
=== RUN   TestAccOrganizations_serial
=== PAUSE TestAccOrganizations_serial
=== CONT  TestAccOrganizations_serial
=== RUN   TestAccOrganizations_serial/Organization
=== RUN   TestAccOrganizations_serial/Organization/DataSource_memberAccount
    acctest.go:931: this AWS account must be an existing member of an AWS Organization
=== RUN   TestAccOrganizations_serial/Organization/DataSource_delegatedAdministrator
    acctest.go:805: 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.
=== RUN   TestAccOrganizations_serial/Organization/basic
=== RUN   TestAccOrganizations_serial/Organization/AwsServiceAccessPrincipals
=== RUN   TestAccOrganizations_serial/Organization/FeatureSet_Basic
=== RUN   TestAccOrganizations_serial/Organization/FeatureSet_ForcesNew
=== RUN   TestAccOrganizations_serial/Organization/DataSource_basic
=== RUN   TestAccOrganizations_serial/Organization/disappears
=== RUN   TestAccOrganizations_serial/Organization/EnabledPolicyTypes
=== RUN   TestAccOrganizations_serial/Organization/FeatureSet_Update
--- PASS: TestAccOrganizations_serial (398.19s)
    --- PASS: TestAccOrganizations_serial/Organization (398.19s)
        --- SKIP: TestAccOrganizations_serial/Organization/DataSource_memberAccount (0.66s)
        --- SKIP: TestAccOrganizations_serial/Organization/DataSource_delegatedAdministrator (0.00s)
        --- PASS: TestAccOrganizations_serial/Organization/basic (25.29s)
        --- PASS: TestAccOrganizations_serial/Organization/AwsServiceAccessPrincipals (59.23s)
        --- PASS: TestAccOrganizations_serial/Organization/FeatureSet_Basic (24.94s)
        --- PASS: TestAccOrganizations_serial/Organization/FeatureSet_ForcesNew (43.48s)
        --- PASS: TestAccOrganizations_serial/Organization/DataSource_basic (23.74s)
        --- PASS: TestAccOrganizations_serial/Organization/disappears (19.37s)
        --- PASS: TestAccOrganizations_serial/Organization/EnabledPolicyTypes (159.03s)
        --- PASS: TestAccOrganizations_serial/Organization/FeatureSet_Update (42.44s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/organizations	403.454s

[github-actions]

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.

[jar-b]

LGTM 🎉

% make testacc TESTARGS='-run=TestAccOrganizations_serial/^Organization$$' PKG=organizations
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20  -run=TestAccOrganizations_serial/^Organization$ -timeout 180m

--- PASS: TestAccOrganizations_serial (258.84s)
    --- PASS: TestAccOrganizations_serial/Organization (258.84s)
        --- PASS: TestAccOrganizations_serial/Organization/AwsServiceAccessPrincipals (38.64s)
        --- PASS: TestAccOrganizations_serial/Organization/EnabledPolicyTypes (104.17s)
        --- PASS: TestAccOrganizations_serial/Organization/FeatureSet_ForcesNew (28.31s)
        --- PASS: TestAccOrganizations_serial/Organization/DataSource_basic (15.91s)
        --- SKIP: TestAccOrganizations_serial/Organization/DataSource_delegatedAdministrator (0.00s)
        --- PASS: TestAccOrganizations_serial/Organization/basic (16.53s)
        --- PASS: TestAccOrganizations_serial/Organization/disappears (12.44s)
        --- PASS: TestAccOrganizations_serial/Organization/FeatureSet_Basic (15.87s)
        --- PASS: TestAccOrganizations_serial/Organization/FeatureSet_Update (26.83s)
        --- SKIP: TestAccOrganizations_serial/Organization/DataSource_memberAccount (0.13s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/organizations      261.794s

[github-actions]

This functionality has been released in v5.13.1 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]

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.