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

Move common IsMarked checks above switch statement

This commit is contained in:
Pam Selle 2020-10-01 14:34:44 -04:00
parent 1780351636
commit 52b6f7f53e
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
command/format/diff.go
View File

@ -777,23 +777,18 @@ func (p *blockBodyDiffPrinter) writeValueDiff(old, new cty.Value, indent int, pa
// However, these specialized implementations can apply only if both // However, these specialized implementations can apply only if both
// values are known and non-null. // values are known and non-null.
if old.IsKnown() && new.IsKnown() && !old.IsNull() && !new.IsNull() && typesEqual { if old.IsKnown() && new.IsKnown() && !old.IsNull() && !new.IsNull() && typesEqual {
if old.IsMarked() || new.IsMarked() {
p.buf.WriteString("(sensitive)")
return
}
switch { switch {
case ty == cty.Bool || ty == cty.Number:
if old.IsMarked() || new.IsMarked() {
p.buf.WriteString("(sensitive)")
return
}
case ty == cty.String: case ty == cty.String:
// We have special behavior for both multi-line strings in general // We have special behavior for both multi-line strings in general
// and for strings that can parse as JSON. For the JSON handling // and for strings that can parse as JSON. For the JSON handling
// to apply, both old and new must be valid JSON. // to apply, both old and new must be valid JSON.
// For single-line strings that don't parse as JSON we just fall // For single-line strings that don't parse as JSON we just fall
// out of this switch block and do the default old -> new rendering. // out of this switch block and do the default old -> new rendering.
if old.IsMarked() || new.IsMarked() {
p.buf.WriteString("(sensitive)")
return
}
oldS := old.AsString() oldS := old.AsString()
newS := new.AsString() newS := new.AsString()
@ -1070,11 +1065,6 @@ func (p *blockBodyDiffPrinter) writeValueDiff(old, new cty.Value, indent int, pa
return return
case ty.IsMapType(): case ty.IsMapType():
if old.IsMarked() || new.IsMarked() {
p.buf.WriteString("(sensitive)")
return
}
p.buf.WriteString("{") p.buf.WriteString("{")
if p.pathForcesNewResource(path) { if p.pathForcesNewResource(path) {
p.buf.WriteString(p.color.Color(forcesNewResourceCaption)) p.buf.WriteString(p.color.Color(forcesNewResourceCaption))