Fix import cycle

jfrog · Sep 13, 2023 · 03a3707 · 03a3707
1 parent f51094d
commit 03a3707
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/xray/commands/audit/jas/applicability/applicabilitymanager.go b/xray/commands/audit/jas/applicability/applicabilitymanager.go
@@ -144,7 +144,7 @@ type scanConfiguration struct {
 func (asm *ApplicabilityScanManager) createConfigFile(workingDir string) error {
 	skipDirs := jas.SkippedDirs
 	if asm.thirdPartyScan {
-		log.Debug("Including node modules in applicability scan")
+		log.Debug("Including node modules folder in applicability scan")
 		skipDirs = removeElementFromSlice(skipDirs, jas.NodeModulesPattern)
 	}
 	configFileContent := applicabilityScanConfig{

diff --git a/xray/commands/audit/sca/yarn/yarn.go b/xray/commands/audit/sca/yarn/yarn.go
@@ -4,15 +4,12 @@ import (
 	biUtils "github.com/jfrog/build-info-go/build/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-cli-core/v2/xray/commands/audit/sca"
+	"github.com/jfrog/jfrog-cli-core/v2/xray/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	xrayUtils "github.com/jfrog/jfrog-client-go/xray/services/utils"
 )
 
-const (
-	NpmPackageTypeIdentifier = "npm://"
-)
-
 func BuildDependencyTree() (dependencyTrees []*xrayUtils.GraphNode, uniqueDeps []string, err error) {
 	currentDir, err := coreutils.GetWorkingDirectory()
 	if err != nil {
@@ -55,5 +52,5 @@ func parseYarnDependenciesMap(dependencies map[string]*biUtils.YarnDependency, r
 }
 
 func getXrayDependencyId(yarnDependency *biUtils.YarnDependency) string {
-	return NpmPackageTypeIdentifier + yarnDependency.Name() + ":" + yarnDependency.Details.Version
+	return utils.NpmPackageTypeIdentifier + yarnDependency.Name() + ":" + yarnDependency.Details.Version
 }
diff --git a/xray/utils/resultstable.go b/xray/utils/resultstable.go
@@ -2,7 +2,6 @@ package utils
 
 import (
 	"fmt"
-	"github.com/jfrog/jfrog-cli-core/v2/xray/commands/audit/sca/yarn"
 	"os"
 	"path/filepath"
 	"sort"
@@ -29,6 +28,7 @@ const (
 	directDependencyIndex      = 1
 	directDependencyPathLength = 2
 	nodeModules                = "node_modules"
+	NpmPackageTypeIdentifier   = "npm://"
 )
 
 // PrintViolationsTable prints the violations in 4 tables: security violations, license compliance violations, operational risk violations and ignore rule URLs.
@@ -1037,10 +1037,10 @@ func shouldDisqualifyEvidence(components map[string]services.Component, evidence
 }
 
 func extractNpmDependencyNameFromComponent(key string) (dependencyName string) {
-	if !strings.HasPrefix(key, yarn.NpmPackageTypeIdentifier) {
+	if !strings.HasPrefix(key, NpmPackageTypeIdentifier) {
 		return
 	}
-	packageAndVersion := strings.TrimPrefix(key, yarn.NpmPackageTypeIdentifier)
+	packageAndVersion := strings.TrimPrefix(key, NpmPackageTypeIdentifier)
 	split := strings.Split(packageAndVersion, ":")
 	if len(split) < 2 {
 		return