Merge pull request #10 from replicatedhq/redactor-cmd

Redactions can be disabled with CLI
replicatedhq · Jul 18, 2019 · 58d088b · 58d088b
2 parents 9d5e80f + 82ff465
commit 58d088b
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 8 deletions.
diff --git a/cmd/collector/cli/run.go b/cmd/collector/cli/run.go
@@ -15,6 +15,7 @@ func Run() *cobra.Command {
 		Long:  `...`,
 		PreRun: func(cmd *cobra.Command, args []string) {
 			viper.BindPFlag("collector", cmd.Flags().Lookup("collector"))
+			viper.BindPFlag("redact", cmd.Flags().Lookup("redact"))
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			v := viper.GetViper()
@@ -25,7 +26,8 @@ func Run() *cobra.Command {
 			}
 
 			collector := collect.Collector{
-				Spec: string(specContents),
+				Spec:   string(specContents),
+				Redact: v.GetBool("redact"),
 			}
 			if err := collector.RunCollectorSync(); err != nil {
 				return err
@@ -36,6 +38,7 @@ func Run() *cobra.Command {
 	}
 
 	cmd.Flags().String("collector", "", "path to a single collector spec to collect")
+	cmd.Flags().Bool("redact", true, "enable/disable default redactions")
 
 	cmd.MarkFlagRequired("collector")
 

diff --git a/cmd/troubleshoot/cli/run.go b/cmd/troubleshoot/cli/run.go
@@ -24,6 +24,7 @@ troubleshoot run --collectors application --wait
 			viper.BindPFlag("kubecontext", cmd.Flags().Lookup("kubecontext"))
 			viper.BindPFlag("image", cmd.Flags().Lookup("image"))
 			viper.BindPFlag("pullpolicy", cmd.Flags().Lookup("pullpolicy"))
+			viper.BindPFlag("redact", cmd.Flags().Lookup("redact"))
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			v := viper.GetViper()
@@ -43,6 +44,7 @@ troubleshoot run --collectors application --wait
 
 	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().Bool("redact", true, "enable/disable default redactions")
 
 	viper.BindPFlags(cmd.Flags())
 

diff --git a/cmd/troubleshoot/cli/run_crd.go b/cmd/troubleshoot/cli/run_crd.go
@@ -55,6 +55,7 @@ func runTroubleshootCRD(v *viper.Viper) error {
 			},
 			Image:           v.GetString("image"),
 			ImagePullPolicy: v.GetString("pullpolicy"),
+			Redact:          v.GetBool("redact"),
 		},
 	}
 	if _, err := troubleshootClient.CollectorJobs(v.GetString("namespace")).Create(&collectorJob); err != nil {

diff --git a/config/crds/troubleshoot.replicated.com_collectorjobs.yaml b/config/crds/troubleshoot.replicated.com_collectorjobs.yaml
@@ -404,6 +404,8 @@ spec:
                 type: string
               imagePullPolicy:
                 type: string
+              redact:
+                type: boolean
             required:
             - collector
             type: object

diff --git a/pkg/apis/troubleshoot/v1beta1/collectorjob_types.go b/pkg/apis/troubleshoot/v1beta1/collectorjob_types.go
@@ -31,6 +31,7 @@ type CollectorJobSpec struct {
 
 	Image           string `json:"image,omitempty"`
 	ImagePullPolicy string `json:"imagePullPolicy,omitempty"`
+	Redact          bool   `json:"redact,omitempty"`
 }
 
 // CollectorJobStatus defines the observed state of CollectorJob

diff --git a/pkg/collect/cluster_resources.go b/pkg/collect/cluster_resources.go
@@ -22,7 +22,7 @@ type ClusterResourcesOutput struct {
 	CustomResourceDefinitions []byte            `json:"cluster-resources/custom-resource-definitions.json,omitempty"`
 }
 
-func ClusterResources() error {
+func ClusterResources(redact bool) error {
 	cfg, err := config.GetConfig()
 	if err != nil {
 		return err
@@ -92,12 +92,14 @@ func ClusterResources() error {
 	}
 	clusterResourcesOutput.CustomResourceDefinitions = customResourceDefinitions
 
-	redacted, err := clusterResourcesOutput.Redact()
-	if err != nil {
-		return err
+	if redact {
+		clusterResourcesOutput, err = clusterResourcesOutput.Redact()
+		if err != nil {
+			return err
+		}
 	}
 
-	b, err := json.MarshalIndent(redacted, "", "  ")
+	b, err := json.MarshalIndent(clusterResourcesOutput, "", "  ")
 	if err != nil {
 		return err
 	}

diff --git a/pkg/collect/collector.go b/pkg/collect/collector.go
@@ -8,7 +8,8 @@ import (
 )
 
 type Collector struct {
-	Spec string
+	Spec   string
+	Redact bool
 }
 
 func (c *Collector) RunCollectorSync() error {
@@ -21,7 +22,7 @@ func (c *Collector) RunCollectorSync() error {
 		return ClusterInfo()
 	}
 	if collect.ClusterResources != nil {
-		return ClusterResources()
+		return ClusterResources(c.Redact)
 	}
 	if collect.Secret != nil {
 		return Secret(collect.Secret)

diff --git a/pkg/controller/collectorjob/collectorjob_controller.go b/pkg/controller/collectorjob/collectorjob_controller.go
@@ -387,6 +387,7 @@ func (r *ReconcileCollectorJob) createCollectorPod(instance *troubleshootv1beta1
 					Command:         []string{"collector"},
 					Args: []string{
 						"run",
+						fmt.Sprintf("--redact=%t", instance.Spec.Redact),
 						"--collector",
 						"/troubleshoot/specs/collector.yaml",
 					},