ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1776 from TimeIncOSS/eip-without-igw 

[bugfix] aws/eip: Don't save instance ID if association fails
This commit is contained in:
Mitchell Hashimoto 2015-05-04 11:19:32 -07:00
parent cf6fa89f46 795d53e706
commit 9617761eb4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/providers/aws/resource_aws_eip.go
View File

@ -140,7 +140,9 @@ func resourceAwsEipRead(d *schema.ResourceData, meta interface{}) error {
address := describeAddresses.Addresses[0] address := describeAddresses.Addresses[0]
d.Set("association_id", address.AssociationID) d.Set("association_id", address.AssociationID)
d.Set("instance", address.InstanceID) if address.InstanceID != nil {
d.Set("instance", address.InstanceID)
}
d.Set("private_ip", address.PrivateIPAddress) d.Set("private_ip", address.PrivateIPAddress)
d.Set("public_ip", address.PublicIP) d.Set("public_ip", address.PublicIP)
@ -173,6 +175,9 @@ func resourceAwsEipUpdate(d *schema.ResourceData, meta interface{}) error {
log.Printf("[DEBUG] EIP associate configuration: %#v (domain: %v)", assocOpts, domain) log.Printf("[DEBUG] EIP associate configuration: %#v (domain: %v)", assocOpts, domain)
_, err := ec2conn.AssociateAddress(assocOpts) _, err := ec2conn.AssociateAddress(assocOpts)
if err != nil { if err != nil {
// Prevent saving instance if association failed
// e.g. missing internet gateway in VPC
d.Set("instance", "")
return fmt.Errorf("Failure associating instances: %s", err) return fmt.Errorf("Failure associating instances: %s", err)
} }
} }