added-integration-tests

Author: cx-hitesh-madgulkar

internal/commands/scan.go

@@ -122,7 +122,7 @@ const (
 
 	jsonExt            = ".json"
 	xmlExt             = ".xml"
-	sbomScanTypeErrMsg = "--sbom-only flag is only supported with scan type: sca"
+	sbomScanTypeErrMsg = "The --sbom-only flag can only be used with scan type: sca"
 )
 
 var (
@@ -811,7 +811,7 @@ func scanCreateSubCommand(
 	createScanCmd.PersistentFlags().String(commonParams.ContainersImageTagFilterFlag, "", "Exclude images by image name and/or tag, ex: \"*dev\"")
 
 	// reading sbom-only flag
-	createScanCmd.PersistentFlags().Bool(commonParams.SbomFlag, false, "Execute SBOM scan exclusively on the provided XML/JSON file.")
+	createScanCmd.PersistentFlags().Bool(commonParams.SbomFlag, false, "Run an SBOM scan only on the specified XML or JSON file.")
 
 	return createScanCmd
 }
@@ -3152,7 +3152,7 @@ func createMinimalZipFile() (string, error) {
 func isValidJSONOrXML(path string) (bool, error) {
 	ext := strings.ToLower(filepath.Ext(path))
 	if ext != jsonExt && ext != xmlExt {
-		return false, nil
+		return false, fmt.Errorf("not a JSON/XML file, provide valid JSON/XMl file")
 	}
 
 	data, err := ioutil.ReadFile(path)

test/integration/scan_test.go

@@ -2373,3 +2373,48 @@ func TestCreateScan_WithScaResolver_ZipSource_Fail(t *testing.T) {
 	err, _ := executeCommand(t, args...)
 	assert.Error(t, err, "Scanning Zip files is not supported by ScaResolver.Please use non-zip source")
 }
+
+func TestCreateScan_SbomScanForInvalidScanTypes(t *testing.T) {
+	args := []string{
+		"scan", "create",
+		flag(params.ProjectName), "random_proj",
+		flag(params.SourcesFlag), "data/project-with-directory-symlink",
+		flag(params.ScanTypes), "sast,sca",
+		flag(params.BranchFlag), "dummy_branch",
+		flag(params.SbomFlag),
+	}
+
+	err, _ := executeCommand(t, args...)
+	assert.Error(t, err, "The --sbom-only flag can only be used with scan type: sca")
+
+}
+
+func TestCreateScan_SbomScanForInvalidFileExtension(t *testing.T) {
+	args := []string{
+		"scan", "create",
+		flag(params.ProjectName), "random_proj",
+		flag(params.SourcesFlag), "data/project-with-directory-symlink",
+		flag(params.ScanTypes), "sca",
+		flag(params.BranchFlag), "dummy_branch",
+		flag(params.SbomFlag),
+	}
+
+	err, _ := executeCommand(t, args...)
+	assert.Error(t, err, "Failed creating a scan: Input in bad format: not a JSON/XML file, provide valid JSON/XMl file")
+
+}
+
+func TestCreateScan_SbomScanForNotExistingFile(t *testing.T) {
+	args := []string{
+		"scan", "create",
+		flag(params.ProjectName), "random_proj",
+		flag(params.SourcesFlag), "data/sbom.json",
+		flag(params.ScanTypes), "sca",
+		flag(params.BranchFlag), "dummy_branch",
+		flag(params.SbomFlag),
+	}
+
+	err, _ := executeCommand(t, args...)
+	assert.ErrorContains(t, err, "Failed creating a scan: Input in bad format: failed to read file:")
+
+}