From 1ebcedb22ba8a39b636d357c615cd65a5913b13d Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 9 Oct 2014 22:45:22 -0700 Subject: [PATCH] config: make the interp split pretty insane --- config/interpolate_walk.go | 2 +- terraform/test-fixtures/apply-output-multi/main.tf | 2 +- terraform/test-fixtures/plan-count-var/main.tf | 2 +- terraform/test-fixtures/plan-count/main.tf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/interpolate_walk.go b/config/interpolate_walk.go index b867deaf2..83c7baa86 100644 --- a/config/interpolate_walk.go +++ b/config/interpolate_walk.go @@ -12,7 +12,7 @@ import ( // InterpSplitDelim is the delimeter that is looked for to split when // it is returned. This is a comma right now but should eventually become // a value that a user is very unlikely to use (such as UUID). -const InterpSplitDelim = `,` +const InterpSplitDelim = `B780FFEC-B661-4EB8-9236-A01737AD98B6` // interpRegexp is a regexp that matches interpolations such as ${foo.bar} var interpRegexp *regexp.Regexp = regexp.MustCompile( diff --git a/terraform/test-fixtures/apply-output-multi/main.tf b/terraform/test-fixtures/apply-output-multi/main.tf index ba9aa7e64..a70e334b1 100644 --- a/terraform/test-fixtures/apply-output-multi/main.tf +++ b/terraform/test-fixtures/apply-output-multi/main.tf @@ -8,5 +8,5 @@ resource "aws_instance" "bar" { } output "foo_num" { - value = "${aws_instance.bar.*.foo}" + value = "${join(",", aws_instance.bar.*.foo)}" } diff --git a/terraform/test-fixtures/plan-count-var/main.tf b/terraform/test-fixtures/plan-count-var/main.tf index f64b9655b..b4cf08fb1 100644 --- a/terraform/test-fixtures/plan-count-var/main.tf +++ b/terraform/test-fixtures/plan-count-var/main.tf @@ -6,5 +6,5 @@ resource "aws_instance" "foo" { } resource "aws_instance" "bar" { - foo = "${aws_instance.foo.*.foo}" + foo = "${join(",", aws_instance.foo.*.foo)}" } diff --git a/terraform/test-fixtures/plan-count/main.tf b/terraform/test-fixtures/plan-count/main.tf index 7cf29a208..276670ce4 100644 --- a/terraform/test-fixtures/plan-count/main.tf +++ b/terraform/test-fixtures/plan-count/main.tf @@ -4,5 +4,5 @@ resource "aws_instance" "foo" { } resource "aws_instance" "bar" { - foo = "${aws_instance.foo.*.foo}" + foo = "${join(",", aws_instance.foo.*.foo)}" }