From 2786a93bfef83620b1a3d530a40b70ea0e58ef50 Mon Sep 17 00:00:00 2001 From: Tal Arian Date: Wed, 31 May 2023 17:03:04 +0300 Subject: [PATCH 1/3] Fix `Jf Audit` command entitlements service error (#2005) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 11a46f70c..0796d3ff4 100644 --- a/go.mod +++ b/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 diff --git a/go.sum b/go.sum index f3a16c8ad..2b4732422 100644 --- a/go.sum +++ b/go.sum @@ -244,8 +244,8 @@ github.com/jfrog/build-info-go v1.9.6 h1:lCJ2j5uXAlJsSwDe5J8WD7Co1f/hUlZvMfwfb5A github.com/jfrog/build-info-go v1.9.6/go.mod h1:GbuFS+viHCKZYx9nWHYu7ab1DgQkFdtVN3BJPUNb2D4= github.com/jfrog/gofrog v1.3.0 h1:o4zgsBZE4QyDbz2M7D4K6fXPTBJht+8lE87mS9bw7Gk= github.com/jfrog/gofrog v1.3.0/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0= -github.com/jfrog/jfrog-cli-core/v2 v2.34.7 h1:1VYp84F5KxjDwynnkaPfh0VM+8mOco/fWVNLMORyOqg= -github.com/jfrog/jfrog-cli-core/v2 v2.34.7/go.mod h1:htVCrvgB2P3ROJNQEPs2LptVTQ33l8349q9t/zD/hAM= +github.com/jfrog/jfrog-cli-core/v2 v2.34.8 h1:Ndl/0rF1t2wGQr38XnTxwBDOTiKvCxupfQFBMVPJf4g= +github.com/jfrog/jfrog-cli-core/v2 v2.34.8/go.mod h1:htVCrvgB2P3ROJNQEPs2LptVTQ33l8349q9t/zD/hAM= github.com/jfrog/jfrog-client-go v1.29.1 h1:R5NyZ6qbroY8uG6vWX/5nLjATMo8OMOhyVd3GcejFDI= github.com/jfrog/jfrog-client-go v1.29.1/go.mod h1:nGUoz5Qi9kTP0VfkvOVJ3nudsD3dq3y/d0sLjlkpnrI= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= From 37fa58496fb7381fd374757e8021f53a9f05fc14 Mon Sep 17 00:00:00 2001 From: Tal Arian Date: Wed, 31 May 2023 17:39:32 +0300 Subject: [PATCH 2/3] Promoted version to 2.38.5 (#2006) --- build/npm/v2-jf/package-lock.json | 2 +- build/npm/v2-jf/package.json | 2 +- build/npm/v2/package-lock.json | 2 +- build/npm/v2/package.json | 2 +- utils/cliutils/cli_consts.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/npm/v2-jf/package-lock.json b/build/npm/v2-jf/package-lock.json index 6be05fcc6..5fbb480c4 100644 --- a/build/npm/v2-jf/package-lock.json +++ b/build/npm/v2-jf/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.38.4", + "version": "2.38.5", "lockfileVersion": 1 } diff --git a/build/npm/v2-jf/package.json b/build/npm/v2-jf/package.json index a6e784316..a407ebe12 100644 --- a/build/npm/v2-jf/package.json +++ b/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, diff --git a/build/npm/v2/package-lock.json b/build/npm/v2/package-lock.json index e7f70cecb..01ec633c2 100644 --- a/build/npm/v2/package-lock.json +++ b/build/npm/v2/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2", - "version": "2.38.4", + "version": "2.38.5", "lockfileVersion": 1 } diff --git a/build/npm/v2/package.json b/build/npm/v2/package.json index e203809a2..241efeadb 100644 --- a/build/npm/v2/package.json +++ b/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, diff --git a/utils/cliutils/cli_consts.go b/utils/cliutils/cli_consts.go index d74b2178f..cf6db0f81 100644 --- a/utils/cliutils/cli_consts.go +++ b/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: From c79ab4943324140dabbfc06f8d3fabfa78409048 Mon Sep 17 00:00:00 2001 From: Yahav Itzhak Date: Thu, 1 Jun 2023 10:10:34 +0300 Subject: [PATCH 3/3] Transfer config - allow providing the src work dir (#1923) --- artifactory/cli.go | 6 ++++-- go.mod | 2 +- go.sum | 4 ++-- utils/cliutils/commandsflags.go | 22 ++++++++++++++-------- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/artifactory/cli.go b/artifactory/cli.go index 4aef60dd9..48aa8d0c5 100644 --- a/artifactory/cli.go +++ b/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) diff --git a/go.mod b/go.mod index 0796d3ff4..876687b74 100644 --- a/go.mod +++ b/go.mod @@ -122,7 +122,7 @@ require ( // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go -// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230530104049-0f993080d1b6 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/yahavi/jfrog-cli-core/v2 v2.0.0-20230601063242-62fec2742947 // replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27 diff --git a/go.sum b/go.sum index 2b4732422..235b478b2 100644 --- a/go.sum +++ b/go.sum @@ -244,8 +244,6 @@ github.com/jfrog/build-info-go v1.9.6 h1:lCJ2j5uXAlJsSwDe5J8WD7Co1f/hUlZvMfwfb5A github.com/jfrog/build-info-go v1.9.6/go.mod h1:GbuFS+viHCKZYx9nWHYu7ab1DgQkFdtVN3BJPUNb2D4= github.com/jfrog/gofrog v1.3.0 h1:o4zgsBZE4QyDbz2M7D4K6fXPTBJht+8lE87mS9bw7Gk= github.com/jfrog/gofrog v1.3.0/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0= -github.com/jfrog/jfrog-cli-core/v2 v2.34.8 h1:Ndl/0rF1t2wGQr38XnTxwBDOTiKvCxupfQFBMVPJf4g= -github.com/jfrog/jfrog-cli-core/v2 v2.34.8/go.mod h1:htVCrvgB2P3ROJNQEPs2LptVTQ33l8349q9t/zD/hAM= github.com/jfrog/jfrog-client-go v1.29.1 h1:R5NyZ6qbroY8uG6vWX/5nLjATMo8OMOhyVd3GcejFDI= github.com/jfrog/jfrog-client-go v1.29.1/go.mod h1:nGUoz5Qi9kTP0VfkvOVJ3nudsD3dq3y/d0sLjlkpnrI= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -414,6 +412,8 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofm github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= +github.com/yahavi/jfrog-cli-core/v2 v2.0.0-20230601063242-62fec2742947 h1:pQ813cJzeHPVS+qiD0QonhnW88xb/Tife3rgPJDXMXM= +github.com/yahavi/jfrog-cli-core/v2 v2.0.0-20230601063242-62fec2742947/go.mod h1:htVCrvgB2P3ROJNQEPs2LptVTQ33l8349q9t/zD/hAM= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/utils/cliutils/commandsflags.go b/utils/cliutils/commandsflags.go index c97b88be4..1c9dd5f10 100644 --- a/utils/cliutils/commandsflags.go +++ b/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,