IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-16 18:35:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19250 from hashicorp/f-inputs

Browse Source 
Fix the ability to ask for and save user input
This commit is contained in:
Sander van Harmelen 2018-11-01 20:14:52 +01:00 committed by GitHub
commit 643fccc923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/meta_backend.go
View File

@ -869,7 +869,7 @@ func (m *Meta) backendInitFromConfig(c *configs.Backend) (backend.Backend, cty.V
b := f() b := f()
schema := b.ConfigSchema() schema := b.ConfigSchema()
decSpec := schema.DecoderSpec() decSpec := schema.NoneRequired().DecoderSpec()
configVal, hclDiags := hcldec.Decode(c.Config, decSpec, nil) configVal, hclDiags := hcldec.Decode(c.Config, decSpec, nil)
diags = diags.Append(hclDiags) diags = diags.Append(hclDiags)
if hclDiags.HasErrors() { if hclDiags.HasErrors() {

6
command/meta_config.go
View File

@ -231,12 +231,10 @@ func (m *Meta) inputForSchema(given cty.Value, schema *configschema.Block) (cty.
return given, nil return given, nil
} }
givenVals := given.AsValueMap() retVals := given.AsValueMap()
retVals := make(map[string]cty.Value, len(givenVals))
names := make([]string, 0, len(schema.Attributes)) names := make([]string, 0, len(schema.Attributes))
for name, attrS := range schema.Attributes { for name, attrS := range schema.Attributes {
retVals[name] = givenVals[name] if attrS.Required && retVals[name].IsNull() && attrS.Type.IsPrimitiveType() {
if givenVal := givenVals[name]; attrS.Required && givenVal.IsNull() && attrS.Type.IsPrimitiveType() {
names = append(names, name) names = append(names, name)
} }
} }