Merge remote-tracking branch 'upstream/dev' into skip-non-empty

artifactory/cli.go

@@ -2343,8 +2343,10 @@ func transferConfigCmd(c *cli.Context) error {
  }
 
  // Run transfer config command
- transferConfigCmd := transferconfigcore.NewTransferConfigCommand(sourceServerDetails, targetServerDetails).SetForce(c.Bool(cliutils.Force)).
- SetVerbose(c.Bool(cliutils.Verbose)).SetPreChecks(c.Bool(cliutils.PreChecks)).SetWorkingDir(c.String(cliutils.WorkingDir))
+ transferConfigCmd := transferconfigcore.NewTransferConfigCommand(sourceServerDetails, targetServerDetails).
+ SetForce(c.Bool(cliutils.Force)).SetVerbose(c.Bool(cliutils.Verbose)).SetPreChecks(c.Bool(cliutils.PreChecks)).
+ SetSourceWorkingDir(c.String(cliutils.SourceWorkingDir)).
+ SetTargetWorkingDir(c.String(cliutils.TargetWorkingDir))
  includeReposPatterns, excludeReposPatterns := getTransferIncludeExcludeRepos(c)
  transferConfigCmd.SetIncludeReposPatterns(includeReposPatterns)
  transferConfigCmd.SetExcludeReposPatterns(excludeReposPatterns)

build/npm/v2-jf/package.json

@@ -1,6 +1,6 @@
 {
  "name": "jfrog-cli-v2-jf",
- "version": "2.38.4",
+ "version": "2.38.5",
  "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.38.4",
+ "version": "2.38.5",
  "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
  "homepage": "https://github.com/jfrog/jfrog-cli",
  "preferGlobal": true,

go.mod

@@ -9,7 +9,7 @@ require (
  github.com/gocarina/gocsv v0.0.0-20230513223533-9ddd7fd60602
  github.com/jfrog/build-info-go v1.9.6
  github.com/jfrog/gofrog v1.3.0
- github.com/jfrog/jfrog-cli-core/v2 v2.34.7
+ github.com/jfrog/jfrog-cli-core/v2 v2.34.8
  github.com/jfrog/jfrog-client-go v1.29.1
  github.com/jszwec/csvutil v1.8.0
  github.com/mholt/archiver/v3 v3.5.1

utils/cliutils/cli_consts.go

@@ -4,7 +4,7 @@ import "time"
 
 const (
  // General CLI constants
- CliVersion = "2.38.4"
+ CliVersion = "2.38.5"
  ClientAgent = "jfrog-cli-go"
 
  // CLI base commands constants:

utils/cliutils/commandsflags.go

@@ -2,11 +2,12 @@ package cliutils
 
 import (
  "fmt"
- "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
- "github.com/jfrog/jfrog-cli-core/v2/xray/commands/offlineupdate"
  "sort"
  "strconv"
 
+ "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+ "github.com/jfrog/jfrog-cli-core/v2/xray/commands/offlineupdate"
+
  "github.com/jfrog/jfrog-client-go/utils/log"
  "github.com/urfave/cli"
 )
@@ -394,9 +395,10 @@ const (
  xrayScan = "scan"
 
  // Unique config transfer flags
- Force = "force"
- Verbose = "verbose"
- WorkingDir = "working-dir"
+ Force = "force"
+ Verbose = "verbose"
+ SourceWorkingDir = "source-working-dir"
+ TargetWorkingDir = "target-working-dir"
 
  // *** Distribution Commands' flags ***
  // Base flags
@@ -1154,8 +1156,12 @@ var flagsMap = map[string]cli.Flag{
  Name: Verbose,
  Usage: "[Default: false] Set to true to increase verbosity during the export configuration from the source Artifactory phase.` `",
  },
- WorkingDir: cli.StringFlag{
- Name: WorkingDir,
+ SourceWorkingDir: cli.StringFlag{
+ Name: SourceWorkingDir,
+ Usage: "[Default: $JFROG_CLI_TEMP_DIR] Local working directory on the source Artifactory server.` `",
+ },
+ TargetWorkingDir: cli.StringFlag{
+ Name: TargetWorkingDir,
  Usage: "[Default: '/storage'] Local working directory on the target Artifactory server.` `",
  },
 
@@ -1725,7 +1731,7 @@ var commandFlags = map[string][]string{
  buildName, buildNumber, module, project,
  },
  TransferConfig: {
- Force, Verbose, IncludeRepos, ExcludeRepos, WorkingDir, PreChecks,
+ Force, Verbose, IncludeRepos, ExcludeRepos, SourceWorkingDir, TargetWorkingDir, PreChecks,
  },
  TransferConfigMerge: {
  IncludeRepos, ExcludeRepos, IncludeProjects, ExcludeProjects,