Merge pull request #176 from replicatedhq/laverya/include-collect-global-redactors

laverya · web-flow · commit 7be40ddf1632 · 2020-04-17T13:15:50.000-04:00
honor global redactors from collect spec
diff --git a/cmd/troubleshoot/cli/run.go b/cmd/troubleshoot/cli/run.go
@@ -262,6 +262,7 @@ func runCollectors(v *viper.Viper, collector troubleshootv1beta1.Collector, addi
 	if additionalRedactors != nil {
 		globalRedactors = additionalRedactors.Spec.Redactors
 	}
+	globalRedactors = append(globalRedactors, collector.Spec.GlobalRedactors...)
 
 	// Run preflights collectors synchronously
 	for _, collector := range collectors {

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ func runCollectors(v *viper.Viper, collector troubleshootv1beta1.Collector, addi`
`262`	`262`	`if additionalRedactors != nil {`
`263`	`263`	`globalRedactors = additionalRedactors.Spec.Redactors`
`264`	`264`	`}`
	`265`	`+ globalRedactors = append(globalRedactors, collector.Spec.GlobalRedactors...)`
`265`	`266`
`266`	`267`	`// Run preflights collectors synchronously`
`267`	`268`	`for _, collector := range collectors {`