interpolate: Add support for computed TypeList attributes

terraform/interpolate.go

@@ -2,7 +2,9 @@ package terraform
 
 import (
  "fmt"
+ "log"
  "os"
+ "strconv"
  "strings"
  "sync"
 
@@ -327,6 +329,11 @@ func (i *Interpolater) computeResourceVariable(
  return attr, nil
  }
 
+ // computed list attribute
+ if _, ok := r.Primary.Attributes[v.Field+".#"]; ok {
+ return i.interpolateListAttribute(v.Field, r.Primary.Attributes)
+ }
+
  // At apply time, we can't do the "maybe has it" check below
  // that we need for plans since parent elements might be computed.
  // Therefore, it is an error and we're missing the key.
@@ -448,6 +455,33 @@ func (i *Interpolater) computeResourceMultiVariable(
  return strings.Join(values, config.InterpSplitDelim), nil
 }
 
+func (i *Interpolater) interpolateListAttribute(
+ resourceID string,
+ attributes map[string]string) (string, error) {
+
+ attr := attributes[resourceID+".#"]
+ log.Printf("[DEBUG] Interpolating computed list attribute %s (%s)",
+ resourceID, attr)
+
+ value, err := strconv.ParseInt(attr, 0, 0)
+ if err != nil {
+ return "", err
+ }
+
+ count := int(value)
+ if count == 0 {
+ return "", nil
+ }
+
+ var members []string
+ for i := 0; i < count; i++ {
+ id := fmt.Sprintf("%s.%d", resourceID, i)
+ members = append(members, attributes[id])
+ }
+
+ return strings.Join(members, config.InterpSplitDelim), nil
+}
+
 func (i *Interpolater) resourceVariableInfo(
  scope *InterpolationScope,
  v *config.ResourceVariable) (*ModuleState, *config.Resource, error) {

terraform/interpolate_test.go

@@ -4,6 +4,7 @@ import (
  "fmt"
  "os"
  "reflect"
+ "strings"
  "sync"
  "testing"
 
@@ -136,6 +137,181 @@ func TestInterpolater_pathRoot(t *testing.T) {
  })
 }
 
+func TestInterpolator_resourceMultiAttributes(t *testing.T) {
+ lock := new(sync.RWMutex)
+ state := &State{
+ Modules: []*ModuleState{
+ &ModuleState{
+ Path: rootModulePath,
+ Resources: map[string]*ResourceState{
+ "aws_route53_zone.yada": &ResourceState{
+ Type: "aws_route53_zone",
+ Dependencies: []string{},
+ Primary: &InstanceState{
+ ID: "AAABBBCCCDDDEEE",
+ Attributes: map[string]string{
+ "name_servers.#": "4",
+ "name_servers.0": "ns-1334.awsdns-38.org",
+ "name_servers.1": "ns-1680.awsdns-18.co.uk",
+ "name_servers.2": "ns-498.awsdns-62.com",
+ "name_servers.3": "ns-601.awsdns-11.net",
+ "listeners.#": "1",
+ "listeners.0": "single-value",
+ "tags.#": "1",
+ "tags.Name": "reindeer",
+ "nothing.#": "0",
+ },
+ },
+ },
+ },
+ },
+ },
+ }
+
+ i := &Interpolater{
+ Module: testModule(t, "interpolate-multi-vars"),
+ StateLock: lock,
+ State: state,
+ }
+
+ scope := &InterpolationScope{
+ Path: rootModulePath,
+ }
+
+ name_servers := []string{
+ "ns-1334.awsdns-38.org",
+ "ns-1680.awsdns-18.co.uk",
+ "ns-498.awsdns-62.com",
+ "ns-601.awsdns-11.net",
+ }
+ expectedNameServers := strings.Join(name_servers, config.InterpSplitDelim)
+
+ // More than 1 element
+ testInterpolate(t, i, scope, "aws_route53_zone.yada.name_servers", ast.Variable{
+ Value: expectedNameServers,
+ Type: ast.TypeString,
+ })
+
+ // Exactly 1 element
+ testInterpolate(t, i, scope, "aws_route53_zone.yada.listeners", ast.Variable{
+ Value: "single-value",
+ Type: ast.TypeString,
+ })
+
+ // Zero elements
+ testInterpolate(t, i, scope, "aws_route53_zone.yada.nothing", ast.Variable{
+ Value: "",
+ Type: ast.TypeString,
+ })
+
+ // Maps still need to work
+ testInterpolate(t, i, scope, "aws_route53_zone.yada.tags.Name", ast.Variable{
+ Value: "reindeer",
+ Type: ast.TypeString,
+ })
+}
+
+func TestInterpolator_resourceMultiAttributesWithResourceCount(t *testing.T) {
+ i := getInterpolaterFixture(t)
+ scope := &InterpolationScope{
+ Path: rootModulePath,
+ }
+
+ name_servers := []string{
+ "ns-1334.awsdns-38.org",
+ "ns-1680.awsdns-18.co.uk",
+ "ns-498.awsdns-62.com",
+ "ns-601.awsdns-11.net",
+ }
+ expectedNameServers := strings.Join(name_servers, config.InterpSplitDelim)
+
+ // More than 1 element
+ testInterpolate(t, i, scope, "aws_route53_zone.terra.0.name_servers", ast.Variable{
+ Value: expectedNameServers,
+ Type: ast.TypeString,
+ })
+ // TODO
+ // testInterpolate(t, i, scope, "aws_route53_zone.terra.*.name_servers", ast.Variable{
+ // Value: "boooom",
+ // Type: ast.TypeString,
+ // })
+
+ // Exactly 1 element
+ testInterpolate(t, i, scope, "aws_route53_zone.terra.0.listeners", ast.Variable{
+ Value: "single-value",
+ Type: ast.TypeString,
+ })
+
+ // Zero elements
+ testInterpolate(t, i, scope, "aws_route53_zone.terra.0.nothing", ast.Variable{
+ Value: "",
+ Type: ast.TypeString,
+ })
+
+ // Maps still need to work
+ testInterpolate(t, i, scope, "aws_route53_zone.terra.0.tags.Name", ast.Variable{
+ Value: "reindeer",
+ Type: ast.TypeString,
+ })
+}
+
+func getInterpolaterFixture(t *testing.T) *Interpolater {
+ lock := new(sync.RWMutex)
+ state := &State{
+ Modules: []*ModuleState{
+ &ModuleState{
+ Path: rootModulePath,
+ Resources: map[string]*ResourceState{
+ "aws_route53_zone.terra.0": &ResourceState{
+ Type: "aws_route53_zone",
+ Dependencies: []string{},
+ Primary: &InstanceState{
+ ID: "AAABBBCCCDDDEEE",
+ Attributes: map[string]string{
+ "name_servers.#": "4",
+ "name_servers.0": "ns-1334.awsdns-38.org",
+ "name_servers.1": "ns-1680.awsdns-18.co.uk",
+ "name_servers.2": "ns-498.awsdns-62.com",
+ "name_servers.3": "ns-601.awsdns-11.net",
+ "listeners.#": "1",
+ "listeners.0": "single-value",
+ "tags.#": "1",
+ "tags.Name": "reindeer",
+ "nothing.#": "0",
+ },
+ },
+ },
+ "aws_route53_zone.terra.1": &ResourceState{
+ Type: "aws_route53_zone",
+ Dependencies: []string{},
+ Primary: &InstanceState{
+ ID: "EEEFFFGGGHHHIII",
+ Attributes: map[string]string{
+ "name_servers.#": "4",
+ "name_servers.0": "ns-000.awsdns-38.org",
+ "name_servers.1": "ns-444.awsdns-18.co.uk",
+ "name_servers.2": "ns-999.awsdns-62.com",
+ "name_servers.3": "ns-666.awsdns-11.net",
+ "listeners.#": "1",
+ "listeners.0": "single-value",
+ "tags.#": "1",
+ "tags.Name": "white-hart",
+ "nothing.#": "0",
+ },
+ },
+ },
+ },
+ },
+ },
+ }
+
+ return &Interpolater{
+ Module: testModule(t, "interpolate-multi-vars"),
+ StateLock: lock,
+ State: state,
+ }
+}
+
 func testInterpolate(
  t *testing.T, i *Interpolater,
  scope *InterpolationScope,
@@ -156,6 +332,6 @@ func testInterpolate(
  "foo": expectedVar,
  }
  if !reflect.DeepEqual(actual, expected) {
- t.Fatalf("bad: %#v", actual)
+ t.Fatalf("actual: %#v\nexpected: %#v", actual, expected)
  }
 }

terraform/test-fixtures/interpolate-multi-vars/main.tf

@@ -0,0 +1,7 @@
+resource "aws_route53_zone" "yada" {
+
+}
+
+resource "aws_route53_zone" "terra" {
+
+}