continue

Author: attiasas

commands/audit/scarunner.go

@@ -367,14 +367,13 @@ func SetResolutionRepoIfExists(params utils.AuditParams, tech techutils.Technolo
 // 	return
 // }
 
-func getDependencyTreeDetectionParams(scan *utils.ScaScanResult, params *AuditParams, serverDetails *config.ServerDetails, curationCacheDir string) techutils.DetectDependencyTreeParams {
+func getDependencyTreeDetectionParams(scan *utils.ScaScanResult, params *AuditParams, serverDetails *config.ServerDetails) techutils.DetectDependencyTreeParams {
 	detectionParams := techutils.DetectDependencyTreeParams{Technology: scan.Technology, Descriptors: scan.Descriptors}
 	// Artifactory params
 	detectionParams.DependenciesRepository = params.DepsRepo()
 	// Curation optional params
 	detectionParams.IncludeCuration = params.IsCurationCmd()
 	detectionParams.ServerDetails = serverDetails
-	detectionParams.CurationCacheFolder = curationCacheDir
 	// Common params
 	detectionParams.UseWrapper = params.UseWrapper()
 	// Maven params

resources/deptreemanager.go

@@ -1 +1,11 @@
-package resources
+package resources
+
+import (
+	_ "embed"
+)
+
+//go:embed java/settings.xml
+var SettingsXmlTemplate string
+
+//go:embed java/maven-dep-tree.jar
+var MavenDepTreeJar []byte

resources/resources.go

@@ -5,9 +5,3 @@ import (
 )
 
 const BaseResourcesUrl = "https://raw.githubusercontent.com/jfrog/jfrog-cli-security/main/resources"
-
-//go:embed java/settings.xml
-var SettingsXmlTemplate string
-
-//go:embed java/maven-dep-tree.jar
-var MavenDepTreeJar []byte

technologies/technologies.go

@@ -61,13 +61,17 @@ func ChangeTechDependencyVersion(tech techutils.Technology, directDependencyName
 }
 
 func GetDependencyTree(params techutils.DetectDependencyTreeParams) (techutils.TechnologyDependencyTrees, error) {
-	msg := fmt.Sprintf("Calculating %s dependencies...", params.Technology.ToFormal())
+	msg := fmt.Sprintf("Calculating %s dependencies", params.Technology.ToFormal())
 	if params.IncludeCuration {
-		getCurationCacheFolderAndLogMsg(params.Technology)
+		if logExtraMsg, cacheDir, err := getCurationCacheFolderAndLogMsg(params.Technology); err != nil {
+			return techutils.TechnologyDependencyTrees{}, err
+		} else {
+			params.CurationCacheFolder = cacheDir
+			msg += logExtraMsg
+		}
 	}
-	
+	log.Info(msg)
 	if handler, err := GetTechHandler(params.Technology); err == nil {
-		log.Info(fmt.Sprintf("Handler Calculating %s dependencies...", params.Technology.ToFormal()))
 		if tree, err := handler.GetTechDependencyTree(params); err == nil {
 			return tree, nil
 		}
@@ -112,7 +116,7 @@ type DependencyTreeResult struct {
 
 func GetTechDependencyTree(params utils.AuditParams, artifactoryServerDetails *config.ServerDetails, tech techutils.Technology) (depTreeResult DependencyTreeResult, err error) {
 	logMessage := fmt.Sprintf("Calculating %s dependencies", tech.ToFormal())
-	curationLogMsg, curationCacheFolder, err := getCurationCacheFolderAndLogMsg(params, tech)
+	curationLogMsg, curationCacheFolder, err := getCurationCacheFolderAndLogMsg(tech)
 	if err != nil {
 		return
 	}