Add PNPM package manager support

Author: nartuk

buildtools/cli.go

@@ -31,6 +31,7 @@ import (
 	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/mvn"
 	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/npm"
 	containerutils "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/ocicontainer"
+	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/pnpm"
 	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/terraform"
 	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/yarn"
 	commandsUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
@@ -68,6 +69,7 @@ import (
 	"github.com/jfrog/jfrog-cli/docs/buildtools/pipenvconfig"
 	"github.com/jfrog/jfrog-cli/docs/buildtools/pipenvinstall"
 	"github.com/jfrog/jfrog-cli/docs/buildtools/pipinstall"
+	"github.com/jfrog/jfrog-cli/docs/buildtools/pnpmcommand"
 	"github.com/jfrog/jfrog-cli/docs/buildtools/pnpmconfig"
 	"github.com/jfrog/jfrog-cli/docs/buildtools/poetry"
 	"github.com/jfrog/jfrog-cli/docs/buildtools/poetryconfig"
@@ -426,6 +428,23 @@ func GetCommands() []cli.Command {
 				return cliutils.CreateConfigCmd(c, project.Pnpm)
 			},
 		},
+		{
+			Name:            "pnpm",
+			Usage:           pnpmcommand.GetDescription(),
+			HelpName:        corecommon.CreateUsage("pnpm", pnpmcommand.GetDescription(), pnpmcommand.Usage),
+			UsageText:       pnpmcommand.GetArguments(),
+			SkipFlagParsing: true,
+			BashComplete:    corecommon.CreateBashCompletionFunc("install", "i", "add", "ci", "publish", "p"),
+			Category:        buildToolsCategory,
+			Action: func(c *cli.Context) (errFromCmd error) {
+				cmdName, _ := getCommandName(c.Args())
+				return securityCLI.WrapCmdWithCurationPostFailureRun(c,
+					func(c *cli.Context) error {
+						return pnpmGenericCmd(c, cmdName, false)
+					},
+					techutils.Pnpm, cmdName)
+			},
+		},
 		{
 			Name:            "docker",
 			Flags:           cliutils.GetCommandFlags(cliutils.Docker),
@@ -1422,6 +1441,74 @@ func GetNpmConfigAndArgs(c *cli.Context) (configFilePath string, args []string,
 	return
 }
 
+func pnpmGenericCmd(c *cli.Context, cmdName string, collectBuildInfoIfRequested bool) error {
+	if show, err := cliutils.ShowCmdHelpIfNeeded(c, c.Args()); show || err != nil {
+		return err
+	}
+	switch cmdName {
+	// Aliases accepted by pnpm.
+	case "i", "add", "install":
+		cmdName = "install"
+		collectBuildInfoIfRequested = true
+	case "ci":
+		collectBuildInfoIfRequested = true
+	case "publish", "p":
+		return PnpmPublishCmd(c)
+	}
+
+	// Run generic pnpm command.
+	pnpmCmd := pnpm.NewPnpmCommand(cmdName, collectBuildInfoIfRequested)
+
+	configFilePath, args, err := GetPnpmConfigAndArgs(c)
+	if err != nil {
+		return err
+	}
+	pnpmCmd.SetConfigFilePath(configFilePath).SetArgs(args)
+	if err = pnpmCmd.Init(); err != nil {
+		return err
+	}
+	return commands.Exec(pnpmCmd)
+}
+
+func PnpmPublishCmd(c *cli.Context) (err error) {
+	if show, err := cliutils.ShowGenericCmdHelpIfNeeded(c, c.Args(), "pnpmpublishhelp"); show || err != nil {
+		return err
+	}
+
+	configFilePath, args, err := GetPnpmConfigAndArgs(c)
+	if err != nil {
+		return err
+	}
+
+	pnpmCmd := pnpm.NewPnpmPublishCommand()
+	pnpmCmd.SetConfigFilePath(configFilePath).SetArgs(args)
+	if err = pnpmCmd.Init(); err != nil {
+		return err
+	}
+	if pnpmCmd.GetXrayScan() {
+		commandsUtils.ConditionalUploadScanFunc = scan.ConditionalUploadDefaultScanFunc
+	}
+	// deployment view are not available for native pnpm commands
+	printDeploymentView, detailedSummary := log.IsStdErrTerminal() && !pnpmCmd.UseNative(), pnpmCmd.IsDetailedSummary()
+	if !detailedSummary {
+		pnpmCmd.SetDetailedSummary(printDeploymentView)
+	}
+	err = commands.Exec(pnpmCmd)
+	result := pnpmCmd.Result()
+	defer cliutils.CleanupResult(result, &err)
+	err = cliutils.PrintCommandSummary(pnpmCmd.Result(), detailedSummary, printDeploymentView, false, err)
+	return
+}
+
+func GetPnpmConfigAndArgs(c *cli.Context) (configFilePath string, args []string, err error) {
+	configFilePath, err = getProjectConfigPathOrThrow(project.Pnpm, "pnpm", "pnpm-config")
+	if err != nil {
+		return
+	}
+	_, args = getCommandName(c.Args())
+	return
+}
+
 func PipCmd(c *cli.Context) error {
 	return pythonCmd(c, project.Pip)
 }

buildtools/help.go

@@ -9,6 +9,7 @@ import (
 	"github.com/jfrog/jfrog-cli/docs/buildtools/dockerpush"
 	"github.com/jfrog/jfrog-cli/docs/buildtools/npmci"
 	"github.com/jfrog/jfrog-cli/docs/buildtools/npminstall"
+	"github.com/jfrog/jfrog-cli/docs/buildtools/pnpmpublish"
 	"github.com/jfrog/jfrog-cli/docs/common"
 	"github.com/jfrog/jfrog-cli/utils/cliutils"
 	"github.com/urfave/cli"
@@ -80,5 +81,13 @@ func GetBuildToolsHelpCommands() []cli.Command {
 			ArgsUsage: common.CreateEnvVars(),
 			Hidden:    true,
 		},
+		{
+			Name:      "pnpmpublishhelp",
+			Flags:     cliutils.GetCommandFlags(cliutils.PnpmPublish),
+			Usage:     pnpmpublish.GetDescription(),
+			HelpName:  corecommon.CreateUsage("pnpm publish", pnpmpublish.GetDescription(), pnpmpublish.Usage),
+			ArgsUsage: common.CreateEnvVars(),
+			Hidden:    true,
+		},
 	})
 }

docs/buildtools/pnpmcommand/help.go

@@ -0,0 +1,14 @@
+package pnpmcommand
+
+var Usage = []string{"pnpm <pnpm arguments> [command options]"}
+
+func GetDescription() string {
+	return "Run pnpm command."
+}
+
+func GetArguments() string {
+	return `	ci                        Run pnpm ci.
+	publish, p                Packs and deploys the pnpm package to the designated npm repository.
+	install, i, add           Run pnpm install.
+	help, h`
+}

docs/buildtools/pnpmpublish/help.go

@@ -0,0 +1,7 @@
+package pnpmpublish
+
+var Usage = []string{"pnpm publish [command options]"}
+
+func GetDescription() string {
+	return "Packs and deploys the pnpm package to the designated npm repository."
+}

utils/cliutils/commandsflags.go

@@ -57,6 +57,9 @@ const (
 	NpmInstallCi           = "npm-install-ci"
 	NpmPublish             = "npm-publish"
 	PnpmConfig             = "pnpm-config"
+	Pnpm                   = "pnpm"
+	PnpmInstallCi          = "pnpm-install-ci"
+	PnpmPublish            = "pnpm-publish"
 	YarnConfig             = "yarn-config"
 	Yarn                   = "yarn"
 	NugetConfig            = "nuget-config"
@@ -1908,7 +1911,14 @@ var commandFlags = map[string][]string{
 		BuildName, BuildNumber, module, Project, npmDetailedSummary, xrayScan, xrOutput, runNative, npmWorkspaces,
 	},
 	PnpmConfig: {
-		global, serverIdResolve, repoResolve,
+		global, serverIdResolve, serverIdDeploy, repoResolve, repoDeploy,
+	},
+	Pnpm: {},
+	PnpmInstallCi: {
+		BuildName, BuildNumber, module, Project, runNative,
+	},
+	PnpmPublish: {
+		BuildName, BuildNumber, module, Project, npmDetailedSummary, xrayScan, xrOutput, runNative,
 	},
 	YarnConfig: {
 		global, serverIdResolve, repoResolve,