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

Add listener.ssl_certificate_id support to AWS ELB

This commit is contained in:
Jason Padvorac 2014-08-10 16:09:05 -07:00
parent 1244bff399
commit 8d97c3656c
5 changed files with 49 additions and 16 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

@ -325,6 +325,7 @@ func resource_aws_elb_validation() *config.Validator {
}, },
Optional: []string{ Optional: []string{
"instances.*", "instances.*",
"listener.*.ssl_certificate_id",
"availability_zones.*", "availability_zones.*",
"health_check.#", "health_check.#",
"health_check.0.healthy_threshold", "health_check.0.healthy_threshold",

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

@ -35,6 +35,8 @@ func TestAccAWSELB_basic(t *testing.T) {
"aws_elb.bar", "listener.0.instance_port", "8000"), "aws_elb.bar", "listener.0.instance_port", "8000"),
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
"aws_elb.bar", "listener.0.instance_protocol", "http"), "aws_elb.bar", "listener.0.instance_protocol", "http"),
resource.TestCheckResourceAttr(
"aws_elb.bar", "listener.0.ssl_certificate_id", "arn:aws:iam::123456789012:server-certificate/certName"),
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
"aws_elb.bar", "listener.0.lb_port", "80"), "aws_elb.bar", "listener.0.lb_port", "80"),
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
@ -277,6 +279,22 @@ resource "aws_instance" "foo" {
} }
` `
const testAccAWSELBConfigListenerSSLCertificateId = `
resource "aws_elb" "bar" {
name = "foobar-terraform-test"
availability_zones = ["us-west-2a"]
listener {
instance_port = 8000
instance_protocol = "http"
ssl_certificate_id = "arn:aws:iam::123456789012:server-certificate/certName"
lb_port = 443
lb_protocol = "https"
}
}
`
const testAccAWSELBConfigHealthCheck = ` const testAccAWSELBConfigHealthCheck = `
resource "aws_elb" "bar" { resource "aws_elb" "bar" {
name = "foobar-terraform-test" name = "foobar-terraform-test"

5
builtin/providers/aws/structure.go
View File

@ -33,6 +33,11 @@ func expandListeners(configured []interface{}) ([]elb.Listener, error) {
Protocol: newL["lb_protocol"].(string), Protocol: newL["lb_protocol"].(string),
} }
if attr, ok := newL["ssl_certificate_id"].(string); ok {
l.SSLCertificateId = attr
}
listeners = append(listeners, l) listeners = append(listeners, l)
} }

32
builtin/providers/aws/structure_test.go
View File

@ -12,22 +12,22 @@ import (
// Returns test configuration // Returns test configuration
func testConf() map[string]string { func testConf() map[string]string {
return map[string]string{ return map[string]string{
"listener.#": "1", "listener.#": "1",
"listener.0.lb_port": "80", "listener.0.lb_port": "80",
"listener.0.lb_protocol": "http", "listener.0.lb_protocol": "http",
"listener.0.instance_port": "8000", "listener.0.instance_port": "8000",
"listener.0.instance_protocol": "http", "listener.0.instance_protocol": "http",
"availability_zones.#": "2", "availability_zones.#": "2",
"availability_zones.0": "us-east-1a", "availability_zones.0": "us-east-1a",
"availability_zones.1": "us-east-1b", "availability_zones.1": "us-east-1b",
"ingress.#": "1", "ingress.#": "1",
"ingress.0.protocol": "icmp", "ingress.0.protocol": "icmp",
"ingress.0.from_port": "1", "ingress.0.from_port": "1",
"ingress.0.to_port": "-1", "ingress.0.to_port": "-1",
"ingress.0.cidr_blocks.#": "1", "ingress.0.cidr_blocks.#": "1",
"ingress.0.cidr_blocks.0": "0.0.0.0/0", "ingress.0.cidr_blocks.0": "0.0.0.0/0",
"ingress.0.security_groups.#": "1", "ingress.0.security_groups.#": "1",
"ingress.0.security_groups.0": "sg-11111", "ingress.0.security_groups.0": "sg-11111",
} }
} }

9
website/source/docs/providers/aws/r/elb.html.markdown
View File

@ -23,6 +23,14 @@ resource "aws_elb" "bar" {
lb_protocol = "http" lb_protocol = "http"
} }
listener {
instance_port = 8000
instance_protocol = "http"
lb_port = 443
lb_protocol = "https"
ssl_certificate_id = "arn:aws:iam::123456789012:server-certificate/certName"
}
health_check { health_check {
healthy_threshold = 2 healthy_threshold = 2
unhealthy_threshold = 2 unhealthy_threshold = 2
@ -51,6 +59,7 @@ Listeners support the following:
* `instance_protocol` - (Required) The the protocol to use to the instance. * `instance_protocol` - (Required) The the protocol to use to the instance.
* `lb_port` - (Required) The port to listen on for the load balancer * `lb_port` - (Required) The port to listen on for the load balancer
* `lb_protocol` - (Required) The protocol to listen on. * `lb_protocol` - (Required) The protocol to listen on.
* `ssl_certificate_id` - (Optional) The id of an SSL certificate you have uploaded to AWS IAM.
Health Check supports the following: Health Check supports the following: