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

provider/aws: fix EIPs on new upstream sdk 

As we've seen elsewhere, the SDK now wants nils instead of empty arrays
for collections

fixes #1696

thanks @jstremick for pointing me in the right direction
This commit is contained in:
Paul Hinze 2015-04-27 19:55:26 -05:00
parent 56d7012c49
commit 120cfdce59
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,8 +102,8 @@ func resourceAwsEipRead(d *schema.ResourceData, meta interface{}) error {
domain := resourceAwsEipDomain(d)
id := d.Id()
assocIds := []*string{}
publicIps := []*string{}
var assocIds []*string
var publicIps []*string
if domain == "vpc" {
assocIds = []*string{aws.String(id)}
} else {

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

@ -66,8 +66,7 @@ func testAccCheckAWSEIPDestroy(s *terraform.State) error {
}
req := &ec2.DescribeAddressesInput{
AllocationIDs: []*string{},
PublicIPs: []*string{aws.String(rs.Primary.ID)},
PublicIPs: []*string{aws.String(rs.Primary.ID)},
}
describe, err := conn.DescribeAddresses(req)
@ -118,7 +117,6 @@ func testAccCheckAWSEIPExists(n string, res *ec2.Address) resource.TestCheckFunc
if strings.Contains(rs.Primary.ID, "eipalloc") {
req := &ec2.DescribeAddressesInput{
AllocationIDs: []*string{aws.String(rs.Primary.ID)},
PublicIPs: []*string{},
}
describe, err := conn.DescribeAddresses(req)
if err != nil {
@ -133,8 +131,7 @@ func testAccCheckAWSEIPExists(n string, res *ec2.Address) resource.TestCheckFunc
} else {
req := &ec2.DescribeAddressesInput{
AllocationIDs: []*string{},
PublicIPs: []*string{aws.String(rs.Primary.ID)},
PublicIPs: []*string{aws.String(rs.Primary.ID)},
}
describe, err := conn.DescribeAddresses(req)
if err != nil {