Merge pull request #183 from replicatedhq/laverya/allow-specifying-multiple-redact-specs

allow specifying multiple redact specs

Author: laverya

cmd/troubleshoot/cli/root.go

@@ -43,7 +43,7 @@ from a server that can be used to assist when troubleshooting a server.`,
 	cmd.Flags().String("collectors", "", "name of the collectors to use")
 	cmd.Flags().String("image", "", "the full name of the collector image to use")
 	cmd.Flags().String("pullpolicy", "", "the pull policy of the collector image")
-	cmd.Flags().String("redactors", "", "name of the additional redactors to use")
+	cmd.Flags().StringSlice("redactors", []string{}, "names of the additional redactors to use")
 	cmd.Flags().Bool("redact", true, "enable/disable default redactions")
 	cmd.Flags().Bool("collect-without-permissions", false, "always run troubleshoot collectors even if some require permissions that troubleshoot does not have")
 

cmd/troubleshoot/cli/run.go

@@ -59,19 +59,21 @@ func runTroubleshoot(v *viper.Viper, arg string) error {
 	collector := obj.(*troubleshootv1beta1.Collector)
 
 	additionalRedactors := &troubleshootv1beta1.Redactor{}
-	if v.GetString("redactors") != "" {
-		redactorContent, err := loadSpec(v, v.GetString("redactors"))
+	for idx, redactor := range v.GetStringSlice("redactors") {
+		redactorContent, err := loadSpec(v, redactor)
 		if err != nil {
-			return errors.Wrap(err, "failed to load redactor spec")
+			return errors.Wrapf(err, "failed to load redactor spec #%d", idx)
 		}
 		obj, _, err := decode([]byte(redactorContent), nil, nil)
 		if err != nil {
-			return errors.Wrapf(err, "failed to parse redactors %s", v.GetString("redactors"))
+			return errors.Wrapf(err, "failed to parse redactors %s", redactor)
 		}
-		var ok bool
-		additionalRedactors, ok = obj.(*troubleshootv1beta1.Redactor)
+		loopRedactors, ok := obj.(*troubleshootv1beta1.Redactor)
 		if !ok {
-			return fmt.Errorf("%s is not a troubleshootv1beta1 redactor type", v.GetString("redactors"))
+			return fmt.Errorf("%s is not a troubleshootv1beta1 redactor type", redactor)
+		}
+		if loopRedactors != nil {
+			additionalRedactors.Spec.Redactors = append(additionalRedactors.Spec.Redactors, loopRedactors.Spec.Redactors...)
 		}
 	}