RTECO-1021 - Refactor native mode handling in npm commands to improve clarity and maintain backward compatibility

Author: fluxxBot

artifactory/commands/npm/common.go

@@ -50,20 +50,17 @@ func (ca *CommonArgs) SetUseNative(useNpmRc bool) *CommonArgs {
 // then falls back to the deprecated --run-native flag for backward compatibility.
 // Returns: useNative flag, filtered args (with --run-native removed if present), error
 func CheckIsNativeAndFetchFilteredArgs(args []string) (useNative bool, filteredArgs []string, err error) {
-	filteredArgs = args
-	// Check JFROG_RUN_NATIVE environment variable first (preferred method)
-	useNative = flexpack.IsFlexPackEnabled()
-	if useNative {
-		log.Info("Running npm in native mode (JFROG_RUN_NATIVE=true)")
-		return
-	}
-
-	// Check deprecated --run-native flag for backward compatibility
+	// Always strip --run-native from args so it never reaches the npm binary,
+	// regardless of whether native mode is triggered by env var or flag.
 	filteredArgs, useNativeFlag, err := coreutils.ExtractUseNativeFromArgs(args)
 	if err != nil {
 		return false, args, err
 	}
-	if useNativeFlag {
+
+	if flexpack.IsFlexPackEnabled() {
+		log.Info("Running npm in native mode (JFROG_RUN_NATIVE=true)")
+		useNative = true
+	} else if useNativeFlag {
 		log.Warn("The --run-native flag is deprecated. Please use JFROG_RUN_NATIVE=true environment variable instead.")
 		log.Info("Running npm in native mode")
 		useNative = true

artifactory/commands/npm/npmcommand.go

@@ -129,17 +129,32 @@ func (nc *NpmCommand) SetDisableCVSCheck(disable bool) *NpmCommand {
 }
 
 func (nc *NpmCommand) Init() error {
-	// Read config file.
-	log.Debug("Preparing to read the config file", nc.configFilePath)
-	vConfig, err := project.ReadConfigFile(nc.configFilePath, project.YAML)
-	if err != nil {
-		return err
+	if nc.configFilePath != "" {
+		log.Debug("Preparing to read the config file", nc.configFilePath)
+		vConfig, err := project.ReadConfigFile(nc.configFilePath, project.YAML)
+		if err != nil {
+			return err
+		}
+		
+		repoConfig, err := nc.getRepoConfig(vConfig)
+		if err != nil {
+			return err
+		}
+		nc.SetRepoConfig(repoConfig)
+	} else if nc.UseNative() {
+		// No config file + native mode — CLI layer set useNative and stripped --run-native already.
+		// Only strip --server-id (not a valid npm flag) and resolve server details.
+		filteredArgs, serverID, err := coreutils.ExtractServerIdFromCommand(nc.npmArgs)
+		if err != nil {
+			return err
+		}
+		nc.npmArgs = filteredArgs
+		nc.serverDetails, err = config.GetSpecificConfig(serverID, true, false)
+		if err != nil {
+			return err
+		}
 	}
 
-	repoConfig, err := nc.getRepoConfig(vConfig)
-	if err != nil {
-		return err
-	}
 	_, _, _, filteredNpmArgs, buildConfiguration, err := commandUtils.ExtractNpmOptionsFromArgs(nc.npmArgs)
 	if err != nil {
 		return err
@@ -149,7 +164,7 @@ func (nc *NpmCommand) Init() error {
 	if err != nil {
 		return err
 	}
-	nc.SetRepoConfig(repoConfig).SetArgs(filteredNpmArgs).SetBuildConfiguration(buildConfiguration)
+	nc.SetArgs(filteredNpmArgs).SetBuildConfiguration(buildConfiguration)
 	nc.SetDisableCVSCheck(disableCVSCheck)
 	return nil
 }
@@ -199,13 +214,6 @@ func (nc *NpmCommand) PreparePrerequisites(repo string) error {
 		return err
 	}
 	log.Debug("Working directory set to:", nc.workingDirectory)
-
-	// Check for native mode (env var or deprecated flag)
-	useNative, _, err := CheckIsNativeAndFetchFilteredArgs(nc.npmArgs)
-	if err != nil {
-		return err
-	}
-	nc.SetUseNative(useNative)
 	nc.installHandler = NewNpmInstallStrategy(nc.UseNative(), nc)
 
 	return nc.installHandler.PrepareInstallPrerequisites(repo)

artifactory/commands/npm/publish.go

@@ -129,11 +129,6 @@ func (npc *NpmPublishCommand) Init() error {
 	if err != nil {
 		return err
 	}
-	// Check for native mode (env var or deprecated flag)
-	useNative, filteredNpmArgs, err := CheckIsNativeAndFetchFilteredArgs(filteredNpmArgs)
-	if err != nil {
-		return err
-	}
 	filteredNpmArgs, tag, err := coreutils.ExtractTagFromArgs(filteredNpmArgs)
 	if err != nil {
 		return err
@@ -154,8 +149,20 @@ func (npc *NpmPublishCommand) Init() error {
 			return errorutils.CheckError(err)
 		}
 		npc.SetBuildConfiguration(buildConfiguration).SetRepo(deployerParams.TargetRepo()).SetNpmArgs(filteredNpmArgs).SetServerDetails(rtDetails)
+	} else if npc.UseNative() {
+		// No config file + native mode: CLI layer already set useNative and stripped --run-native.
+		// Extract --server-id for metrics reporting and strip it from args.
+		filteredNpmArgs, serverID, err := coreutils.ExtractServerIdFromCommand(filteredNpmArgs)
+		if err != nil {
+			return err
+		}
+		rtDetails, err := config.GetSpecificConfig(serverID, true, false)
+		if err != nil {
+			return err
+		}
+		npc.SetBuildConfiguration(buildConfiguration).SetNpmArgs(filteredNpmArgs).SetServerDetails(rtDetails)
 	}
-	npc.SetDetailedSummary(detailedSummary).SetXrayScan(xrayScan).SetScanOutputFormat(scanOutputFormat).SetDistTag(tag).SetUseNative(useNative)
+	npc.SetDetailedSummary(detailedSummary).SetXrayScan(xrayScan).SetScanOutputFormat(scanOutputFormat).SetDistTag(tag)
 	return nil
 }