Add map variable to test and readme

Signed-off-by: Reinhard Naegele <unguiculus@gmail.com>

README.md

@@ -47,6 +47,17 @@ vars:
   # TF_VAR_<var>=value for commands that support them
   foo: foovalue
   templatedVar: "{{ .Params.param }}"
+  mapvar: |-
+    {
+      entry1 = {
+        value1 = testvalue1
+        value2 = true
+      }
+      entry2 = {
+        value1 = testvalue2
+        value2 = false
+      }
+    }
 envs:
   # Environment variables are added to the Terraform calls environment
   BAR: barvalue
@@ -88,6 +99,17 @@ vars:
   # TF_VAR_<var>=value for commands that support them
   foo: foovalue
   templatedVar: "myval"
+  mapvar: |-
+    {
+      entry1 = {
+        value1 = testvalue1
+        value2 = true
+      }
+      entry2 = {
+        value1 = testvalue2
+        value2 = false
+      }
+    }
 envs:
   # Environment variables are added to the Terraform calls environment
   BAR: barvalue

pkg/config/config.go

@@ -82,6 +82,7 @@ func Load(configFile string, params map[string]string) (*Config, error) {
 		}
 		cfg.BackendConfigs[key] = sb.String()
 	}
+
 	return cfg, nil
 }
 

pkg/config/config_test.go

@@ -26,7 +26,7 @@ func TestLoad(t *testing.T) {
 	assert.NotNil(t, got)
 
 	assert.Equal(t, got.VarsFiles, []string{"testdata/testmodule/test.tfvars"})
-	assert.Equal(t, got.Vars, map[string]string{"foo": "foovalue", "templatedVar": "paramvalue"})
+	assert.Equal(t, got.Vars, map[string]string{"foo": "foovalue", "templatedVar": "paramvalue", "mapvar": "{\n  value1 = \"testvalue\"\n  value2 = true\n}"})
 	assert.Equal(t, got.Envs, map[string]string{"BAR": "barvalue", "TEMPLATED_ENV": "paramvalue"})
 	assert.Equal(t, got.BackendConfigs, map[string]string{
 		"backend_key":                  "be_key_foovalue_barvalue",

pkg/config/testdata/test_config.yaml

@@ -3,6 +3,11 @@ varsFiles:
 vars:
   foo: foovalue
   templatedVar: "{{ .Params.param }}"
+  mapvar: |-
+    {
+      value1 = "testvalue"
+      value2 = true
+    }
 envs:
   BAR: barvalue
   TEMPLATED_ENV: "{{ .Params.param }}"

pkg/config/testdata/testmodule/test.tf

@@ -6,6 +6,13 @@ variable "foo" {}
 
 variable "baz" {}
 
+variable "mapvar" {
+  type = map(object({
+    value1 = string
+    value2 = bool
+  }))
+}
+
 output "foo" {
   value = var.foo
 }

test/integration_test.go

@@ -17,7 +17,6 @@ package integrationtest
 import (
 	"fmt"
 	"io/ioutil"
-	"log"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -38,34 +37,44 @@ func Test_e2e(t *testing.T) {
 
 	binary := buildBinary(tempDir)
 
-	output, err := runProcess(binary, "-c", "testdata/test_config.yaml", "init", "-no-color", "testdata/testmodule")
+	output, err := runProcess(binary, "-d", "-c", "testdata/test_config.yaml", "init", "-no-color", "testdata/testmodule")
 	fmt.Println(output)
 	assert.NoError(t, err)
 	assert.Contains(t, output, "Terraform has been successfully initialized!")
 
-	output, err = runProcess(binary, "-c", "testdata/test_config.yaml", "plan", "-no-color", "testdata/testmodule")
+	output, err = runProcess(binary, "-d", "-c", "testdata/test_config.yaml", "plan", "-no-color", "testdata/testmodule")
 	fmt.Println(output)
 	assert.NoError(t, err)
 	assert.Contains(t, output, "# null_resource.echo will be created")
 	assert.Contains(t, output, "Plan: 1 to add, 0 to change, 0 to destroy.")
 
-	output, err = runProcess(binary, "-c", "testdata/test_config.yaml", "apply", "-auto-approve", "-no-color", "testdata/testmodule")
+	output, err = runProcess(binary, "-d", "-c", "testdata/test_config.yaml", "apply", "-auto-approve", "-no-color", "testdata/testmodule")
 	fmt.Println(output)
 	assert.NoError(t, err)
-	assert.Contains(t, output, "baz = bazvalue")
-	assert.Contains(t, output, "foo = foovalue")
+	assert.Contains(t, output, `baz = bazvalue
+foo = 42
+mapvar = {
+  entry1 = {
+    value1 = testvalue1
+    value2 = true
+  }
+  entry2 = {
+    value1 = testvalue2
+    value2 = false
+  }
+}`)
 }
 
 func buildBinary(dir string) string {
-	log.Println("Building application...")
+	fmt.Println("Building application...")
 	binary := filepath.Join(dir, "gotf")
 	output, err := runProcess("go", "build", "-o", binary, "..")
 	if err != nil {
-		log.Println(output)
+		fmt.Println(output)
 		panic(err)
 	}
-	log.Println("Build finished successfully")
-	log.Printf("Using binary for test: %v\n", binary)
+	fmt.Println("Build finished successfully")
+	fmt.Printf("Using binary for test: %v\n\n", binary)
 	return binary
 }
 

test/testdata/test_config.yaml

@@ -1,8 +1,19 @@
 varsFiles:
   - testmodule/test.tfvars
 vars:
-  foo: foovalue
+  foo: 42
+  mapvar: |-
+    {
+      entry1 = {
+        value1 = testvalue1
+        value2 = true
+      }
+      entry2 = {
+        value1 = testvalue2
+        value2 = false
+      }
+    }
 envs:
-  bar: barvalue
+  BAR: barvalue
 backendConfigs:
   path: testdata/.tfstate/terraform.tfstate

test/testdata/testmodule/test.tf

@@ -6,6 +6,8 @@ variable "foo" {}
 
 variable "baz" {}
 
+variable "mapvar" {}
+
 output "foo" {
   value = var.foo
 }
@@ -14,6 +16,10 @@ output "baz" {
   value = var.baz
 }
 
+output "mapvar" {
+  value   = var.mapvar
+}
+
 resource "null_resource" "echo" {
   provisioner "local-exec" {
     command = "echo foo=${var.foo}"