Merge remote-tracking branch 'origin/dev' into v2

.github/workflows/pythonTests.yml

@@ -29,7 +29,7 @@ jobs:
           go-version: 1.20.x
       # Due to a bug in Python 3.12.0 we temporary use version 3.11.5
       - name: Setup Python3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11.5"
       - name: Setup Pipenv

Jenkinsfile

@@ -31,7 +31,7 @@ node("docker") {
     repo = 'jfrog-cli'
     sh 'rm -rf temp'
     sh 'mkdir temp'
-    def goRoot = tool 'go-1.20.10'
+    def goRoot = tool 'go-1.20.14'
     env.GOROOT="$goRoot"
     env.PATH+=":${goRoot}/bin:/tmp/node-${nodeVersion}-linux-x64/bin"
     env.GO111MODULE="on"

artifactory/cli.go

@@ -267,6 +267,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:         "build-scan",
+			Hidden:       true,
 			Flags:        cliutils.GetCommandFlags(cliutils.BuildScanLegacy),
 			Aliases:      []string{"bs"},
 			Usage:        buildscan.GetDescription(),
@@ -323,6 +324,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:         "mvn-config",
+			Hidden:       true,
 			Aliases:      []string{"mvnc"},
 			Flags:        cliutils.GetCommandFlags(cliutils.MvnConfig),
 			Usage:        mvnconfig.GetDescription(),
@@ -335,6 +337,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:            "mvn",
+			Hidden:          true,
 			Flags:           cliutils.GetCommandFlags(cliutils.Mvn),
 			Usage:           mvndoc.GetDescription(),
 			HelpName:        corecommon.CreateUsage("rt mvn", mvndoc.GetDescription(), mvndoc.Usage),
@@ -348,6 +351,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:         "gradle-config",
+			Hidden:       true,
 			Aliases:      []string{"gradlec"},
 			Flags:        cliutils.GetCommandFlags(cliutils.GradleConfig),
 			Usage:        gradleconfig.GetDescription(),
@@ -360,6 +364,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:            "gradle",
+			Hidden:          true,
 			Flags:           cliutils.GetCommandFlags(cliutils.Gradle),
 			Usage:           gradledoc.GetDescription(),
 			HelpName:        corecommon.CreateUsage("rt gradle", gradledoc.GetDescription(), gradledoc.Usage),
@@ -384,6 +389,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:         "docker-push",
+			Hidden:       true,
 			Flags:        cliutils.GetCommandFlags(cliutils.ContainerPush),
 			Aliases:      []string{"dp"},
 			Usage:        dockerpush.GetDescription(),
@@ -397,6 +403,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:         "docker-pull",
+			Hidden:       true,
 			Flags:        cliutils.GetCommandFlags(cliutils.ContainerPull),
 			Aliases:      []string{"dpl"},
 			Usage:        dockerpull.GetDescription(),
@@ -458,6 +465,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:         "npm-config",
+			Hidden:       true,
 			Flags:        cliutils.GetCommandFlags(cliutils.NpmConfig),
 			Aliases:      []string{"npmc"},
 			Usage:        npmconfig.GetDescription(),
@@ -470,6 +478,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:            "npm-install",
+			Hidden:          true,
 			Flags:           cliutils.GetCommandFlags(cliutils.NpmInstallCi),
 			Aliases:         []string{"npmi"},
 			Usage:           npminstall.GetDescription(),
@@ -484,6 +493,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:            "npm-ci",
+			Hidden:          true,
 			Flags:           cliutils.GetCommandFlags(cliutils.NpmInstallCi),
 			Aliases:         []string{"npmci"},
 			Usage:           npmci.GetDescription(),
@@ -498,6 +508,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:            "npm-publish",
+			Hidden:          true,
 			Flags:           cliutils.GetCommandFlags(cliutils.NpmPublish),
 			Aliases:         []string{"npmp"},
 			Usage:           npmpublish.GetDescription(),
@@ -511,6 +522,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:         "yarn-config",
+			Hidden:       true,
 			Aliases:      []string{"yarnc"},
 			Flags:        cliutils.GetCommandFlags(cliutils.YarnConfig),
 			Usage:        yarnconfig.GetDescription(),
@@ -523,6 +535,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:            "yarn",
+			Hidden:          true,
 			Flags:           cliutils.GetCommandFlags(cliutils.Yarn),
 			Usage:           yarndocs.GetDescription(),
 			HelpName:        corecommon.CreateUsage("rt yarn", yarndocs.GetDescription(), yarndocs.Usage),
@@ -535,6 +548,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:         "nuget-config",
+			Hidden:       true,
 			Flags:        cliutils.GetCommandFlags(cliutils.NugetConfig),
 			Aliases:      []string{"nugetc"},
 			Usage:        nugetconfig.GetDescription(),
@@ -547,6 +561,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:            "nuget",
+			Hidden:          true,
 			Flags:           cliutils.GetCommandFlags(cliutils.Nuget),
 			Usage:           nugetdocs.GetDescription(),
 			HelpName:        corecommon.CreateUsage("rt nuget", nugetdocs.GetDescription(), nugetdocs.Usage),
@@ -569,6 +584,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:         "dotnet-config",
+			Hidden:       true,
 			Flags:        cliutils.GetCommandFlags(cliutils.DotnetConfig),
 			Aliases:      []string{"dotnetc"},
 			Usage:        dotnetconfig.GetDescription(),
@@ -581,6 +597,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:            "dotnet",
+			Hidden:          true,
 			Flags:           cliutils.GetCommandFlags(cliutils.Dotnet),
 			Usage:           dotnetdocs.GetDescription(),
 			HelpName:        corecommon.CreateUsage("rt dotnet", dotnetdocs.GetDescription(), dotnetdocs.Usage),
@@ -594,6 +611,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:         "go-config",
+			Hidden:       true,
 			Flags:        cliutils.GetCommandFlags(cliutils.GoConfig),
 			Usage:        goconfig.GetDescription(),
 			HelpName:     corecommon.CreateUsage("rt go-config", goconfig.GetDescription(), goconfig.Usage),
@@ -605,6 +623,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:         "go-publish",
+			Hidden:       true,
 			Flags:        cliutils.GetCommandFlags(cliutils.GoPublish),
 			Aliases:      []string{"gp"},
 			Usage:        gopublish.GetDescription(),
@@ -618,6 +637,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:            "go",
+			Hidden:          true,
 			Flags:           cliutils.GetCommandFlags(cliutils.Go),
 			Aliases:         []string{"go"},
 			Usage:           gocommand.GetDescription(),
@@ -654,6 +674,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:         "pip-config",
+			Hidden:       true,
 			Flags:        cliutils.GetCommandFlags(cliutils.PipConfig),
 			Aliases:      []string{"pipc"},
 			Usage:        pipconfig.GetDescription(),
@@ -666,6 +687,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:            "pip-install",
+			Hidden:          true,
 			Flags:           cliutils.GetCommandFlags(cliutils.PipInstall),
 			Aliases:         []string{"pipi"},
 			Usage:           pipinstall.GetDescription(),

artifactory_test.go

@@ -26,6 +26,7 @@ import (
 	biutils "github.com/jfrog/build-info-go/utils"
 
 	"github.com/buger/jsonparser"
+	"github.com/jfrog/archiver/v3"
 	gofrogio "github.com/jfrog/gofrog/io"
 	"github.com/jfrog/gofrog/version"
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic"
@@ -59,7 +60,6 @@ import (
 	"github.com/jfrog/jfrog-client-go/utils/io/httputils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	clientTestUtils "github.com/jfrog/jfrog-client-go/utils/tests"
-	"github.com/mholt/archiver/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -1805,7 +1805,7 @@ func checkIfServerIsUp(port, proxyScheme string, useClientCerts bool) error {
 
 func TestXrayScanBuild(t *testing.T) {
 	initArtifactoryTest(t, "")
-	xrayServerPort := xray.StartXrayMockServer()
+	xrayServerPort := xray.StartXrayMockServer(t)
 	serverUrl := "--url=http://localhost:" + strconv.Itoa(xrayServerPort)
 	artifactoryCommandExecutor := coretests.NewJfrogCli(execMain, "jfrog rt", serverUrl+getArtifactoryTestCredentials())
 	assert.NoError(t, artifactoryCommandExecutor.Exec("build-scan", xray.CleanScanBuildName, "3"))
@@ -4204,6 +4204,35 @@ func TestUploadZipAndCheckDeploymentViewWithArchive(t *testing.T) {
 
 }
 
+func TestUploadEmptyArchiveWithEmptyArchiveEnv(t *testing.T) {
+	initArtifactoryTest(t, "")
+
+	// Create tmp dir
+	assert.NoError(t, os.Mkdir(tests.Out, 0755))
+	wd, err := os.Getwd()
+	assert.NoError(t, err)
+	defer cleanArtifactoryTest()
+	chdirCallback := clientTestUtils.ChangeDirWithCallback(t, wd, tests.Out)
+	defer chdirCallback()
+
+	// Create file and a zip
+	zipName := "test.zip"
+
+	setEnvCallBack := clientTestUtils.SetEnvWithCallbackAndAssert(t, services.JfrogCliUploadEmptyArchiveEnv, "true")
+	defer setEnvCallBack()
+
+	// Upload & download zip file
+	assert.NoError(t, artifactoryCli.Exec("upload", "*", path.Join(tests.RtRepo1, zipName), "--exclusions", "**", "--archive", "zip"))
+	assert.NoError(t, artifactoryCli.Exec("download", path.Join(tests.RtRepo1, zipName)))
+
+	// Check that the zip file uploaded and it's empty
+	assert.FileExists(t, zipName)
+	r, err := zip.OpenReader(zipName)
+	assert.NoError(t, err)
+	defer func() { assert.NoError(t, r.Close()) }()
+	assert.Empty(t, r.File)
+}
+
 func TestUploadDetailedSummary(t *testing.T) {
 	initArtifactoryTest(t, "")
 	uploadCmd := generic.NewUploadCommand()

build/npm/v2-jf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jfrog-cli-v2-jf",
-  "version": "2.52.10",
+  "version": "2.53.0",
   "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
   "homepage": "https://github.com/jfrog/jfrog-cli",
   "preferGlobal": true,

build/npm/v2/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jfrog-cli-v2",
-  "version": "2.52.10",
+  "version": "2.53.0",
   "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
   "homepage": "https://github.com/jfrog/jfrog-cli",
   "preferGlobal": true,

buildtools/cli.go

@@ -50,6 +50,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/pnpmconfig"
 	"github.com/jfrog/jfrog-cli/docs/buildtools/poetry"
 	"github.com/jfrog/jfrog-cli/docs/buildtools/poetryconfig"
 	yarndocs "github.com/jfrog/jfrog-cli/docs/buildtools/yarn"
@@ -330,6 +331,19 @@ func GetCommands() []cli.Command {
 				return npmGenericCmd(c, cmdName, false)
 			},
 		},
+		{
+			Name:         "pnpm-config",
+			Flags:        cliutils.GetCommandFlags(cliutils.PnpmConfig),
+			Aliases:      []string{"pnpmc"},
+			Usage:        pnpmconfig.GetDescription(),
+			HelpName:     corecommon.CreateUsage("pnpm-config", pnpmconfig.GetDescription(), pnpmconfig.Usage),
+			ArgsUsage:    common.CreateEnvVars(),
+			BashComplete: corecommon.CreateBashCompletionFunc(),
+			Category:     buildToolsCategory,
+			Action: func(c *cli.Context) error {
+				return cliutils.CreateConfigCmd(c, project.Pnpm)
+			},
+		},
 		{
 			Name:      "docker",
 			Flags:     cliutils.GetCommandFlags(cliutils.Docker),

docs/artifactory/upload/help.go

@@ -5,7 +5,7 @@ import "github.com/jfrog/jfrog-cli/docs/common"
 var Usage = []string{"rt u [command options] <source pattern> <target pattern>",
 	"rt u --spec=<File Spec path> [command options]"}
 
-var EnvVar = []string{common.JfrogCliMinChecksumDeploySizeKb, common.JfrogCliFailNoOp}
+var EnvVar = []string{common.JfrogCliMinChecksumDeploySizeKb, common.JfrogCliFailNoOp, common.JfrogCliUploadEmptyArchive}
 
 func GetDescription() string {
 	return "Upload files."

docs/buildtools/pnpmconfig/help.go

@@ -0,0 +1,7 @@
+package pnpmconfig
+
+var Usage = []string{"pnpm-config [command options]"}
+
+func GetDescription() string {
+	return "Generate pnpm configuration."
+}

docs/common/env.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	"strings"
 
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
@@ -80,6 +81,10 @@ const (
 		Set to true if you'd like the command to return exit code 2 in case of no files are affected.
 		Support by the following commands: copy, delete, delete-props, set-props, download, move, search and upload`
 
+	JfrogCliUploadEmptyArchive = `   	` + services.JfrogCliUploadEmptyArchiveEnv + `
+		[Default: false]
+		Set to true if you'd like to upload an empty archive when '--archive' is set but all files were excluded by exclusions pattern. `
+
 	JfrogCliEncryptionKey = `   	JFROG_CLI_ENCRYPTION_KEY
 		If provided, encrypt the sensitive data stored in the config with the provided key. Must be exactly 32 characters.`
 
@@ -119,6 +124,7 @@ func GetGlobalEnvVars() string {
 		JfrogCliReleasesRepo,
 		JfrogCliDependenciesDir,
 		JfrogCliMinChecksumDeploySizeKb,
+		JfrogCliUploadEmptyArchive,
 		JfrogCliBuildUrl,
 		JfrogCliEnvExclude,
 		JfrogCliFailNoOp,