Fix CR.

xray/commands/audit/sca/npm/npm.go

@@ -28,12 +28,9 @@ func BuildDependencyTree(params utils.AuditParams) (dependencyTrees []*xrayUtils
 	if err != nil {
 		return
 	}
-	treeDepsParam := biutils.NpmTreeDepListParam{
-		Args: addIgnoreScriptsFlag([]string{}),
-	}
-	if params != nil {
-		treeDepsParam = createTreeDepsParam(params)
-	}
+
+	treeDepsParam := createTreeDepsParam(params)
+
 	// Calculate npm dependencies
 	dependenciesMap, err := biutils.CalculateDependenciesMap(npmExecutablePath, currentDir, packageInfo.BuildInfoModuleId(), treeDepsParam, log.Logger)
 	if err != nil {
@@ -51,6 +48,11 @@ func BuildDependencyTree(params utils.AuditParams) (dependencyTrees []*xrayUtils
 }
 
 func createTreeDepsParam(params utils.AuditParams) biutils.NpmTreeDepListParam {
+	if params == nil {
+		return biutils.NpmTreeDepListParam{
+			Args: addIgnoreScriptsFlag([]string{}),
+		}
+	}
 	npmTreeDepParam := biutils.NpmTreeDepListParam{
 		Args: addIgnoreScriptsFlag(params.Args()),
 	}

xray/commands/curation/curationaudit.go

@@ -194,8 +194,7 @@ func (ca *CurationAuditCommand) doCurateAudit(results map[string][]*PackageStatu
 
 func (ca *CurationAuditCommand) getAuditParamsByTech(tech coreutils.Technology) utils.AuditParams {
 	if tech == coreutils.Npm {
-		return utils.AuditNpmParams{
-			AuditParams: ca.AuditParams}.
+		return utils.AuditNpmParams{AuditParams: ca.AuditParams}.
 			SetNpmIgnoreNodeModules(true).
 			SetNpmOverwritePackageLock(true)
 	}

xray/utils/auditnpmparams.go

@@ -0,0 +1,25 @@
+package utils
+
+type AuditNpmParams struct {
+	AuditParams
+	npmIgnoreNodeModules    bool
+	npmOverwritePackageLock bool
+}
+
+func (anp AuditNpmParams) SetNpmIgnoreNodeModules(ignoreNpmNodeModules bool) AuditNpmParams {
+	anp.npmIgnoreNodeModules = ignoreNpmNodeModules
+	return anp
+}
+
+func (anp AuditNpmParams) SetNpmOverwritePackageLock(overwritePackageLock bool) AuditNpmParams {
+	anp.npmOverwritePackageLock = overwritePackageLock
+	return anp
+}
+
+func (anp AuditNpmParams) NpmIgnoreNodeModules() bool {
+	return anp.npmIgnoreNodeModules
+}
+
+func (anp AuditNpmParams) NpmOverwritePackageLock() bool {
+	return anp.npmOverwritePackageLock
+}