added new core changes

Author: fluxxBot

artifactory/commands/npm/npmPublishHandler.go

@@ -10,29 +10,35 @@ import (
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	specutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
+	"strings"
 )
 
 type npmPublish struct {
 	*NpmPublishCommand
 }
 
-func (npu *npmPublish) upload() (err error) {
+func (npu *npmPublish) upload() error {
 	for _, packedFilePath := range npu.packedFilePaths {
 
-		if err = npu.readPackageInfoFromTarball(packedFilePath); err != nil {
+		if err := npu.readPackageInfoFromTarball(packedFilePath); err != nil {
 			return err
 		}
-		target := fmt.Sprintf("%s/%s", npu.repo, npu.packageInfo.GetDeployPath())
+
+		targetRepo, err := npu.getTargetRepo()
+		if err != nil {
+			return err
+		}
+		target := fmt.Sprintf("%s/%s", targetRepo, npu.packageInfo.GetDeployPath())
 
 		// If requested, perform a Xray binary scan before deployment. If a FailBuildError is returned, skip the deployment.
 		if npu.xrayScan {
 			if err = performXrayScan(packedFilePath, npu.repo, npu.serverDetails, npu.scanOutputFormat); err != nil {
-				return
+				return err
 			}
 		}
 		err = errors.Join(err, npu.publishPackage(npu.executablePath, packedFilePath, npu.serverDetails, target))
 	}
-	return err
+	return nil
 }
 
 func (npu *npmPublish) getBuildArtifacts() ([]buildinfo.Artifact, error) {
@@ -82,3 +88,33 @@ func (npu *npmPublish) publishPackage(executablePath, filePath string, serverDet
 	}
 	return nil
 }
+
+func (npu *NpmPublishCommand) getTargetRepo() (string, error) {
+	var registryString string
+	scope := npu.packageInfo.Scope
+	if scope == "" {
+		registryString = "registry"
+	} else {
+		registryString = scope + ":registry"
+	}
+	configCommand := gofrogcmd.Command{
+		Executable: npu.executablePath,
+		CmdName:    "config",
+		CmdArgs:    []string{"get", registryString},
+	}
+	data, err := configCommand.RunWithOutput()
+	repoConfig := string(data)
+	if err != nil {
+		log.Error("Error occurred while running npm config get: ", err)
+		npu.result.SetFailCount(npu.result.FailCount() + 1)
+		return "", err
+	}
+	return extractRepoName(repoConfig), nil
+}
+
+func extractRepoName(configUrl string) string {
+	url := strings.TrimSpace(configUrl)
+	urlParts := strings.Split(url, "/")
+	repoName := urlParts[len(urlParts)-1]
+	return repoName
+}

go.mod

@@ -121,7 +121,7 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-replace github.com/jfrog/jfrog-cli-core/v2 => github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413220436-b46ff5daaf5e
+replace github.com/jfrog/jfrog-cli-core/v2 => github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250420214742-c12c4050641f
 
 replace github.com/jfrog/jfrog-client-go => github.com/fluxxBot/jfrog-client-go v1.28.1-0.20250413214704-1b6cdf0520c6
 

go.sum

@@ -54,8 +54,8 @@ github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o
 github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413220436-b46ff5daaf5e h1:q0BinSmz7ZhYbkuow5I+R3DhOIHFIcKk/ZxkE/GSW1w=
-github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413220436-b46ff5daaf5e/go.mod h1:eV3CTP/F4nEYE7p4WojZc4ruU1/3sXj0o/ctnjmO5fw=
+github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250420214742-c12c4050641f h1:SdMa2iO2PqNegvh57uHkWy/00RySEO/CeiZCSa9rT8w=
+github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250420214742-c12c4050641f/go.mod h1:nrKlwWRT7BT9TqE51WSIpUlO8uQR6qWHlp3UiKqC4nc=
 github.com/fluxxBot/jfrog-client-go v1.28.1-0.20250413214704-1b6cdf0520c6 h1:krAN+7hGggGDXfAlcC8eni2QxWfW7I5JVNPvhI3vS4U=
 github.com/fluxxBot/jfrog-client-go v1.28.1-0.20250413214704-1b6cdf0520c6/go.mod h1:uRmT8Q1SJymIzId01v0W1o8mGqrRfrwUF53CgEMsH0U=
 github.com/forPelevin/gomoji v1.3.0 h1:WPIOLWB1bvRYlKZnSSEevLt3IfKlLs+tK+YA9fFYlkE=