IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-01-27 00:46:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32840 from hashicorp/jbardin/render-output-crash

Browse Source 
Prevent nil Colorize options when rendering state outputs
This commit is contained in:
James Bardin 2023-03-14 14:28:03 -04:00 committed by GitHub
commit ccb376a189
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/command/jsonformat/renderer.go
View File

@ -81,10 +81,9 @@ func (renderer Renderer) RenderHumanState(state State) {
return
}
opts := computed.RenderHumanOpts{
ShowUnchangedChildren: true,
HideDiffActionSymbols: true,
}
opts := computed.NewRenderHumanOpts(renderer.Colorize)
opts.ShowUnchangedChildren = true
opts.HideDiffActionSymbols = true
state.renderHumanStateModule(renderer, state.RootModule, opts, true)
state.renderHumanStateOutputs(renderer, opts)
@ -119,11 +118,11 @@ func (r Renderer) RenderLog(log *JSONLog) error {
return err
}
opts := computed.NewRenderHumanOpts(r.Colorize)
opts.ShowUnchangedChildren = true
outputDiff := change.ComputeDiffForType(ctype)
outputStr := outputDiff.RenderHuman(0, computed.RenderHumanOpts{
Colorize: r.Colorize,
ShowUnchangedChildren: true,
})
outputStr := outputDiff.RenderHuman(0, opts)
msg := fmt.Sprintf("%s = %s", name, outputStr)
r.Streams.Println(msg)

7
internal/command/show_test.go
View File

@ -447,6 +447,13 @@ func TestShow_plan_json(t *testing.T) {
func TestShow_state(t *testing.T) {
originalState := testState()
root := originalState.RootModule()
root.SetOutputValue("test", cty.ObjectVal(map[string]cty.Value{
"attr": cty.NullVal(cty.DynamicPseudoType),
"null": cty.NullVal(cty.String),
"list": cty.ListVal([]cty.Value{cty.NullVal(cty.Number)}),
}), false)
statePath := testStateFile(t, originalState)
defer os.RemoveAll(filepath.Dir(statePath))