Merge branch 'dev' of https://github.com/jfrog/jfrog-cli-security into fix-get-severity-details-applicability-status-switch

Author: eranturgeman

jas/analyzermanager.go

@@ -23,7 +23,7 @@ import (
 const (
 	ApplicabilityFeatureId                    = "contextual_analysis"
 	AnalyzerManagerZipName                    = "analyzerManager.zip"
-	defaultAnalyzerManagerVersion             = "1.23.3"
+	defaultAnalyzerManagerVersion             = "1.23.9"
 	analyzerManagerDownloadPath               = "xsc-gen-exe-analyzer-manager-local/v1"
 	analyzerManagerDirName                    = "analyzerManager"
 	analyzerManagerExecutableName             = "analyzerManager"

utils/results/common.go

@@ -1103,10 +1103,12 @@ func getDataFromNode(node *xrayUtils.GraphNode, parsed *datastructures.Set[strin
 }
 
 func getNodeDirectDependencies(node *xrayUtils.GraphNode) (dependencies *[]string) {
-	dependencies = &[]string{}
+	depSet := datastructures.MakeSet[string]()
 	for _, dep := range node.Nodes {
-		*dependencies = append(*dependencies, techutils.XrayComponentIdToCdxComponentRef(dep.Id))
+		depSet.Add(techutils.XrayComponentIdToCdxComponentRef(dep.Id))
 	}
+	dependencies = &[]string{}
+	*dependencies = depSet.ToSlice()
 	return
 }
 

utils/results/common_test.go

@@ -1310,7 +1310,7 @@ func TestDepTreeToSbom(t *testing.T) {
 			expectedDependencies: &[]cyclonedx.Dependency{
 				{
 					Ref:          "npm:root:1.0.0",
-					Dependencies: &[]string{"npm:A:1.0.1", "npm:D:2.0.0", "npm:B:1.0.0"},
+					Dependencies: &[]string{"npm:A:1.0.1", "npm:B:1.0.0", "npm:D:2.0.0"},
 				},
 				{
 					Ref:          "npm:A:1.0.1",
@@ -1456,6 +1456,13 @@ func TestDepTreeToSbom(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			components, dependencies := DepsTreeToSbom(test.depTrees...)
+			if dependencies != nil {
+				for i := range *dependencies {
+					if (*dependencies)[i].Dependencies != nil {
+						sort.Strings(*(*dependencies)[i].Dependencies)
+					}
+				}
+			}
 			assert.Equal(t, test.expectedComponents, components)
 			assert.Equal(t, test.expectedDependencies, dependencies)
 		})