resource/aws_eip_association: fix eventual consistency issue when associating EIP

aws/internal/service/ec2/waiter/waiter.go

@@ -11,6 +11,9 @@ import (
 const (
  // Maximum amount of time to wait for EC2 Instance attribute modifications to propagate
  InstanceAttributePropagationTimeout = 2 * time.Minute
+
+ // General timeout for EC2 resource creations to propagate
+ PropagationTimeout = 2 * time.Minute
 )
 
 const (

aws/resource_aws_eip_association.go

@@ -4,13 +4,13 @@ import (
  "fmt"
  "log"
  "net"
- "time"
 
  "github.com/aws/aws-sdk-go/aws"
  "github.com/aws/aws-sdk-go/service/ec2"
  "github.com/hashicorp/aws-sdk-go-base/tfawserr"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+ "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/ec2/waiter"
 )
 
 func resourceAwsEipAssociation() *schema.Resource {
@@ -94,7 +94,7 @@ func resourceAwsEipAssociationCreate(d *schema.ResourceData, meta interface{}) e
  log.Printf("[DEBUG] EIP association configuration: %#v", request)
 
  var resp *ec2.AssociateAddressOutput
- err := resource.Retry(2*time.Minute, func() *resource.RetryError {
+ err := resource.Retry(waiter.PropagationTimeout, func() *resource.RetryError {
  var err error
  resp, err = conn.AssociateAddress(request)
 
@@ -157,7 +157,36 @@ func resourceAwsEipAssociationRead(d *schema.ResourceData, meta interface{}) err
  return err
  }
 
- response, err := conn.DescribeAddresses(request)
+ var response *ec2.DescribeAddressesOutput
+ err = resource.Retry(waiter.PropagationTimeout, func() *resource.RetryError {
+ var err error
+ response, err = conn.DescribeAddresses(request)
+
+ if d.IsNewResource() && tfawserr.ErrCodeEquals(err, "InvalidAssociationID.NotFound") {
+ return resource.RetryableError(err)
+ }
+
+ if d.IsNewResource() && (response.Addresses == nil || len(response.Addresses) == 0) {
+ return resource.RetryableError(&resource.NotFoundError{})
+ }
+
+ if err != nil {
+ return resource.NonRetryableError(err)
+ }
+
+ return nil
+ })
+
+ if isResourceTimeoutError(err) {
+ response, err = conn.DescribeAddresses(request)
+ }
+
+ if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, "InvalidAssociationID.NotFound") {
+ log.Printf("[WARN] EIP Association (%s) not found, removing from state", d.Id())
+ d.SetId("")
+ return nil
+ }
+
  if err != nil {
  return fmt.Errorf("Error reading EC2 Elastic IP %s: %#v", d.Get("allocation_id").(string), err)
  }