Revert "r/aws_fms_admin_account: Retries."

This reverts commit ce57792.

internal/service/fms/admin_account.go

@@ -101,16 +101,7 @@ func resourceAdminAccountDelete(ctx context.Context, d *schema.ResourceData, met
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).FMSClient(ctx)
 
-	// Acceptance testing creates and deletes resources in quick succession.
-	// The FMS onboarding process into Organizations is opaque to consumers.
-	// Since we cannot reasonably check this status before receiving the error,
-	// set the operation as retryable.
-	const (
-		timeout = 1 * time.Minute
-	)
-	_, err := tfresource.RetryWhenIsAErrorMessageContains[*awstypes.InvalidOperationException](ctx, timeout, func() (interface{}, error) {
-		return conn.DisassociateAdminAccount(ctx, &fms.DisassociateAdminAccountInput{})
-	}, "Your AWS Organization is currently onboarding with AWS Firewall Manager and cannot be offboarded.")
+	_, err := conn.DisassociateAdminAccount(ctx, &fms.DisassociateAdminAccountInput{})
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "disassociating FMS Admin Account (%s): %s", d.Id(), err)
@@ -161,16 +152,7 @@ func statusAssociateAdminAccount(ctx context.Context, conn *fms.Client, accountI
 			AdminAccount: aws.String(accountID),
 		}
 
-		// Acceptance testing creates and deletes resources in quick succession.
-		// The FMS onboarding process into Organizations is opaque to consumers.
-		// Since we cannot reasonably check this status before receiving the error,
-		// set the operation as retryable.
-		const (
-			timeout = 1 * time.Minute
-		)
-		_, err := tfresource.RetryWhenIsAErrorMessageContains[*awstypes.InvalidOperationException](ctx, timeout, func() (interface{}, error) {
-			return conn.AssociateAdminAccount(ctx, input)
-		}, "Your AWS Organization is currently offboarding with AWS Firewall Manager. Please submit onboard request after offboarded.")
+		_, err := conn.AssociateAdminAccount(ctx, input)
 
 		if err != nil {
 			return nil, "", err