providers/aws: helper for expanding listeners

builtin/providers/aws/resource_aws_elb.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/terraform/flatmap"
 	"github.com/hashicorp/terraform/helper/diff"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/mitchellh/goamz/elb"
@@ -24,20 +25,15 @@ func resource_aws_elb_create(
 	// we save to state if the creation is succesful (amazon verifies
 	// it is unique)
 	elbName := rs.Attributes["name"]
-	// v := flatmap.Expand(rs.Attributes, "listener")
+
-	// log.Println(v)
+	// Expand the "listener" array to goamz compat []elb.Listener
+	v := flatmap.Expand(rs.Attributes, "listener").([]interface{})
+	listeners := expandListeners(v)
 
 	// Provision the elb
 	elbOpts := &elb.CreateLoadBalancer{
 		LoadBalancerName: elbName,
-		Listeners: []elb.Listener{
+		Listeners:        listeners,
-			elb.Listener{
-				InstancePort:     8000,
-				InstanceProtocol: "http",
-				LoadBalancerPort: 80,
-				Protocol:         "http",
-			},
-		},
 		AvailZone: []string{
 			"us-east-1a",
 			"us-east-1b",
@@ -102,10 +98,12 @@ func resource_aws_elb_diff(
 		Attrs: map[string]diff.AttrType{
 			"name":              diff.AttrTypeCreate,
 			"availability_zone": diff.AttrTypeCreate,
+			"listener":          diff.AttrTypeCreate,
 		},
 
 		ComputedAttrs: []string{
 			"dns_name",
+			"instances",
 		},
 	}
 

builtin/providers/aws/structure.go

@@ -0,0 +1,28 @@
+package aws
+
+import (
+	"github.com/mitchellh/goamz/elb"
+)
+
+// Takes the result of flatmap.Expand for an array of listeners and
+// returns ELB API compatible objects
+func expandListeners(configured []interface{}) []elb.Listener {
+	listeners := make([]elb.Listener, 0, len(configured))
+
+	// Loop over our configured listeners and create
+	// an array of goamz compatabile objects
+	for _, listener := range configured {
+		newL := listener.(map[string]interface{})
+
+		l := elb.Listener{
+			InstancePort:     int64(newL["instance_port"].(int)),
+			InstanceProtocol: newL["instance_protocol"].(string),
+			LoadBalancerPort: int64(newL["lb_port"].(int)),
+			Protocol:         newL["lb_protocol"].(string),
+		}
+
+		listeners = append(listeners, l)
+	}
+
+	return listeners
+}

builtin/providers/aws/structure_test.go

@@ -0,0 +1,39 @@
+package aws
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/hashicorp/terraform/flatmap"
+	"github.com/mitchellh/goamz/elb"
+)
+
+// Returns test configuration
+func testConf() map[string]string {
+	return map[string]string{
+		"listener.#":                   "1",
+		"listener.0.lb_port":           "80",
+		"listener.0.lb_protocol":       "http",
+		"listener.0.instance_port":     "8000",
+		"listener.0.instance_protocol": "http",
+	}
+}
+
+func Test_expandListeners(t *testing.T) {
+	expanded := flatmap.Expand(testConf(), "listener").([]interface{})
+	listeners := expandListeners(expanded)
+	expected := elb.Listener{
+		InstancePort:     8000,
+		LoadBalancerPort: 80,
+		InstanceProtocol: "http",
+		Protocol:         "http",
+	}
+
+	if !reflect.DeepEqual(listeners[0], expected) {
+		t.Fatalf(
+			"Got:\n\n%#v\n\nExpected:\n\n%#v\n",
+			listeners[0],
+			expected)
+	}
+
+}