Merge branch 'main' into other/sumitmorchhale7898/engines-assignment

cx-sumit-morchhale · web-flow · commit 5e2fe38173b9 · 2025-04-22T12:35:46.000+05:30
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,11 +18,11 @@ jobs:
         run: |
           sudo chmod +x ./internal/commands/.scripts/up.sh
           ./internal/commands/.scripts/up.sh
-      - name: Check if total coverage is greater then 79.9
+      - name: Check if total coverage is greater then 78.2
         shell: bash
         run: |
           CODE_COV=$(go tool cover -func cover.out | grep total | awk '{print substr($3, 1, length($3)-1)}')
-          EXPECTED_CODE_COV=79.9
+          EXPECTED_CODE_COV=78.2
           var=$(awk 'BEGIN{ print "'$CODE_COV'"<"'$EXPECTED_CODE_COV'" }')
           if [ "$var" -eq 1 ];then
             echo "Your code coverage is too low. Coverage precentage is: $CODE_COV"
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM checkmarx/bash:5.2.37-r2-c5dcfc6a2fbe1c@sha256:c5dcfc6a2fbe1c8f9d11bdf902b5485bb78b4733864a99806749d5e244a6b75e
+FROM checkmarx/bash:5.2.37-r30-0714eec7a3fa2e@sha256:0714eec7a3fa2eadb3a6bdf2049bc158cc0311182a2475e8a467dbb2834df23f
 USER nonroot
 
 COPY cx /app/bin/cx
diff --git a/internal/commands/chat-kics.go b/internal/commands/chat-kics.go
@@ -160,16 +160,16 @@ func sendRequest(statefulWrapper gptWrapper.StatefulWrapper, azureAiEnabled bool
 			Feature:   featureName,
 		}
 		if azureAiEnabled {
-			logger.Printf("Sending message to Azure AI model for " + featureName + " guided remediation. RequestID: " + requestID)
+			logger.Printf("Sending message to Azure AI model for %s guided remediation. RequestID: %s", featureName, requestID)
 		} else {
-			logger.Printf("Sending message to Checkmarx AI model for " + featureName + " guided remediation. RequestID: " + requestID)
+			logger.Printf("Sending message to Checkmarx AI model for %s guided remediation. RequestID: %s", featureName, requestID)
 		}
 		response, err = chatKicsWrapper.SecureCall(statefulWrapper, id, newMessages, &metadata, customerToken)
 		if err != nil {
 			return nil, err
 		}
 	} else { // if chatgpt is enabled or no engine is enabled
-		logger.Printf("Sending message to ChatGPT model for " + featureName + " guided remediation. RequestID: " + requestID)
+		logger.Printf("Sending message to ChatGPT model for %s guided remediation. RequestID: %s", featureName, requestID)
 		response, err = chatKicsWrapper.Call(statefulWrapper, id, newMessages)
 		if err != nil {
 			return nil, err
diff --git a/internal/commands/chat-sast.go b/internal/commands/chat-sast.go
@@ -104,7 +104,7 @@ func getSastConversationDetails(cmd *cobra.Command, chatConversationID string, s
 		if userInput == "" {
 			msg := fmt.Sprintf(UserInputRequiredErrorFormat, params.ChatUserInput, params.ChatConversationID)
 			logger.PrintIfVerbose(msg)
-			return false, "", uuid.UUID{}, outputError(cmd, uuid.Nil, errors.Errorf(msg))
+			return false, "", uuid.UUID{}, outputError(cmd, uuid.Nil, errors.New(msg))
 		}
 	}
 
diff --git a/internal/commands/result.go b/internal/commands/result.go
@@ -234,13 +234,14 @@ func riskManagementSubCommand(riskManagement wrappers.RiskManagementWrapper, fea
 		Long:  "The risk-management command displays risk management results for a specific project in Checkmarx One",
 		Example: heredoc.Doc(
 			`
-			$ cx results risk-management --project-id <project Id> --limit <limit> (1-50, default: 50)
+			$ cx results risk-management --project-id <project Id> --scan-id <scan ID> --limit <limit> (1-50, default: 50)
 		`,
 		),
 		RunE: runRiskManagementCommand(riskManagement, featureFlagsWrapper),
 	}
 
 	riskManagementCmd.PersistentFlags().String(commonParams.ProjectIDFlag, "", "Project ID")
+	riskManagementCmd.PersistentFlags().String(commonParams.ScanIDFlag, "", "Scan ID")
 	riskManagementCmd.PersistentFlags().Int(commonParams.LimitFlag, -1, "Limit")
 
 	addFormatFlag(riskManagementCmd, printer.FormatJSON, printer.FormatTable, printer.FormatList)
@@ -355,14 +356,16 @@ func runRiskManagementCommand(riskManagement wrappers.RiskManagementWrapper, fea
 ) func(cmd *cobra.Command, args []string) error {
 	return func(cmd *cobra.Command, args []string) error {
 		projectID, _ := cmd.Flags().GetString(commonParams.ProjectIDFlag)
+		scanID, _ := cmd.Flags().GetString(commonParams.ScanIDFlag)
+
 		limit, _ := cmd.Flags().GetInt(commonParams.LimitFlag)
 
 		flagResponse, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.RiskManagementEnabled)
 		ASPMEnabled := flagResponse.Status
 		if !ASPMEnabled {
 			return errors.Errorf("%s", "Risk management results are currently unavailable for your tenant.")
 		}
-		results, err := getRiskManagementResults(riskManagement, projectID)
+		results, err := getRiskManagementResults(riskManagement, projectID, scanID)
 		if err != nil {
 			return err
 		}
@@ -372,8 +375,8 @@ func runRiskManagementCommand(riskManagement wrappers.RiskManagementWrapper, fea
 	}
 }
 
-func getRiskManagementResults(riskManagement wrappers.RiskManagementWrapper, projectID string) (*wrappers.ASPMResult, error) {
-	ASPMResult, errorModel, err := riskManagement.GetTopVulnerabilitiesByProjectID(projectID)
+func getRiskManagementResults(riskManagement wrappers.RiskManagementWrapper, projectID, scanID string) (*wrappers.ASPMResult, error) {
+	ASPMResult, errorModel, err := riskManagement.GetTopVulnerabilitiesByProjectID(projectID, scanID)
 	if err != nil {
 		return nil, errors.Wrapf(err, "%s", failedListingResults)
 	}
diff --git a/internal/commands/root.go b/internal/commands/root.go
@@ -249,7 +249,7 @@ func getFilters(cmd *cobra.Command) (map[string]string, error) {
 	for _, filter := range filters {
 		filterKeyVal := strings.Split(filter, "=")
 		if len(filterKeyVal) != params.KeyValuePairSize {
-			return nil, errors.Errorf("Invalid filters. Filters should be in a KEY=VALUE format")
+			return nil, errors.New("Invalid filters. Filters should be in a KEY=VALUE format")
 		}
 		filterKeyVal = validateExtraFilters(filterKeyVal)
 		allFilters[filterKeyVal[0]] = strings.Replace(
diff --git a/internal/commands/scan.go b/internal/commands/scan.go
@@ -722,7 +722,7 @@ func setupScanTypeProjectAndConfig(
 	if newProjectName != "" {
 		info["project"].(map[string]interface{})["id"] = newProjectName
 	} else {
-		return errors.Errorf("Project name is required")
+		return errors.New("Project name is required")
 	}
 
 	// We need to convert the project name into an ID
@@ -1072,7 +1072,7 @@ func isURLSupportedByScorecard(scsRepoURL string) bool {
 func isScorecardRunnable(scsRepoToken, scsRepoURL, userScanTypes string) (bool, error) {
 	if scsRepoToken == "" || scsRepoURL == "" {
 		if userScanTypes != "" {
-			return false, errors.Errorf(ScsRepoRequiredMsg)
+			return false, errors.New(ScsRepoRequiredMsg)
 		}
 		fmt.Println(ScsRepoWarningMsg)
 		return false, nil
@@ -2137,7 +2137,7 @@ func parseThresholdLimit(limit string) (engineName string, intLimit int, err err
 	parts := strings.Split(limit, "=")
 	engineName = strings.Replace(parts[0], commonParams.KicsType, commonParams.IacType, 1)
 	if len(parts) <= 1 {
-		return engineName, 0, errors.Errorf("Error parsing threshold limit: missing values\n")
+		return engineName, 0, errors.New("Error parsing threshold limit: missing values\n")
 	}
 	intLimit, err = strconv.Atoi(parts[1])
 	if err != nil {
@@ -2245,7 +2245,7 @@ func isScanRunning(
 		log.Fatal("Cannot source code temp file.", err)
 	}
 	if errorModel != nil {
-		log.Fatalf(fmt.Sprintf("%s: CODE: %d, %s", failedGetting, errorModel.Code, errorModel.Message))
+		log.Fatalf("%s: CODE: %d, %s", failedGetting, errorModel.Code, errorModel.Message)
 	} else if scanResponseModel != nil {
 		if scanResponseModel.Status == wrappers.ScanRunning || scanResponseModel.Status == wrappers.ScanQueued {
 			log.Println("Scan status: ", scanResponseModel.Status)
diff --git a/internal/params/binds.go b/internal/params/binds.go
@@ -73,6 +73,6 @@ var EnvVarsBinds = []struct {
 	{AiProxyCheckmarxAiRouteKey, AiProxyCheckmarxAiRouteEnv, "api/ai-proxy/redirect/azure"},
 	{ASCAPortKey, ASCAPortEnv, ""},
 	{ScsRepoTokenKey, ScsRepoTokenEnv, ""},
-	{RiskManagementPathKey, RiskManagementPathEnv, "api/risk-management/projects/%s/results"},
+	{RiskManagementPathKey, RiskManagementPathEnv, "api/risk-management/projects/%s/results?scanID=%s"},
 	{ConfigFilePathKey, ConfigFilePathEnv, ""},
 }
diff --git a/internal/wrappers/client.go b/internal/wrappers/client.go
@@ -123,7 +123,7 @@ func GetClient(timeout uint) *http.Client {
 
 	client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
 		if len(via) > 1 {
-			return fmt.Errorf("too many redirects")
+			return errors.New("too many redirects")
 		}
 		if len(via) != 0 && req.Response.StatusCode == http.StatusMovedPermanently {
 			for attr, val := range via[0].Header {
@@ -349,7 +349,7 @@ func addTenantAuthURI(baseAuthURI string) (string, error) {
 	tenant := viper.GetString(commonParams.TenantKey)
 
 	if tenant == "" {
-		return "", errors.Errorf(MissingTenant)
+		return "", errors.New(MissingTenant)
 	}
 
 	authPath = strings.Replace(authPath, "organization", strings.ToLower(tenant), 1)
@@ -454,9 +454,9 @@ func configureClientCredentialsAndGetNewToken() (string, error) {
 	var accessToken string
 
 	if accessKeyID == "" && astAPIKey == "" {
-		return "", errors.Errorf(fmt.Sprintf(FailedToAuth, "access key ID"))
+		return "", errors.Errorf(FailedToAuth, "access key ID")
 	} else if accessKeySecret == "" && astAPIKey == "" {
-		return "", errors.Errorf(fmt.Sprintf(FailedToAuth, "access key secret"))
+		return "", errors.Errorf(FailedToAuth, "access key secret")
 	}
 
 	authURI, err := GetAuthURI()
@@ -642,12 +642,12 @@ func request(client *http.Client, req *http.Request, responseBody bool) (*http.R
 func handleRedirect(resp *http.Response, req *http.Request, body []byte) (*http.Request, error) {
 	redirectURL := resp.Header.Get("Location")
 	if redirectURL == "" {
-		return nil, fmt.Errorf(applicationErrors.RedirectURLNotFound)
+		return nil, errors.New(applicationErrors.RedirectURLNotFound)
 	}
 
 	method := GetHTTPMethod(req)
 	if method == "" {
-		return nil, fmt.Errorf(applicationErrors.HTTPMethodNotFound)
+		return nil, errors.New(applicationErrors.HTTPMethodNotFound)
 	}
 
 	newReq, err := recreateRequest(req, method, redirectURL, body)
@@ -764,7 +764,7 @@ func GetURL(path, accessToken string) (string, error) {
 	}
 
 	if cleanURL == "" {
-		return "", errors.Errorf(MissingURI)
+		return "", errors.New(MissingURI)
 	}
 
 	cleanURL = strings.Trim(cleanURL, "/")
diff --git a/internal/wrappers/mock/risk-management-mock.go b/internal/wrappers/mock/risk-management-mock.go
@@ -6,14 +6,15 @@ import (
 
 type RiskManagementMockWrapper struct{}
 
-func (r *RiskManagementMockWrapper) GetTopVulnerabilitiesByProjectID(projectID string) (*wrappers.ASPMResult, *wrappers.WebError, error) {
+func (r *RiskManagementMockWrapper) GetTopVulnerabilitiesByProjectID(projectID string, scanID string) (*wrappers.ASPMResult, *wrappers.WebError, error) {
 	mockResults := []wrappers.RiskManagementResult{
-		{ID: "1", Name: "Vuln1", Severity: "High"},
-		{ID: "2", Name: "Vuln2", Severity: "Medium"},
+		{ID: "1", Name: "Vuln1", Severity: "High", Traits: map[string]string{wrappers.ExpPathKey: wrappers.ExpPathValue}},
+		{ID: "2", Name: "Vuln2", Severity: "Medium", Traits: map[string]string{wrappers.SuspMalwareKey: wrappers.SuspMalwareValue}},
 	}
 
 	mockASPMResult := &wrappers.ASPMResult{
 		ProjectID: projectID,
+		ScanID:    scanID,
 		Results:   mockResults,
 	}
 
diff --git a/internal/wrappers/risk-management-http.go b/internal/wrappers/risk-management-http.go
@@ -3,31 +3,33 @@ package wrappers
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/checkmarx/ast-cli/internal/logger"
+	"github.com/checkmarx/ast-cli/internal/wrappers/configuration"
 	"net/http"
 
 	commonParams "github.com/checkmarx/ast-cli/internal/params"
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 )
 
+const riskManagementDefaultPath = "api/risk-management/projects/%s/results?scanID=%s"
+
 type RiskManagementHTTPWrapper struct {
 	path string
 }
 
 func NewHTTPRiskManagementWrapper(path string) RiskManagementWrapper {
+	validPath := setRMDefaultPath(path)
 	return &RiskManagementHTTPWrapper{
-		path: path,
+		path: validPath,
 	}
 }
 
-func (r *RiskManagementHTTPWrapper) GetTopVulnerabilitiesByProjectID(projectID string) (
-	*ASPMResult,
-	*WebError,
-	error,
-) {
+func (r *RiskManagementHTTPWrapper) GetTopVulnerabilitiesByProjectID(projectID string, scanID string) (*ASPMResult, *WebError, error) {
 	clientTimeout := viper.GetUint(commonParams.ClientTimeoutKey)
-	path := fmt.Sprintf(r.path, projectID)
-	resp, err := SendHTTPRequest(http.MethodGet, path, http.NoBody, true, clientTimeout)
+
+	path := fmt.Sprintf(r.path, projectID, scanID)
+	resp, err := SendHTTPRequest(http.MethodGet, path, nil, true, clientTimeout)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -58,3 +60,17 @@ func (r *RiskManagementHTTPWrapper) GetTopVulnerabilitiesByProjectID(projectID s
 		return nil, nil, errors.Errorf("response status code %d", resp.StatusCode)
 	}
 }
+
+func setRMDefaultPath(path string) string {
+	if path != riskManagementDefaultPath {
+		configFilePath, err := configuration.GetConfigFilePath()
+		if err != nil {
+			logger.PrintfIfVerbose("Error getting config file path: %v", err)
+		}
+		err = configuration.SafeWriteSingleConfigKeyString(configFilePath, commonParams.RiskManagementPathKey, riskManagementDefaultPath)
+		if err != nil {
+			logger.PrintfIfVerbose("Error writing Risk Management path to config file: %v", err)
+		}
+	}
+	return riskManagementDefaultPath
+}
diff --git a/internal/wrappers/risk-management.go b/internal/wrappers/risk-management.go
@@ -2,8 +2,24 @@ package wrappers
 
 import "time"
 
+const (
+	SuspMalwareKey = "suspMalware"
+	ExpPathKey     = "explPath"
+	//PubExposedKey  = "pubExposed"
+	//RuntimeKey     = "runtime"
+
+	SuspMalwareValue = "Suspected Malware"
+	ExpPathValue     = "Exploitable Path"
+	//PubExposedValue  = "Public Exposed"
+	//RuntimeValue     = "Runtime"
+)
+
 type RiskManagementWrapper interface {
-	GetTopVulnerabilitiesByProjectID(projectID string) (*ASPMResult, *WebError, error)
+	GetTopVulnerabilitiesByProjectID(projectID string, scanID string) (*ASPMResult, *WebError, error)
+}
+
+type GetASPMResultRequest struct {
+	ScanId string `json:"scanID"`
 }
 
 type ApplicationScore struct {
@@ -27,6 +43,7 @@ type RiskManagementResult struct {
 	Severity           string             `json:"severity"`
 	RiskScore          float64            `json:"riskScore"`
 	EnrichmentSources  map[string]string  `json:"enrichmentSources"`
+	Traits             map[string]string  `json:"traits"`
 	CreatedAt          time.Time          `json:"createdAt"`
 	ApplicationsScores []ApplicationScore `json:"applicationsScores"`
 }
diff --git a/test/integration/predicate_test.go b/test/integration/predicate_test.go
@@ -16,8 +16,6 @@ import (
 	"gotest.tools/assert"
 )
 
-var projectID string
-
 func TestSastUpdateAndGetPredicatesForSimilarityId(t *testing.T) {
 
 	fmt.Println("Step 1: Testing the command 'triage update' to update an issue from the project.")
@@ -101,7 +99,6 @@ func TestSastUpdateAndGetPredicatesForSimilarityId(t *testing.T) {
 }
 
 func TestGetAndUpdatePredicateWithInvalidScannerType(t *testing.T) {
-
 	err, _ := executeCommand(
 		t, "triage", "update",
 		flag(params.ProjectIDFlag), "1234",
diff --git a/test/integration/result_test.go b/test/integration/result_test.go
@@ -616,7 +616,7 @@ func readAndUnmarshalFile(t *testing.T, path string, v interface{}) {
 }
 
 func TestRiskManagementResults_ReturnResults(t *testing.T) {
-	projectName := "ast-phoenix-test-project"
+	projectName := GenerateRandomProjectNameForScan()
 	_ = executeCmdNilAssertion(
 		t, "Create project should pass",
 		"project", "create",
@@ -631,20 +631,21 @@ func TestRiskManagementResults_ReturnResults(t *testing.T) {
 		flag(params.ScanInfoFormatFlag), printer.FormatJSON,
 		flag(params.ScanTypes), params.SastType,
 	}
-	_, projectID := executeCreateScan(t, args)
+	scanId, projectId := executeCreateScan(t, args)
 
 	defer func() {
 		_ = executeCmdNilAssertion(
 			t, "Delete project should pass",
 			"project", "delete",
-			flag(params.ProjectIDFlag), projectID,
+			flag(params.ProjectIDFlag), projectId,
 		)
 	}()
 
 	outputBuffer := executeCmdNilAssertion(
 		t, "Results risk-management generating JSON report should pass",
 		"results", "risk-management",
-		flag(params.ProjectIDFlag), projectID,
+		flag(params.ProjectIDFlag), projectId,
+		flag(params.ScanIDFlag), scanId,
 		flag(params.LimitFlag), "20",
 	)
 	result := wrappers.ASPMResult{}
diff --git a/test/integration/root_test.go b/test/integration/root_test.go
@@ -97,7 +97,7 @@ func getRootProject(t *testing.T) (string, string) {
 	testInstance = t
 
 	if len(rootProjectId) > 0 {
-		fmt.Printf("Using the projectID: " + rootProjectId)
+		fmt.Printf("Using the projectID: %s", rootProjectId)
 		log.Println("Using the projectID: ", rootProjectId)
 		log.Println("Using the projectName: ", rootProjectName)
 		return rootProjectId, rootProjectName

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM checkmarx/bash:5.2.37-r2-c5dcfc6a2fbe1c@sha256:c5dcfc6a2fbe1c8f9d11bdf902b5485bb78b4733864a99806749d5e244a6b75e`
	`1`	`+FROM checkmarx/bash:5.2.37-r30-0714eec7a3fa2e@sha256:0714eec7a3fa2eadb3a6bdf2049bc158cc0311182a2475e8a467dbb2834df23f`
`2`	`2`	`USER nonroot`
`3`	`3`
`4`	`4`	`COPY cx /app/bin/cx`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func getSastConversationDetails(cmd *cobra.Command, chatConversationID string, s`
`104`	`104`	`if userInput == "" {`
`105`	`105`	`msg := fmt.Sprintf(UserInputRequiredErrorFormat, params.ChatUserInput, params.ChatConversationID)`
`106`	`106`	`logger.PrintIfVerbose(msg)`
`107`		`- return false, "", uuid.UUID{}, outputError(cmd, uuid.Nil, errors.Errorf(msg))`
	`107`	`+ return false, "", uuid.UUID{}, outputError(cmd, uuid.Nil, errors.New(msg))`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -234,13 +234,14 @@ func riskManagementSubCommand(riskManagement wrappers.RiskManagementWrapper, fea`
`234`	`234`	`Long: "The risk-management command displays risk management results for a specific project in Checkmarx One",`
`235`	`235`	`Example: heredoc.Doc(`
`236`	`236`	`
`237`		`- $ cx results risk-management --project-id <project Id> --limit <limit> (1-50, default: 50)`
	`237`	`+ $ cx results risk-management --project-id <project Id> --scan-id <scan ID> --limit <limit> (1-50, default: 50)`
`238`	`238`	`,
`239`	`239`	`),`
`240`	`240`	`RunE: runRiskManagementCommand(riskManagement, featureFlagsWrapper),`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`riskManagementCmd.PersistentFlags().String(commonParams.ProjectIDFlag, "", "Project ID")`
	`244`	`+ riskManagementCmd.PersistentFlags().String(commonParams.ScanIDFlag, "", "Scan ID")`
`244`	`245`	`riskManagementCmd.PersistentFlags().Int(commonParams.LimitFlag, -1, "Limit")`
`245`	`246`
`246`	`247`	`addFormatFlag(riskManagementCmd, printer.FormatJSON, printer.FormatTable, printer.FormatList)`
`@@ -355,14 +356,16 @@ func runRiskManagementCommand(riskManagement wrappers.RiskManagementWrapper, fea`
`355`	`356`	`) func(cmd *cobra.Command, args []string) error {`
`356`	`357`	`return func(cmd *cobra.Command, args []string) error {`
`357`	`358`	`projectID, _ := cmd.Flags().GetString(commonParams.ProjectIDFlag)`
	`359`	`+ scanID, _ := cmd.Flags().GetString(commonParams.ScanIDFlag)`
	`360`	`+`
`358`	`361`	`limit, _ := cmd.Flags().GetInt(commonParams.LimitFlag)`
`359`	`362`
`360`	`363`	`flagResponse, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.RiskManagementEnabled)`
`361`	`364`	`ASPMEnabled := flagResponse.Status`
`362`	`365`	`if !ASPMEnabled {`
`363`	`366`	`return errors.Errorf("%s", "Risk management results are currently unavailable for your tenant.")`
`364`	`367`	`}`
`365`		`- results, err := getRiskManagementResults(riskManagement, projectID)`
	`368`	`+ results, err := getRiskManagementResults(riskManagement, projectID, scanID)`
`366`	`369`	`if err != nil {`
`367`	`370`	`return err`
`368`	`371`	`}`
`@@ -372,8 +375,8 @@ func runRiskManagementCommand(riskManagement wrappers.RiskManagementWrapper, fea`
`372`	`375`	`}`
`373`	`376`	`}`
`374`	`377`
`375`		`-func getRiskManagementResults(riskManagement wrappers.RiskManagementWrapper, projectID string) (*wrappers.ASPMResult, error) {`
`376`		`- ASPMResult, errorModel, err := riskManagement.GetTopVulnerabilitiesByProjectID(projectID)`
	`378`	`+func getRiskManagementResults(riskManagement wrappers.RiskManagementWrapper, projectID, scanID string) (*wrappers.ASPMResult, error) {`
	`379`	`+ ASPMResult, errorModel, err := riskManagement.GetTopVulnerabilitiesByProjectID(projectID, scanID)`
`377`	`380`	`if err != nil {`
`378`	`381`	`return nil, errors.Wrapf(err, "%s", failedListingResults)`
`379`	`382`	`}`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ func getFilters(cmd *cobra.Command) (map[string]string, error) {`
`249`	`249`	`for _, filter := range filters {`
`250`	`250`	`filterKeyVal := strings.Split(filter, "=")`
`251`	`251`	`if len(filterKeyVal) != params.KeyValuePairSize {`
`252`		`- return nil, errors.Errorf("Invalid filters. Filters should be in a KEY=VALUE format")`
	`252`	`+ return nil, errors.New("Invalid filters. Filters should be in a KEY=VALUE format")`
`253`	`253`	`}`
`254`	`254`	`filterKeyVal = validateExtraFilters(filterKeyVal)`
`255`	`255`	`allFilters[filterKeyVal[0]] = strings.Replace(`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,6 @@ var EnvVarsBinds = []struct {`
`73`	`73`	`{AiProxyCheckmarxAiRouteKey, AiProxyCheckmarxAiRouteEnv, "api/ai-proxy/redirect/azure"},`
`74`	`74`	`{ASCAPortKey, ASCAPortEnv, ""},`
`75`	`75`	`{ScsRepoTokenKey, ScsRepoTokenEnv, ""},`
`76`		`- {RiskManagementPathKey, RiskManagementPathEnv, "api/risk-management/projects/%s/results"},`
	`76`	`+ {RiskManagementPathKey, RiskManagementPathEnv, "api/risk-management/projects/%s/results?scanID=%s"},`
`77`	`77`	`{ConfigFilePathKey, ConfigFilePathEnv, ""},`
`78`	`78`	`}`