Cleaning up name / collectorName

Author: marccampbell

cmd/preflight/cli/root.go

@@ -27,12 +27,7 @@ that a cluster meets the requirements to run an application.`,
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			v := viper.GetViper()
-
-			if len(args) == 0 {
-				return runPreflightsCRD(v)
-			}
-
-			return runPreflightsNoCRD(v, args[0])
+			return runPreflights(v, args[0])
 		},
 	}
 

cmd/preflight/cli/run_nocrd.go renamed to cmd/preflight/cli/run.go

@@ -22,7 +22,7 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-func runPreflightsNoCRD(v *viper.Viper, arg string) error {
+func runPreflights(v *viper.Viper, arg string) error {
 	fmt.Print(cursor.Hide())
 	defer fmt.Print(cursor.Show())
 

cmd/preflight/cli/run_crd.go

@@ -30,12 +30,7 @@ from a server that can be used to assist when troubleshooting a server.`,
 			v := viper.GetViper()
 
 			logger.SetQuiet(v.GetBool("quiet"))
-
-			if len(args) == 0 {
-				return runTroubleshootCRD(v)
-			}
-
-			return runTroubleshootNoCRD(v, args[0])
+			return runTroubleshoot(v, args[0])
 		},
 	}
 

cmd/troubleshoot/cli/root.go

@@ -22,7 +22,7 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-func runTroubleshootNoCRD(v *viper.Viper, arg string) error {
+func runTroubleshoot(v *viper.Viper, arg string) error {
 	fmt.Print(cursor.Hide())
 	defer fmt.Print(cursor.Show())
 

cmd/troubleshoot/cli/run_nocrd.go renamed to cmd/troubleshoot/cli/run.go

@@ -12,7 +12,7 @@ type ClusterResources struct {
 
 type Secret struct {
 	CollectorMeta `json:",inline" yaml:",inline"`
-	Name          string `json:"name" yaml:"name"`
+	SecretName    string `json:"name" yaml:"name"`
 	Namespace     string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
 	Key           string `json:"key,omitempty" yaml:"key,omitempty"`
 	IncludeValue  bool   `json:"includeValue,omitempty" yaml:"includeValue,omitempty"`

cmd/troubleshoot/cli/run_crd.go

@@ -60,11 +60,11 @@ func Secret(ctx *Context, secretCollector *troubleshootv1beta1.Secret) ([]byte,
 }
 
 func secret(client *kubernetes.Clientset, secretCollector *troubleshootv1beta1.Secret) (*FoundSecret, []byte, error) {
-	found, err := client.CoreV1().Secrets(secretCollector.Namespace).Get(secretCollector.Name, metav1.GetOptions{})
+	found, err := client.CoreV1().Secrets(secretCollector.Namespace).Get(secretCollector.SecretName, metav1.GetOptions{})
 	if err != nil {
 		missingSecret := FoundSecret{
 			Namespace:    secretCollector.Namespace,
-			Name:         secretCollector.Name,
+			Name:         secretCollector.SecretName,
 			SecretExists: false,
 		}
 

pkg/apis/troubleshoot/v1beta1/collector_shared.go

@@ -22,7 +22,7 @@ func DeterministicIDForCollector(collector *troubleshootv1beta1.Collect) string
 	}
 
 	if collector.Secret != nil {
-		unsafeID = fmt.Sprintf("secret-%s-%s", collector.Secret.Namespace, collector.Secret.Name)
+		unsafeID = fmt.Sprintf("secret-%s-%s", collector.Secret.Namespace, collector.Secret.SecretName)
 	}
 
 	if collector.Logs != nil {

pkg/collect/secret.go

@@ -52,8 +52,8 @@ func Test_DeterministicIDForCollector(t *testing.T) {
 			name: "secret",
 			collector: &troubleshootv1beta1.Collect{
 				Secret: &troubleshootv1beta1.Secret{
-					Name:      "secret-agent-woman",
-					Namespace: "top-secret",
+					SecretName: "secret-agent-woman",
+					Namespace:  "top-secret",
 				},
 			},
 			expect: "secret-top-secret-secret-agent-woman",