update scan test cases for scans parameters

Freedisch · Freedisch · commit 5149507f0420 · 2024-06-17T02:38:38.000+02:00
Signed-off-by: freedisch &lt;freeproduc@gmail.com&gt;
diff --git a/scbctl/cmd/scans.go b/scbctl/cmd/scans.go
@@ -12,6 +12,7 @@ import (
 	v1 "github.com/secureCodeBox/secureCodeBox/operator/apis/execution/v1"
 	kubernetes "github.com/secureCodeBox/secureCodeBox/scbctl/pkg"
 	"github.com/spf13/cobra"
+	metav2 "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -29,30 +30,26 @@ func init() {
 }
 
 var ScanCmd = &cobra.Command{
-	Use:   "scan [name] [target]",
+	Use:   "scan [name] -- [parameters...]",
 	Short: "Create a new scanner",
 	Long:  `Create a new execution (Scan) in the default namespace if no namespace is provided`,
 	Example: `
 	# Create a new scan
 	scbctl scan nmap 
 	# Create in a different namespace
-	scbctl scan nmap scanme.nmap.org --namespace foobar
+	scbctl scan --namespace foobar nmap -- scanme.nmap.org -p 90
 	`,
+	SilenceUsage: true,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		if len(args) < 2 {
-			return errors.New("You must specify the name of the scan and the target")
-		}
 
 		scanName := args[0]
 		paramIndex := cmd.ArgsLenAtDash()
 		if paramIndex == -1 {
 			return errors.New("You must use '--' to separate scan parameters")
 		}
 
-
 		parameters := args[paramIndex:]
-		
-	
+
 		fmt.Println("🎬 Initializing Kubernetes client")
 
 		kubeclient, namespace, err := clientProvider.GetClient(kubeconfigArgs)
@@ -76,7 +73,7 @@ var ScanCmd = &cobra.Command{
 				Namespace: namespace,
 			},
 			Spec: v1.ScanSpec{
-				ScanType: scanName,
+				ScanType:   scanName,
 				Parameters: parameters,
 			},
 		}
@@ -85,6 +82,9 @@ var ScanCmd = &cobra.Command{
 
 		err = kubeclient.Create(context.TODO(), scan)
 		if err != nil {
+			if metav2.IsNotFound(err) {
+				return fmt.Errorf("failed to create Scan: namespace '%s' not found", namespace)
+			}
 			return fmt.Errorf("Failed to create Scan: %s", err)
 		}
 
diff --git a/scbctl/cmd/scans_test.go b/scbctl/cmd/scans_test.go
@@ -36,19 +36,19 @@ func TestScanCommand(t *testing.T) {
 		expectedError error
 	}{
 		{
-			name:          "Valid entry",
-			args:          []string{"nmap", "scanme.nmap.org"},
+			name:          "Valid entry ",
+			args:          []string{"nmap", "--", "scanme.nmap.org"},
 			expectedError: nil,
 		},
 		{
-			name:          "Missing values",
-			args:          []string{},
-			expectedError: errors.New("You must specify the name of the scan and the target"),
+			name:          "Valid entry with namespace",
+			args:          []string{"nmap", "--", "scanme.nmap.org"},
+			expectedError: nil,
 		},
 		{
-			name:          "Missing target name",
+			name:          "No scan parameters provided",
 			args:          []string{"nmap"},
-			expectedError: errors.New("You must specify the name of the scan and the target"),
+			expectedError: errors.New("You must use '--' to separate scan parameters"),
 		},
 	}
 
@@ -62,11 +62,15 @@ func TestScanCommand(t *testing.T) {
 			}
 
 			cmd := &cobra.Command{
-				RunE: func(cmd *cobra.Command, args []string) error {
-					return ScanCmd.RunE(cmd, tc.args)
-				},
+				Use:     ScanCmd.Use,
+				Short:   ScanCmd.Short,
+				Long:    ScanCmd.Long,
+				Example: ScanCmd.Example,
+				RunE:    ScanCmd.RunE,
 			}
 
+			cmd.SetArgs(tc.args)
+
 			err := cmd.Execute()
 			if tc.expectedError != nil {
 				if err == nil || err.Error() != tc.expectedError.Error() {
