Improve upload archive progress bar

Signed-off-by: Michael Sverdlov <[email protected]>

buildtools/cli.go

@@ -6,9 +6,7 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/packagemanagerlogin"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
 	"github.com/jfrog/jfrog-cli-security/utils/techutils"
-	"golang.org/x/exp/maps"
 	"os"
-	"sort"
 	"strconv"
 	"strings"
 
@@ -75,15 +73,14 @@ const (
 func GetCommands() []cli.Command {
 	return cliutils.GetSortedCommands(cli.CommandsByName{
 		{
-			Name:            "setmeup",
-			Flags:           cliutils.GetCommandFlags(cliutils.Mvn),
-			Usage:           mvndoc.GetDescription(),
-			HelpName:        corecommon.CreateUsage("mvn", mvndoc.GetDescription(), mvndoc.Usage),
-			UsageText:       mvndoc.GetArguments(),
-			ArgsUsage:       common.CreateEnvVars(mvndoc.EnvVar...),
-			SkipFlagParsing: true,
-			BashComplete:    corecommon.CreateBashCompletionFunc(),
-			Action:          packageManagerLoginInteractiveCmd,
+			Name:         "setmeup",
+			Flags:        cliutils.GetCommandFlags(cliutils.Mvn),
+			Usage:        mvndoc.GetDescription(),
+			HelpName:     corecommon.CreateUsage("mvn", mvndoc.GetDescription(), mvndoc.Usage),
+			UsageText:    mvndoc.GetArguments(),
+			ArgsUsage:    common.CreateEnvVars(mvndoc.EnvVar...),
+			BashComplete: corecommon.CreateBashCompletionFunc(),
+			Action:       packageManagerLoginInteractiveCmd,
 		},
 		{
 			Name:         "mvn-config",
@@ -160,14 +157,7 @@ func GetCommands() []cli.Command {
 			SkipFlagParsing: true,
 			BashComplete:    corecommon.CreateBashCompletionFunc(),
 			Category:        buildToolsCategory,
-			Action: func(c *cli.Context) (errFromCmd error) {
-				cmdName, _ := getCommandName(c.Args())
-				return securityCLI.WrapCmdWithCurationPostFailureRun(c,
-					func(c *cli.Context) error {
-						return yarnGenericCmd(c, cmdName)
-					},
-					techutils.Yarn, cmdName)
-			},
+			Action:          YarnCmd,
 		},
 		{
 			Name:         "nuget-config",
@@ -565,17 +555,6 @@ func YarnCmd(c *cli.Context) error {
 	return commands.Exec(yarnCmd)
 }
 
-func yarnGenericCmd(c *cli.Context, cmdName string) error {
-	if show, err := cliutils.ShowCmdHelpIfNeeded(c, c.Args()); show || err != nil {
-		return err
-	}
-	if cmdName == "login" {
-		return packageManagerLoginCmd(c, project.Yarn)
-	}
-
-	return YarnCmd(c)
-}
-
 func NugetCmd(c *cli.Context) error {
 	if show, err := cliutils.ShowCmdHelpIfNeeded(c, c.Args()); show || err != nil {
 		return err
@@ -903,8 +882,6 @@ func npmGenericCmd(c *cli.Context, cmdName string, collectBuildInfoIfRequested b
 		collectBuildInfoIfRequested = true
 	case "publish", "p":
 		return NpmPublishCmd(c)
-	case "login":
-		return packageManagerLoginCmd(c, project.Npm)
 	}
 
 	// Run generic npm command.
@@ -951,18 +928,10 @@ func NpmPublishCmd(c *cli.Context) (err error) {
 }
 
 func packageManagerLoginInteractiveCmd(c *cli.Context) (err error) {
-	var supportedPackageManagers []string
-	for _, packageManager := range maps.Keys(packagemanagerlogin.PackageManagerToRepositoryPackageType) {
-		supportedPackageManagers = append(supportedPackageManagers, packageManager.String())
-	}
-
+	allSupportedPackageManagers := packagemanagerlogin.GetSupportedPackageManagersList()
 	var selected string
-	var selectedPackageManager project.ProjectType
 	var selectableItems []ioutils.PromptItem
-	allSupportedPackageManagers := maps.Keys(packagemanagerlogin.PackageManagerToRepositoryPackageType)
-	sort.Slice(allSupportedPackageManagers, func(i, j int) bool {
-		return allSupportedPackageManagers[i] < allSupportedPackageManagers[j]
-	})
+	var selectedPackageManager project.ProjectType
 	for _, packageManager := range allSupportedPackageManagers {
 		selectableItems = append(selectableItems, ioutils.PromptItem{Option: packageManager.String(), TargetValue: &selected})
 	}
@@ -980,9 +949,6 @@ func packageManagerLoginInteractiveCmd(c *cli.Context) (err error) {
 }
 
 func packageManagerLoginCmd(c *cli.Context, buildTool project.ProjectType) (err error) {
-	if show, err := cliutils.ShowGenericCmdHelpIfNeeded(c, c.Args(), buildTool.String()+"loginhelp"); show || err != nil {
-		return err
-	}
 	packageManagerLoginCmd := packagemanagerlogin.NewPackageManagerLoginCommand(buildTool)
 	artDetails, err := cliutils.CreateArtifactoryDetailsByFlags(c)
 	if err != nil {
@@ -1037,10 +1003,6 @@ func pythonCmd(c *cli.Context, projectType project.ProjectType) error {
 	orgArgs := cliutils.ExtractCommand(c)
 	cmdName, filteredArgs := getCommandName(orgArgs)
 
-	if cmdName == "login" {
-		return packageManagerLoginCmd(c, projectType)
-	}
-
 	switch projectType {
 	case project.Pip:
 		pipCommand := python.NewPipCommand()

docs/buildtools/mvn/help.go

@@ -7,7 +7,7 @@ var Usage = []string{"mvn <goals and options> [command options]"}
 var EnvVar = []string{common.JfrogCliReleasesRepo, common.JfrogCliDependenciesDir}
 
 func GetDescription() string {
-	return "Package manager set me up command."
+	return "Run Maven build."
 }
 
 func GetArguments() string {

go.mod

@@ -167,7 +167,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/jfrog/jfrog-cli-core/v2 => github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20241120173223-5f8e0aa3be05
+replace github.com/jfrog/jfrog-cli-core/v2 => github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20241121094528-43d1a80bf3a2
 
 // replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.12.5-0.20241107141149-42cf964808a1
 

go.sum

@@ -333,8 +333,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20241120173223-5f8e0aa3be05 h1:zu+jEEz/KL4v2kHfdNdggcdBztA5UeLpVDhY81bCfxA=
-github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20241120173223-5f8e0aa3be05/go.mod h1:RY74eDpw1WBxruSfZ0HO1ax7c1NAj+rbBgA/hVOJNME=
+github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20241121094528-43d1a80bf3a2 h1:3os76B+hAcUH2GgVuKbTz/dSyezrrLDIj+xypX6qOlI=
+github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20241121094528-43d1a80bf3a2/go.mod h1:RY74eDpw1WBxruSfZ0HO1ax7c1NAj+rbBgA/hVOJNME=
 github.com/terminalstatic/go-xsd-validate v0.1.5 h1:RqpJnf6HGE2CB/lZB1A8BYguk8uRtcvYAPLCF15qguo=
 github.com/terminalstatic/go-xsd-validate v0.1.5/go.mod h1:18lsvYFofBflqCrvo1umpABZ99+GneNTw2kEEc8UPJw=
 github.com/testcontainers/testcontainers-go v0.34.0 h1:5fbgF0vIN5u+nD3IWabQwRybuB4GY8G2HHgCkbMzMHo=

utils/cliutils/commandsflags.go

@@ -14,7 +14,6 @@ import (
 
 const (
 	// CLI base commands keys
-	Setup = "setup"
 	Intro = "intro"
 
 	// Artifactory's Commands Keys
@@ -53,11 +52,9 @@ const (
 	Npm                    = "npm"
 	NpmInstallCi           = "npm-install-ci"
 	NpmPublish             = "npm-publish"
-	NpmLogin               = "npm-login"
 	PnpmConfig             = "pnpm-config"
 	YarnConfig             = "yarn-config"
 	Yarn                   = "yarn"
-	YarnLogin              = "yarn-login"
 	NugetConfig            = "nuget-config"
 	Nuget                  = "nuget"
 	Dotnet                 = "dotnet"