[Bug]: current Organization ID (0-xxxxxxxxxx) does not match (r-xxxx)

[dannyibishev]

Terraform Core Version

1.5.5

AWS Provider Version

5.13.0

Affected Resource(s)

I bumped the AWS provider on my workspace from 5.12.0 to 5.13.0 and was greeted by an error for the aws_organizations_organization resource.

The error

I believe this to be a bug that was introduced possibly by commit #31796

resource affected

• aws_organizations_organization

Expected Behavior

What

There should have been no change in the id within the state for the affected resource.

Why

I have not made any changes myself other than bump the AWS provider.

Actual Behavior

The error provided from earlier

Relevant Error/Panic Output Snippet

No response

Terraform Configuration Files

resource "aws_organizations_organization" "org" {
  aws_service_access_principals = ["account.amazonaws.com", "cloudtrail.amazonaws.com"]
  feature_set                   = "ALL"
}

Steps to Reproduce

1. Provision a aws_organizations_organization resource on aws provider 5.12.0.
2. Apply the resource.
3. Bump the aws provider to 5.13.0.
4. Run a plan.

Debug Output

No response

Panic Output

No response

Important Factoids

No response

References

No response

Would you like to implement a fix?

None

[github-actions]

Community Note

Voting for Prioritization

• Please vote on this issue by adding a 👍 reaction to the original post to help the community and maintainers prioritize this 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.

Volunteering to Work on This Issue

• If you are interested in working on this issue, please leave a comment.
• If this would be your first contribution, please review the contribution guide.

[ewbankkit]

@dannyibishev Thanks for raising this issue 👏.
Looking at the code, my guess is that the aws_organizations_organization resource was previously imported with the r-xxxx root identifier and that became the resource's id in state. Since the import ID wasn't checked prior to #31796, this was a valid scenario.
I've marked this bug as a regression -- I'll move the id-checking code into the importer rather than resource Read.

[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 issue 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 similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.