service/organizations: Automatically retry API calls on ConcurrentModificationException error

[bflad]

Community Note

• Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
• Please do not leave "+1" comments, they generate extra noise for pull request followers and do not help prioritize the request

Closes #5073

Release note for CHANGELOG:

* service/organizations: Automatically retry API calls on `ConcurrentModificationException` error

Previous output from the new acceptance testing before migrating the testing to the serialized Organizations testing:

--- FAIL: TestAccAwsOrganizationsPolicy_concurrent (6.73s)
    testing.go:568: Step 0 error: errors during apply:

        Error: error creating Organizations Policy: AWSOrganizationsNotInUseException: Your account is not a member of an organization.

Previous output from the new acceptance testing before adding the service client retry logic:

        --- FAIL: TestAccAWSOrganizations/Policy/concurrent (16.40s)
            testing.go:629: Error destroying resource! WARNING: Dangling resources
                may exist. The full state and error is shown below.

                Error: errors during apply: ConcurrentModificationException: AWS Organizations can't complete your request because it conflicts with another attempt to modify the same entity. Try again later.

Output from acceptance testing:

--- PASS: TestAccAWSOrganizations (246.04s)
    --- PASS: TestAccAWSOrganizations/Organization (87.29s)
        --- PASS: TestAccAWSOrganizations/Organization/AwsServiceAccessPrincipals (25.19s)
        --- PASS: TestAccAWSOrganizations/Organization/EnabledPolicyTypes (33.61s)
        --- PASS: TestAccAWSOrganizations/Organization/FeatureSet (10.42s)
        --- PASS: TestAccAWSOrganizations/Organization/basic (18.07s)
    --- PASS: TestAccAWSOrganizations/Account (0.00s)
        --- SKIP: TestAccAWSOrganizations/Account/basic (0.00s)
            resource_aws_organizations_account_test.go:15: AWS Organizations Account testing is not currently automated due to manual account deletion steps.
        --- SKIP: TestAccAWSOrganizations/Account/ParentId (0.00s)
            resource_aws_organizations_account_test.go:57: AWS Organizations Account testing is not currently automated due to manual account deletion steps.
    --- PASS: TestAccAWSOrganizations/OrganizationalUnit (36.87s)
        --- PASS: TestAccAWSOrganizations/OrganizationalUnit/basic (14.79s)
        --- PASS: TestAccAWSOrganizations/OrganizationalUnit/Name (22.08s)
    --- PASS: TestAccAWSOrganizations/Policy (63.90s)
        --- PASS: TestAccAWSOrganizations/Policy/concurrent (18.56s)
        --- PASS: TestAccAWSOrganizations/Policy/Description (21.93s)
        --- PASS: TestAccAWSOrganizations/Policy/basic (23.41s)
    --- PASS: TestAccAWSOrganizations/PolicyAttachment (57.98s)
        --- PASS: TestAccAWSOrganizations/PolicyAttachment/Account (17.75s)
        --- PASS: TestAccAWSOrganizations/PolicyAttachment/OrganizationalUnit (21.75s)
        --- PASS: TestAccAWSOrganizations/PolicyAttachment/Root (18.48s)
PASS

[nywilken]

LGTM 👍 👍

[bflad]

This has been released in version 2.19.0 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 for triage. Thanks!

[ghost]

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 feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!