diff --git a/diff/diff.go b/diff/diff.go index bce80e86..c4634c84 100644 --- a/diff/diff.go +++ b/diff/diff.go @@ -20,6 +20,7 @@ import ( // Manifests diff on manifests func Manifests(oldIndex, newIndex map[string]*manifest.MappingResult, suppressedKinds []string, showSecrets bool, context int, output string, stripTrailingCR bool, to io.Writer) bool { + report := Report{} report.setupReportFormat(output) seenAnyChanges := false emptyMapping := &manifest.MappingResult{} @@ -148,7 +149,7 @@ func Releases(oldIndex, newIndex map[string]*manifest.MappingResult, suppressedK return Manifests(oldIndex, newIndex, suppressedKinds, showSecrets, context, output, stripTrailingCR, to) } -func diffMappingResults(oldContent *manifest.MappingResult, newContent *manifest.MappingResult, stripTrailingCR bool ) []difflib.DiffRecord { +func diffMappingResults(oldContent *manifest.MappingResult, newContent *manifest.MappingResult, stripTrailingCR bool) []difflib.DiffRecord { return diffStrings(oldContent.Content, newContent.Content, stripTrailingCR) } diff --git a/diff/report.go b/diff/report.go index 4bfd830c..4a1c8bd3 100644 --- a/diff/report.go +++ b/diff/report.go @@ -52,19 +52,17 @@ type ReportTemplateSpec struct { Change string } -var report Report - // setupReportFormat: process output argument. func (r *Report) setupReportFormat(format string) { switch format { case "simple": - setupSimpleReport(&report) + setupSimpleReport(r) case "template": - setupTemplateReport(&report) + setupTemplateReport(r) case "json": - setupJSONReport(&report) + setupJSONReport(r) default: - setupDiffReport(&report) + setupDiffReport(r) } } @@ -126,7 +124,7 @@ func printSimpleReport(r *Report, to io.Writer) { "MODIFY": 0, } for _, entry := range r.entries { - fmt.Fprintf(to, ansi.Color("%s %s", report.format.changestyles[entry.changeType].color)+"\n", + fmt.Fprintf(to, ansi.Color("%s %s", r.format.changestyles[entry.changeType].color)+"\n", entry.key, r.format.changestyles[entry.changeType].message, )