Curation - Generate a cache directory dedicated to each project (#35)

commands/audit/scarunner.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"os"
 	"time"
 
@@ -174,12 +175,26 @@ func getDirectDependenciesFromTree(dependencyTrees []*xrayCmdUtils.GraphNode) []
 	return directDependencies.ToSlice()
 }
 
+func getCurationCacheByTech(tech coreutils.Technology) (string, error) {
+	if tech == coreutils.Maven {
+		return xrayutils.GetCurationMavenCacheFolder()
+	}
+	return "", nil
+}
+
 func GetTechDependencyTree(params xrayutils.AuditParams, tech coreutils.Technology) (flatTree *xrayCmdUtils.GraphNode, fullDependencyTrees []*xrayCmdUtils.GraphNode, err error) {
 	logMessage := fmt.Sprintf("Calculating %s dependencies", tech.ToFormal())
+	curationLogMsg, curationCacheFolder, err := getCurationCacheFolderAndLogMsg(params, tech)
+	if err != nil {
+		return
+	}
+	// In case it's not curation command these 'curationLogMsg' be empty
+	logMessage += curationLogMsg
 	log.Info(logMessage + "...")
 	if params.Progress() != nil {
 		params.Progress().SetHeadlineMsg(logMessage)
 	}
+
 	err = SetResolutionRepoIfExists(params, tech)
 	if err != nil {
 		return
@@ -191,15 +206,9 @@ func GetTechDependencyTree(params xrayutils.AuditParams, tech coreutils.Technolo
 	var uniqueDeps []string
 	var uniqDepsWithTypes map[string][]string
 	startTime := time.Now()
+
 	switch tech {
 	case coreutils.Maven, coreutils.Gradle:
-		curationCacheFolder := ""
-		if params.IsCurationCmd() {
-			curationCacheFolder, err = xrayutils.GetCurationMavenCacheFolder()
-			if err != nil {
-				return
-			}
-		}
 		fullDependencyTrees, uniqDepsWithTypes, err = java.BuildDependencyTree(java.DepTreeParams{
 			Server:                  serverDetails,
 			DepsRepo:                params.DepsRepo(),
@@ -238,6 +247,31 @@ func GetTechDependencyTree(params xrayutils.AuditParams, tech coreutils.Technolo
 	return
 }
 
+func getCurationCacheFolderAndLogMsg(params xrayutils.AuditParams, tech coreutils.Technology) (logMessage string, curationCacheFolder string, err error) {
+	if !params.IsCurationCmd() {
+		return
+	}
+	if curationCacheFolder, err = getCurationCacheByTech(tech); err != nil {
+		return
+	}
+
+	dirExist, err := fileutils.IsDirExists(curationCacheFolder, false)
+	if err != nil {
+		return
+	}
+
+	if dirExist {
+		if dirIsEmpty, scopErr := fileutils.IsDirEmpty(curationCacheFolder); scopErr != nil || !dirIsEmpty {
+			err = scopErr
+			return
+		}
+	}
+
+	logMessage = ". Project's cache is currently empty, so this run may take longer to complete"
+
+	return logMessage, curationCacheFolder, err
+}
+
 // Associates a technology with another of a different type in the structure.
 // Docker is not present, as there is no docker-config command and, consequently, no docker.yaml file we need to operate on.
 var TechType = map[coreutils.Technology]project.ProjectType{

commands/curation/curationaudit_test.go

@@ -496,7 +496,12 @@ func getTestCasesForDoCurationAudit() []testCase {
 			pathToPreTest: filepath.Join(TestDataDir, "projects", "package-managers", "maven", "maven-curation", "pretest"),
 			preTestExec:   "mvn",
 			funcToGetGoals: func(t *testing.T) []string {
+				rootDir, err := os.Getwd()
+				assert.NoError(t, err)
+				// set the cache to test project dir, in order to fill its cache with dependencies
+				callbackPreTest := clienttestutils.ChangeDirWithCallback(t, rootDir, filepath.Join("..", "test"))
 				curationCache, err := utils.GetCurationMavenCacheFolder()
+				callbackPreTest()
 				require.NoError(t, err)
 				return []string{"com.jfrog:maven-dep-tree:tree", "-DdepsTreeOutputFile=output", "-Dmaven.repo.local=" + curationCache}
 			},

utils/paths.go

@@ -1,6 +1,9 @@
 package utils
 
 import (
+	// #nosec G505 -- Not in use for secrets.
+	"crypto/sha1"
+	"encoding/hex"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"os"
 	"path/filepath"
@@ -35,10 +38,21 @@ func GetCurationCacheFolder() (string, error) {
 	return filepath.Join(curationFolder, "cache"), nil
 }
 
-func GetCurationMavenCacheFolder() (string, error) {
+func GetCurationMavenCacheFolder() (projectDir string, err error) {
 	curationFolder, err := GetCurationCacheFolder()
 	if err != nil {
 		return "", err
 	}
-	return filepath.Join(curationFolder, "maven"), nil
+	workingDir, err := os.Getwd()
+	if err != nil {
+		return "", err
+	}
+	// #nosec G401 -- Not a secret hash.
+	hasher := sha1.New()
+	_, err = hasher.Write([]byte(workingDir))
+	if err != nil {
+		return "", err
+	}
+	projectDir = filepath.Join(curationFolder, "maven", hex.EncodeToString(hasher.Sum(nil)))
+	return
 }