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

Remove some domain checking duplication

This commit is contained in:
James Stremick 2015-04-27 17:26:52 -04:00
parent b29e9d3b6f
commit 244639cf3d
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,18 +108,6 @@ func resourceAwsEipRead(d *schema.ResourceData, meta interface{}) error {
domain := resourceAwsEipDomain(d) domain := resourceAwsEipDomain(d)
id := d.Id() id := d.Id()
var assocIds []*string
var publicIps []*string
if domain == "vpc" {
assocIds = []*string{aws.String(id)}
} else {
publicIps = []*string{aws.String(id)}
}
log.Printf(
"[DEBUG] EIP describe configuration: %#v, %#v (domain: %s)",
assocIds, publicIps, domain)
req := &ec2.DescribeAddressesInput{} req := &ec2.DescribeAddressesInput{}
if domain == "vpc" { if domain == "vpc" {
@ -128,9 +116,14 @@ func resourceAwsEipRead(d *schema.ResourceData, meta interface{}) error {
req.PublicIPs = []*string{aws.String(id)} req.PublicIPs = []*string{aws.String(id)}
} }
log.Printf(
"[DEBUG] EIP describe configuration: %#v (domain: %s)",
req, domain)
describeAddresses, err := ec2conn.DescribeAddresses(req) describeAddresses, err := ec2conn.DescribeAddresses(req)
if err != nil { if err != nil {
if ec2err, ok := err.(aws.APIError); ok && ec2err.Code == "InvalidAllocationID.NotFound" { if ec2err, ok := err.(aws.APIError); ok && ec2err.Code == "InvalidAllocationID.NotFound" {
log.Printf("[DEBUG] EIP describe configuration: %#v", req)
d.SetId("") d.SetId("")
return nil return nil
} }