provider/aws: ignore association not exist on EIP destroy [GH-2295]

This commit is contained in:
Mitchell Hashimoto 2015-06-28 22:30:43 -07:00
parent e5a9cee5bb
commit cc2a5ab18f
1 changed files with 11 additions and 0 deletions

View File

@ -222,6 +222,17 @@ func resourceAwsEipDelete(d *schema.ResourceData, meta interface{}) error {
PublicIP: aws.String(d.Get("public_ip").(string)), PublicIP: aws.String(d.Get("public_ip").(string)),
}) })
} }
if err != nil {
// First check if the association ID is not found. If this
// is the case, then it was already disassociated somehow,
// and that is okay. The most commmon reason for this is that
// the instance or ENI it was attached it was destroyed.
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidAssociationID.NotFound" {
err = nil
}
}
if err != nil { if err != nil {
return err return err
} }