Merge pull request hashicorp#40082 from alexbacchin/b/aws_eip-release…

…_error

b/aws_eip on delete error with ipam_pool_id stuck in IPAM eventual consistency loop

.changelog/40082.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_eip: Properly surface errors during deletion when `ipam_pool_id` is set
+```

internal/service/ec2/ec2_eip.go

@@ -340,6 +340,14 @@ func resourceEIPDelete(ctx context.Context, d *schema.ResourceData, meta interfa
 	log.Printf("[INFO] Deleting EC2 EIP: %s", d.Id())
 	_, err := conn.ReleaseAddress(ctx, input)
 
+	if tfawserr.ErrCodeEquals(err, errCodeInvalidAllocationIDNotFound) {
+		return diags
+	}
+
+	if err != nil {
+		return sdkdiag.AppendErrorf(diags, "deleting EC2 EIP (%s): %s", d.Id(), err)
+	}
+
 	// If the EIP's CIDR block was allocated from an IPAM pool, wait for the allocation to disappear.
 	if v, ok := d.GetOk("ipam_pool_id"); ok {
 		ipamPoolID := v.(string)
@@ -355,14 +363,6 @@ func resourceEIPDelete(ctx context.Context, d *schema.ResourceData, meta interfa
 		}
 	}
 
-	if tfawserr.ErrCodeEquals(err, errCodeInvalidAllocationIDNotFound) {
-		return diags
-	}
-
-	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "deleting EC2 EIP (%s): %s", d.Id(), err)
-	}
-
 	return diags
 }