From 5944e8e34fa435ab1b5323a8c42a8a4f86ef676c Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Thu, 1 Nov 2018 19:59:07 +0100 Subject: [PATCH] Fix the ability to ask for and save user input --- command/meta_backend.go | 2 +- command/meta_config.go | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/command/meta_backend.go b/command/meta_backend.go index 7b3925789..2208d4df9 100644 --- a/command/meta_backend.go +++ b/command/meta_backend.go @@ -869,7 +869,7 @@ func (m *Meta) backendInitFromConfig(c *configs.Backend) (backend.Backend, cty.V b := f() schema := b.ConfigSchema() - decSpec := schema.DecoderSpec() + decSpec := schema.NoneRequired().DecoderSpec() configVal, hclDiags := hcldec.Decode(c.Config, decSpec, nil) diags = diags.Append(hclDiags) if hclDiags.HasErrors() { diff --git a/command/meta_config.go b/command/meta_config.go index 061e50f43..b7619dccf 100644 --- a/command/meta_config.go +++ b/command/meta_config.go @@ -231,12 +231,10 @@ func (m *Meta) inputForSchema(given cty.Value, schema *configschema.Block) (cty. return given, nil } - givenVals := given.AsValueMap() - retVals := make(map[string]cty.Value, len(givenVals)) + retVals := given.AsValueMap() names := make([]string, 0, len(schema.Attributes)) for name, attrS := range schema.Attributes { - retVals[name] = givenVals[name] - if givenVal := givenVals[name]; attrS.Required && givenVal.IsNull() && attrS.Type.IsPrimitiveType() { + if attrS.Required && retVals[name].IsNull() && attrS.Type.IsPrimitiveType() { names = append(names, name) } }