jprdonnelly/opentf
1
0
Fork 0
mirror of https://github.com/opentffoundation/opentf.git synced 2025-12-25 01:00:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Structured Plan Renderer: another round of fixes after more equivalence testing (#32537)

Browse Source 
* Structured Plan Renderer: another round of fixes after more equivalence testing

* fix sort function

* use new constants
This commit is contained in:
Liam Cervante
2023-01-20 09:24:22 +01:00
committed by GitHub
parent 125aaef9d9
commit 7d1ea52077
5 changed files with 90 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/command/jsonformat/computed/renderers/map.go
View File

@@ -15,7 +15,8 @@ var _ computed.DiffRenderer = (*mapRenderer)(nil)
func Map(elements map[string]computed.Diff) computed.DiffRenderer {
return &mapRenderer{
elements: elements,
elements: elements,
alignKeys: true,
}
}
@@ -34,6 +35,7 @@ type mapRenderer struct {
overrideNullSuffix bool
overrideForcesReplacement bool
alignKeys bool
}
func (renderer mapRenderer) RenderHuman(diff computed.Diff, indent int, opts computed.RenderHumanOpts) string {
@@ -83,14 +85,18 @@ func (renderer mapRenderer) RenderHuman(diff computed.Diff, indent int, opts com
for _, warning := range element.WarningsHuman(indent+1, opts) {
buf.WriteString(fmt.Sprintf("%s%s\n", formatIndent(indent+1), warning))
}
// Only show commas between elements for objects.
comma := ""
if _, ok := element.Renderer.(*objectRenderer); ok {
comma = ","
}
buf.WriteString(fmt.Sprintf("%s%s %-*s = %s%s\n", formatIndent(indent+1), colorizeDiffAction(element.Action, opts), maximumKeyLen, escapedKeys[key], element.RenderHuman(indent+1, elementOpts), comma))
if renderer.alignKeys {
buf.WriteString(fmt.Sprintf("%s%s %-*s = %s%s\n", formatIndent(indent+1), colorizeDiffAction(element.Action, opts), maximumKeyLen, escapedKeys[key], element.RenderHuman(indent+1, elementOpts), comma))
} else {
buf.WriteString(fmt.Sprintf("%s%s %s = %s%s\n", formatIndent(indent+1), colorizeDiffAction(element.Action, opts), escapedKeys[key], element.RenderHuman(indent+1, elementOpts), comma))
}
}
if unchangedElements > 0 {