Fix regression introduced by --show-secrets

databus23 · databus23 · commit ee66774a0730 · 2020-02-26T17:48:00.000+01:00
diff --git a/diff/diff.go b/diff/diff.go
@@ -70,7 +70,7 @@ func Manifests(oldIndex, newIndex map[string]*manifest.MappingResult, suppressed
 }
 
 func redactSecrets(old, new *manifest.MappingResult) {
-	if old != nil && old.Kind != "Secret" && new != nil && new.Kind != "Secret" {
+	if (old != nil && old.Kind != "Secret") || (new != nil && new.Kind != "Secret") {
 		return
 	}
 	serializer := json.NewYAMLSerializer(json.DefaultMetaFactory, scheme.Scheme,

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func Manifests(oldIndex, newIndex map[string]*manifest.MappingResult, suppressed`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`func redactSecrets(old, new *manifest.MappingResult) {`
`73`		`- if old != nil && old.Kind != "Secret" && new != nil && new.Kind != "Secret" {`
	`73`	`+ if (old != nil && old.Kind != "Secret") \|\| (new != nil && new.Kind != "Secret") {`
`74`	`74`	`return`
`75`	`75`	`}`
`76`	`76`	`serializer := json.NewYAMLSerializer(json.DefaultMetaFactory, scheme.Scheme,`