resource/securityhub_organization_admin_account: retry on ResourceConflictException during creation

[anGie44]

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" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Closes #17996

Output from acceptance testing:

--- PASS: TestAccAWSSecurityHub_serial (24.00s)
    --- PASS: TestAccAWSSecurityHub_serial/ActionTarget (74.20s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/Description (25.29s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/Name (22.85s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/basic (14.31s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/disappears (11.75s)
    --- PASS: TestAccAWSSecurityHub_serial/ProductSubscription (29.38s)
        --- PASS: TestAccAWSSecurityHub_serial/ProductSubscription/basic (29.38s)
    --- PASS: TestAccAWSSecurityHub_serial/StandardsSubscription (21.00s)
        --- PASS: TestAccAWSSecurityHub_serial/StandardsSubscription/basic (21.00s)
    --- PASS: TestAccAWSSecurityHub_serial/Member (30.99s)
        --- PASS: TestAccAWSSecurityHub_serial/Member/basic (15.88s)
        --- PASS: TestAccAWSSecurityHub_serial/Member/invite (15.11s)
    --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount (59.09s)
        --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/basic (20.76s)
        --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/disappears (17.17s)
        --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/MultiRegion (21.17s)

Notes

• improvement on retry behavior is not readily apparent when testing with 3 regions, but when testing with a terraform configuration outside of the test framework, (sporadic) errors previously thrown when creating 4+ resources with alternate regions are now appropriately caught, resulting in successful creations

[bflad]

Open question: I wonder if instead of introducing time-boxed retry logic here (which could be hard to scale without a customizable timeout), we should instead have the AWS SDK Go service client automatically retry the error using the logic in aws/config.go? e.g.

client.securityhubconn.Handlers.Retry.PushBack(func(r *request.Request) {
	switch r.Operation.Name {
	case "EnableOrganizationAdminAccount":
		if tfawserr.ErrCodeEquals(r.Error, securityhub.ErrCodeResourceConflictException) {
			r.Retryable = aws.Bool(true)
		}
	}
})

[anGie44]

Open question: I wonder if instead of introducing time-boxed retry logic here (which could be hard to scale without a customizable timeout), we should instead have the AWS SDK Go service client automatically retry the error using the logic in aws/config.go? e.g.

client.securityhubconn.Handlers.Retry.PushBack(func(r *request.Request) {
	switch r.Operation.Name {
	case "EnableOrganizationAdminAccount":
		if tfawserr.ErrCodeEquals(r.Error, securityhub.ErrCodeResourceConflictException) {
			r.Retryable = aws.Bool(true)
		}
	}
})

Wow i honestly totally forgot about that usage! much preferred 👍 (and am now thinking I've probably over-used that time-boxed logic around the provider 😅 )

[anGie44]

Output of acceptance tests after changes:

    --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount (62.02s)
        --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/disappears (19.28s)
        --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/MultiRegion (23.50s)
        --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/basic (19.24s)

[bflad]

Looks great! 🚀

Output from acceptance testing:

    --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount (60.56s)
        --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/basic (19.04s)
        --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/disappears (15.77s)
        --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/MultiRegion (25.75s)

[ghost]

This has been released in version 3.35.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!