Add string validation for docker scan

Author: hadarshjfrog

scans_test.go

@@ -174,7 +174,12 @@ func runDockerScan(t *testing.T, testCli *coreTests.JfrogCli, imageName, watchNa
 			if validateSecrets {
 				validations.VerifySimpleJsonResults(t, output, validations.ValidationParams{Inactive: minInactives})
 			} else {
-				validations.VerifyJsonResults(t, output, validations.ValidationParams{Vulnerabilities: minVulnerabilities, Licenses: minLicenses})
+				validations.VerifyJsonResults(t, output, validations.ValidationParams{
+					Vulnerabilities: minVulnerabilities,
+					Licenses:        minLicenses,
+					//ExistingProperties: []string{"targets[].sca_scans.xray_scan[].vulnerabilities[].components[*].impact_paths[][].full_path"}})
+					//ExistingProperties: []string{"vulnerabilities[].components[*].impact_paths[][].full_path"}})
+					ExistingProperties: []string{"impact_paths", "full_path"}})
 			}
 		}
 		// Run docker scan on image with watch
@@ -184,7 +189,7 @@ func runDockerScan(t *testing.T, testCli *coreTests.JfrogCli, imageName, watchNa
 		cmdArgs = append(cmdArgs, "--watches="+watchName)
 		output = testCli.WithoutCredentials().RunCliCmdWithOutput(t, cmdArgs...)
 		if assert.NotEmpty(t, output) {
-			validations.VerifyJsonResults(t, output, validations.ValidationParams{SecurityViolations: minViolations})
+			validations.VerifyJsonResults(t, output, validations.ValidationParams{SecurityViolations: minViolations, Vulnerabilities: 0})
 		}
 	}
 }

utils/validations/test_validate_sca.go

@@ -3,6 +3,8 @@ package validations
 import (
 	"encoding/json"
 	"fmt"
+	"reflect"
+	"strings"
 	"testing"
 
 	"github.com/jfrog/jfrog-cli-security/utils"
@@ -37,6 +39,13 @@ func ValidateCommandJsonOutput(t *testing.T, params ValidationParams) {
 		if params.FailBuild == true {
 			ValidateScanResponseFailBuild(t, params.FailBuildCVESeverity, results)
 		}
+		if params.ExistingProperties != nil {
+			//TODO: TEMP Function - to use ValidatePaths
+			ValidateContainedStrings(t, fmt.Sprintf("%v", results), params.ExistingProperties)
+			//for _, res := range results {
+			//	ValidatePaths(t, res, params.ExistingProperties)
+			//}
+		}
 	}
 }
 
@@ -96,3 +105,9 @@ func getScanResponseByScanId(scanId string, content []services.ScanResponse) *se
 	}
 	return nil
 }
+
+func ValidateContainedStrings(t *testing.T, output string, strings []string) {
+	for _, str := range strings {
+		assert.Contains(t, output, str, "string not found: %s", str)
+	}
+}

utils/validations/test_validation.go

@@ -26,6 +26,8 @@ type ValidationParams struct {
 	Actual interface{}
 	// If provided, the test will check if the content matches the expected results.
 	Expected interface{}
+	// If provided, will go through this list of point attribute - and validate they exists in the actual content.
+	ExistingProperties []string
 	// If provided, the test will check exact values and not only the minimum values / existence.
 	ExactResultsMatch bool
 	// Expected issues for each type to check if the content has the correct amount of issues.