Remove default from unsupported agents for SCS results (AST-68004) (#912

) * Remove astCli from unsupported agents for scs results * change brnach name * Fix lint and add unit test --------- Co-authored-by: Or Shamir Checkmarx <[email protected]>
Checkmarx · Nov 5, 2024 · ae2ad00 · ae2ad00
1 parent 87ba5a9
commit ae2ad00
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/internal/commands/result.go b/internal/commands/result.go
@@ -1088,7 +1088,6 @@ func filterResultsByType(results *wrappers.ScanResultsCollection, excludedTypes
 
 func filterScsResultsByAgent(results *wrappers.ScanResultsCollection, agent string) *wrappers.ScanResultsCollection {
 	unsupportedTypesByAgent := map[string][]string{
-		commonParams.DefaultAgent:      {},
 		commonParams.VSCodeAgent:       {commonParams.SCSScorecardType},
 		commonParams.JetbrainsAgent:    {commonParams.SCSScorecardType, commonParams.SCSSecretDetectionType},
 		commonParams.EclipseAgent:      {commonParams.SCSScorecardType, commonParams.SCSSecretDetectionType},

diff --git a/internal/commands/result_test.go b/internal/commands/result_test.go
@@ -1520,3 +1520,40 @@ func TestRunGetResultsByScanIdSummaryHtmlFormat_SCSFlagNotEnabled_SCSNotPresentI
 	removeFileBySuffix(t, "html")
 	mock.SetScsMockVarsToDefault()
 }
+
+func TestFilterScsResultsByAgent_ShouldExcludeSCSAndContainers(t *testing.T) {
+	results := &wrappers.ScanResultsCollection{
+		Results: []*wrappers.ScanResult{
+			{Type: params.SCSScorecardType},
+			{Type: params.ScsType},
+			{Type: params.ContainersType},
+			{Type: params.SastType},
+		},
+	}
+
+	filteredResults := filterScsResultsByAgent(results, params.JetbrainsAgent)
+
+	hasSCSScorecard := false
+	hasSCS := false
+	hasContainers := false
+	hasSAST := false
+
+	for _, result := range filteredResults.Results {
+		switch result.Type {
+		case params.SCSScorecardType:
+			hasSCSScorecard = true
+		case params.ScsType:
+			hasSCS = true
+		case params.ContainersType:
+			hasContainers = true
+		case params.SastType:
+			hasSAST = true
+		}
+	}
+
+	assert.Assert(t, !hasSCSScorecard, "Expected SCSScorecard type to be excluded for Jetbrains agent")
+	assert.Assert(t, hasSCS, "Expected SCS type to be included in Jetbrains agent results")
+	assert.Assert(t, hasContainers, "Expected Containers type to be included in Jetbrains agent results")
+	assert.Assert(t, hasSAST, "Expected SAST type to be included in Jetbrains agent results")
+	assert.Equal(t, len(filteredResults.Results), 3, "Expected only 3 results after filtering for Jetbrains agent")
+}