update: add more test cases for scan parameters and fix failling CIs

Freedisch · Freedisch · commit 8bcf3d5c1ece · 2024-06-18T14:03:12.000+02:00
Signed-off-by: freedisch &lt;freeproduc@gmail.com&gt;
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -894,7 +894,6 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
 
       - name: Run tests
-        run: |
-          cd sbctcl
-          go test -v ./...
+        working-directory: scbtcl
+        run: go test -v ./...
         
diff --git a/scbctl/cmd/scans.go b/scbctl/cmd/scans.go
@@ -27,6 +27,7 @@ var (
 
 func init() {
 	utilruntime.Must(v1.AddToScheme(scheme))
+	ScanCmd.Flags().StringP("namespace", "n", "", "Namespace in which to create the scan")
 }
 
 var ScanCmd = &cobra.Command{
@@ -61,7 +62,7 @@ var ScanCmd = &cobra.Command{
 			namespace = namespaceFlag
 		}
 
-		fmt.Printf("🆕 Creating a new scan with name '%s' and target '%s'\n", scanName, strings.Join(parameters, " "))
+		fmt.Printf("🆕 Creating a new scan with name '%s' and parameters '%s'\n", scanName, strings.Join(parameters, " "))
 
 		scan := &v1.Scan{
 			TypeMeta: metav1.TypeMeta{
diff --git a/scbctl/cmd/scans_test.go b/scbctl/cmd/scans_test.go
@@ -40,9 +40,14 @@ func TestScanCommand(t *testing.T) {
 			args:          []string{"nmap", "--", "scanme.nmap.org"},
 			expectedError: nil,
 		},
+		{
+			name:          "Valid entry with multiple parameters",
+			args:          []string{"nmap", "--", "scanme.nmap.org", "-p", "90"},
+			expectedError: nil,
+		},
 		{
 			name:          "Valid entry with namespace",
-			args:          []string{"nmap", "--", "scanme.nmap.org"},
+			args:          []string{"scan", "--namespace", "foobar", "nmap", "--", "scanme.nmap.org"},
 			expectedError: nil,
 		},
 		{
@@ -69,7 +74,10 @@ func TestScanCommand(t *testing.T) {
 				RunE:    ScanCmd.RunE,
 			}
 
+			cmd.Flags().AddFlagSet(ScanCmd.Flags())
+
 			cmd.SetArgs(tc.args)
+			cmd.SilenceUsage = true
 
 			err := cmd.Execute()
 			if tc.expectedError != nil {
diff --git a/scbctl/go.mod b/scbctl/go.mod
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: the secureCodeBox authors
+//
+// SPDX-License-Identifier: Apache-2.0
 module github.com/secureCodeBox/secureCodeBox/scbctl
 
 go 1.22.0

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ var (`
`27`	`27`
`28`	`28`	`func init() {`
`29`	`29`	`utilruntime.Must(v1.AddToScheme(scheme))`
	`30`	`+ ScanCmd.Flags().StringP("namespace", "n", "", "Namespace in which to create the scan")`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`var ScanCmd = &cobra.Command{`
`@@ -61,7 +62,7 @@ var ScanCmd = &cobra.Command{`
`61`	`62`	`namespace = namespaceFlag`
`62`	`63`	`}`
`63`	`64`
`64`		`- fmt.Printf("🆕 Creating a new scan with name '%s' and target '%s'\n", scanName, strings.Join(parameters, " "))`
	`65`	`+ fmt.Printf("🆕 Creating a new scan with name '%s' and parameters '%s'\n", scanName, strings.Join(parameters, " "))`
`65`	`66`
`66`	`67`	`scan := &v1.Scan{`
`67`	`68`	`TypeMeta: metav1.TypeMeta{`