From 7a1592ff1e03ccf4bfb51955429d43b72f017802 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 18 Apr 2015 16:31:21 -0700 Subject: [PATCH] terraform: don't panic on input for bad default type [GH-1344] --- terraform/context.go | 2 ++ terraform/context_test.go | 22 +++++++++++++++++++ .../input-bad-var-default/main.tf | 5 +++++ 3 files changed, 29 insertions(+) create mode 100644 terraform/test-fixtures/input-bad-var-default/main.tf diff --git a/terraform/context.go b/terraform/context.go index 6beaab6360..b13f92f638 100644 --- a/terraform/context.go +++ b/terraform/context.go @@ -175,6 +175,8 @@ func (c *Context) Input(mode InputMode) error { v := m[n] switch v.Type() { + case config.VariableTypeUnknown: + continue case config.VariableTypeMap: continue case config.VariableTypeString: diff --git a/terraform/context_test.go b/terraform/context_test.go index a1cc68c4f0..dc0e1ccea6 100644 --- a/terraform/context_test.go +++ b/terraform/context_test.go @@ -2883,6 +2883,28 @@ func TestContext2Input(t *testing.T) { } } +func TestContext2Input_badVarDefault(t *testing.T) { + m := testModule(t, "input-bad-var-default") + p := testProvider("aws") + p.ApplyFn = testApplyFn + p.DiffFn = testDiffFn + ctx := testContext2(t, &ContextOpts{ + Module: m, + Providers: map[string]ResourceProviderFactory{ + "aws": testProviderFuncFixed(p), + }, + }) + + p.InputFn = func(i UIInput, c *ResourceConfig) (*ResourceConfig, error) { + c.Config["foo"] = "bar" + return c, nil + } + + if err := ctx.Input(InputModeStd); err != nil { + t.Fatalf("err: %s", err) + } +} + func TestContext2Input_provider(t *testing.T) { m := testModule(t, "input-provider") p := testProvider("aws") diff --git a/terraform/test-fixtures/input-bad-var-default/main.tf b/terraform/test-fixtures/input-bad-var-default/main.tf new file mode 100644 index 0000000000..b7b68a9270 --- /dev/null +++ b/terraform/test-fixtures/input-bad-var-default/main.tf @@ -0,0 +1,5 @@ +variable "test" { + default { + l = [1, 2, 3] + } +}