ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29986 from hashicorp/alisdair/fix-nested-map-indentation 

cli: Fix nested single and map diff rendering
This commit is contained in:
Alisdair McDiarmid 2021-11-22 10:17:54 -05:00 committed by GitHub
parent ec3058d551 a8b9d086b2
commit a8972d82e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/command/format/diff.go
View File

@ -461,10 +461,10 @@ func (p *blockBodyDiffPrinter) writeNestedAttrDiff(
if action != plans.NoOp && (p.pathForcesNewResource(path) || p.pathForcesNewResource(path[:len(path)-1])) { if action != plans.NoOp && (p.pathForcesNewResource(path) || p.pathForcesNewResource(path[:len(path)-1])) {
p.buf.WriteString(p.color.Color(forcesNewResourceCaption)) p.buf.WriteString(p.color.Color(forcesNewResourceCaption))
} }
p.writeAttrsDiff(objS.Attributes, old, new, indent+2, path, result) p.writeAttrsDiff(objS.Attributes, old, new, indent+4, path, result)
p.writeSkippedAttr(result.skippedAttributes, indent+4) p.writeSkippedAttr(result.skippedAttributes, indent+6)
p.buf.WriteString("\n") p.buf.WriteString("\n")
p.buf.WriteString(strings.Repeat(" ", indent)) p.buf.WriteString(strings.Repeat(" ", indent+2))
p.buf.WriteString("}") p.buf.WriteString("}")
case configschema.NestingList: case configschema.NestingList:
@ -690,15 +690,15 @@ func (p *blockBodyDiffPrinter) writeNestedAttrDiff(
} }
path := append(path, cty.IndexStep{Key: cty.StringVal(k)}) path := append(path, cty.IndexStep{Key: cty.StringVal(k)})
p.writeAttrsDiff(objS.Attributes, oldValue, newValue, indent+6, path, result) p.writeAttrsDiff(objS.Attributes, oldValue, newValue, indent+8, path, result)
p.writeSkippedAttr(result.skippedAttributes, indent+8) p.writeSkippedAttr(result.skippedAttributes, indent+10)
p.buf.WriteString("\n") p.buf.WriteString("\n")
p.buf.WriteString(strings.Repeat(" ", indent+4)) p.buf.WriteString(strings.Repeat(" ", indent+6))
p.buf.WriteString("},\n") p.buf.WriteString("},\n")
} }
} }
p.writeSkippedElems(unchanged, indent+4) p.writeSkippedElems(unchanged, indent+6)
p.buf.WriteString(strings.Repeat(" ", indent+2)) p.buf.WriteString(strings.Repeat(" ", indent+2))
p.buf.WriteString("}") p.buf.WriteString("}")
if !new.IsKnown() { if !new.IsKnown() {