Merge pull request #5 from nginxinc/mrajagopal-branch

Issue #4: Fix - validate namespaces input by user via cmdline

Author: mrajagopal

cmd/nic-supportpkg.go

@@ -24,28 +24,35 @@ func Execute() {
 				os.Exit(1)
 			}
 
-			for _, job := range jobs.JobList() {
-				fmt.Printf("Running job %s...", job.Name)
-				err = job.Collect(collector)
+			if collector.AllNamespacesExist() == true {
+				for _, job := range jobs.JobList() {
+					fmt.Printf("Running job %s...", job.Name)
+					err = job.Collect(collector)
+					if err != nil {
+						fmt.Printf(" Error: %s\n", err)
+					} else {
+						fmt.Print(" OK\n")
+					}
+				}
+
+				tarFile, err := collector.WrapUp()
 				if err != nil {
-					fmt.Printf(" Error: %s\n", err)
+					fmt.Println(fmt.Errorf("error when wrapping up: %s", err))
+					os.Exit(1)
 				} else {
-					fmt.Print(" OK\n")
+					fmt.Printf("Supportpkg successfully generated: %s\n", tarFile)
 				}
-			}
-
-			tarFile, err := collector.WrapUp()
-			if err != nil {
-				fmt.Println(fmt.Errorf("error when wrapping up: %s", err))
-				os.Exit(1)
 			} else {
-				fmt.Printf("Supportpkg successfully generated: %s\n", tarFile)
+				fmt.Println(" Error: Some namespaces do not exist")
 			}
 		},
 	}
 
 	rootCmd.Flags().StringSliceVarP(&namespaces, "namespace", "n", []string{}, "list of namespaces to collect information from")
-	rootCmd.MarkFlagRequired("namespace")
+	if err := rootCmd.MarkFlagRequired("namespace"); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
 	rootCmd.SetUsageTemplate("Usage: \n nic supportpkg [-n|--namespace] ns1 [-n|--namespace] ns2 ...\n nic supportpkg [-n|--namespace] ns1,ns2 ...\n")
 
 	if err := rootCmd.Execute(); err != nil {

pkg/data_collector/data_collector.go

@@ -10,6 +10,7 @@ import (
 	"io"
 	corev1 "k8s.io/api/core/v1"
 	crdClient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
@@ -175,3 +176,17 @@ func (c *DataCollector) PodExecutor(namespace string, pod string, command []stri
 		return nil, err
 	}
 }
+
+func (c *DataCollector) AllNamespacesExist() bool {
+	var allExist bool = true
+	for _, namespace := range c.Namespaces {
+		_, err := c.K8sCoreClientSet.CoreV1().Namespaces().Get(context.TODO(), namespace, metav1.GetOptions{})
+		if err != nil {
+			c.Logger.Printf("\t%s: %v\n", namespace, err)
+			fmt.Printf("\t%s: %v\n", namespace, err)
+			allExist = false
+		}
+	}
+
+	return allExist
+}