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

Revert "Merge pull request #804 from PeoplePerHour/f-aws-elb-subnet" 

Unfortunately, the acceptance tests here were improperly passing, and
allowing Subnet updates on ELBs is not as straightfoward as simply
removing `ForceNew`.

Subnets on ELBs need to be managed by two explicit API calls:

 * `AttachLoadBalancerToSubnets` - http://bit.ly/elbattachsubnet
 * `DetachLoadBalanceFromSubnets` - http://bit.ly/elbdetachsubnet

We'll need to circle back and use these APIs to explicitly add support.

This fixes the failure of `TestAccAWSELB_AddSubnet` by removing the
test.

This reverts commit 61e91017be, reversing
changes made to 49b3afe452.
This commit is contained in:
Paul Hinze 2015-02-18 18:15:04 -06:00
parent 706243c587
commit 86a2449569
2 changed files with 1 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/providers/aws/resource_aws_elb.go
View File

@ -73,6 +73,7 @@ func resourceAwsElb() *schema.Resource {
Type: schema.TypeSet, Type: schema.TypeSet,
Elem: &schema.Schema{Type: schema.TypeString}, Elem: &schema.Schema{Type: schema.TypeString},
Optional: true, Optional: true,
ForceNew: true,
Computed: true, Computed: true,
Set: func(v interface{}) int { Set: func(v interface{}) int {
return hashcode.String(v.(string)) return hashcode.String(v.(string))

94
builtin/providers/aws/resource_aws_elb_test.go
View File

@ -88,42 +88,6 @@ func TestAccAWSELB_InstanceAttaching(t *testing.T) {
}) })
} }
func TestAccAWSELB_AddSubnet(t *testing.T) {
var conf elb.LoadBalancer
testCheckSubnetsAdded := func(count int) resource.TestCheckFunc {
return func(*terraform.State) error {
if len(conf.Subnets) != count {
return fmt.Errorf("subnet count does not match")
}
return nil
}
}
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSELBDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccAWSELBConfigVPC,
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSELBExists("aws_elb.bar", &conf),
testAccCheckAWSELBAttributes(&conf),
),
},
resource.TestStep{
Config: testAccAWSELBAddSubnets,
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSELBExists("aws_elb.bar", &conf),
testCheckSubnetsAdded(2),
),
},
},
})
}
func TestAccAWSELB_HealthCheck(t *testing.T) { func TestAccAWSELB_HealthCheck(t *testing.T) {
var conf elb.LoadBalancer var conf elb.LoadBalancer
@ -348,64 +312,6 @@ resource "aws_instance" "foo" {
instance_type = "t1.micro" instance_type = "t1.micro"
} }
` `
const testAccAWSELBConfigVPC = `
resource "aws_elb" "bar" {
vpc_id = "${aws_vpc.foobar.id}"
name = "foobar-terraform-test"
availability_zones = ["us-west-2a", "us-west-2b", "us-west-2c"]
listener {
instance_port = 8000
instance_protocol = "http"
lb_port = 80
lb_protocol = "http"
}
subnets = ["${aws_subnet.baz.id}"]
}
resource "aws_subnet" "baz" {
vpc_id = "${aws_vpc.foobar.id}"
cidr_block = "10.0.69.0/24"
}
resource "aws_vpc" "foobar" {
cidr_block = "10.0.0.0/16"
}
`
const testAccAWSELBAddSubnets = `
resource "aws_elb" "bar" {
vpc_id = "${aws_vpc.foobar.id}"
name = "foobar-terraform-test"
availability_zones = ["us-west-2a", "us-west-2b", "us-west-2c"]
listener {
instance_port = 8000
instance_protocol = "http"
lb_port = 80
lb_protocol = "http"
}
subnets = ["${aws_subnet.baz.id}",
"${aws_subnet.foo.id}"]
}
resource "aws_subnet" "foo" {
vpc_id = "${aws_vpc.foobar.id}"
cidr_block = "10.0.68.0/24"
}
resource "aws_subnet" "baz" {
vpc_id = "${aws_vpc.foobar.id}"
cidr_block = "10.0.69.0/24"
}
resource "aws_vpc" "foobar" {
cidr_block = "10.0.0.0/16"
}
`
const testAccAWSELBConfigListenerSSLCertificateId = ` const testAccAWSELBConfigListenerSSLCertificateId = `
resource "aws_elb" "bar" { resource "aws_elb" "bar" {