Transfer config - allow providing the src work dir

artifactory/commands/transferconfig/transferconfig.go

@@ -35,11 +35,12 @@ const (
 
 type TransferConfigCommand struct {
  commandsUtils.TransferConfigBase
- dryRun bool
- force bool
- verbose bool
- preChecks bool
- workingDir string
+ dryRun bool
+ force bool
+ verbose bool
+ preChecks bool
+ sourceWorkingDir string
+ targetWorkingDir string
 }
 
 func NewTransferConfigCommand(sourceServer, targetServer *config.ServerDetails) *TransferConfigCommand {
@@ -70,8 +71,13 @@ func (tcc *TransferConfigCommand) SetPreChecks(preChecks bool) *TransferConfigCo
  return tcc
 }
 
-func (tcc *TransferConfigCommand) SetWorkingDir(workingDir string) *TransferConfigCommand {
- tcc.workingDir = workingDir
+func (tcc *TransferConfigCommand) SetSourceWorkingDir(workingDir string) *TransferConfigCommand {
+ tcc.sourceWorkingDir = workingDir
+ return tcc
+}
+
+func (tcc *TransferConfigCommand) SetTargetWorkingDir(workingDir string) *TransferConfigCommand {
+ tcc.targetWorkingDir = workingDir
  return tcc
 }
 
@@ -168,6 +174,26 @@ func (tcc *TransferConfigCommand) runPreparations() error {
  return tcc.validateTargetServer()
 }
 
+func (tcc *TransferConfigCommand) createExportPath() (string, func(), error) {
+ unsetTempDir := func() {}
+ if tcc.sourceWorkingDir != "" {
+ // Set the base temp dir according to the value of the --source-working-dir flag
+ oldTempDir := fileutils.GetTempDirBase()
+ fileutils.SetTempDirBase(tcc.sourceWorkingDir)
+ unsetTempDir = func() {
+ fileutils.SetTempDirBase(oldTempDir)
+ }
+ }
+
+ // Create temp directory that will contain the export directory
+ tempDir, err := fileutils.CreateTempDir()
+ if err != nil {
+ return "", unsetTempDir, err
+ }
+
+ return tempDir, unsetTempDir, errorutils.CheckError(os.Chmod(tempDir, 0700))
+}
+
 func (tcc *TransferConfigCommand) runPreChecks() error {
  // Warn if default admin:password credentials are exist in the source server
  _, err := tcc.IsDefaultCredentials()
@@ -323,39 +349,36 @@ func (tcc *TransferConfigCommand) getEncryptedItems(selectedSourceRepos map[util
 // Return the path to the export directory, a cleanup function and an error.
 func (tcc *TransferConfigCommand) exportSourceArtifactory() (string, func() error, error) {
  // Create temp directory that will contain the export directory
- tempDir, err := fileutils.CreateTempDir()
+ exportPath, unsetTempDir, err := tcc.createExportPath()
+ defer unsetTempDir()
  if err != nil {
  return "", func() error { return nil }, err
  }
 
- if err = os.Chmod(tempDir, 0700); err != nil {
- return "", func() error { return nil }, errorutils.CheckError(err)
- }
-
  // Do export
  trueValue := true
  falseValue := false
  exportParams := services.ExportParams{
- ExportPath: tempDir,
+ ExportPath: exportPath,
  IncludeMetadata: &falseValue,
  Verbose: &tcc.verbose,
  ExcludeContent: &trueValue,
  }
- cleanUp := func() error { return fileutils.RemoveTempDir(tempDir) }
+ cleanUp := func() error { return fileutils.RemoveTempDir(exportPath) }
  if err = tcc.SourceArtifactoryManager.Export(exportParams); err != nil {
  return "", cleanUp, err
  }
 
  // Make sure only the export directory contained in the temp directory
- files, err := fileutils.ListFiles(tempDir, true)
+ files, err := fileutils.ListFiles(exportPath, true)
  if err != nil {
  return "", cleanUp, err
  }
  if len(files) == 0 {
- return "", cleanUp, errorutils.CheckErrorf("couldn't find the export directory in '%s'. Please make sure to run this command inside the source Artifactory machine", tempDir)
+ return "", cleanUp, errorutils.CheckErrorf("couldn't find the export directory in '%s'. Please make sure to run this command inside the source Artifactory machine", exportPath)
  }
  if len(files) > 1 {
- return "", cleanUp, errorutils.CheckErrorf("only the exported directory is expected to be in the export directory %s, but found %q", tempDir, files)
+ return "", cleanUp, errorutils.CheckErrorf("only the exported directory is expected to be in the export directory %s, but found %q", exportPath, files)
  }
 
  // Return the export directory and the cleanup function
@@ -505,8 +528,8 @@ func (tcc *TransferConfigCommand) updateServerDetails() error {
 }
 
 func (tcc *TransferConfigCommand) getWorkingDirParam() string {
- if tcc.workingDir != "" {
- return "?params=workingDir=" + tcc.workingDir
+ if tcc.targetWorkingDir != "" {
+ return "?params=workingDir=" + tcc.targetWorkingDir
  }
  return ""
 }

artifactory/commands/transferconfig/transferconfig_test.go

@@ -7,13 +7,16 @@ import (
  "net/http"
  "os"
  "path/filepath"
+ "strings"
  "testing"
 
  commandUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
  "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
  commonTests "github.com/jfrog/jfrog-cli-core/v2/common/tests"
  "github.com/jfrog/jfrog-cli-core/v2/utils/config"
+ "github.com/jfrog/jfrog-cli-core/v2/utils/tests"
  "github.com/jfrog/jfrog-client-go/artifactory/services"
+ "github.com/jfrog/jfrog-client-go/utils/io/fileutils"
  "github.com/stretchr/testify/assert"
 )
 
@@ -40,13 +43,18 @@ func TestExportSourceArtifactory(t *testing.T) {
  })
  defer testServer.Close()
 
+ // Create working dir
+ tmpDir, createTempDirCallback := tests.CreateTempDirWithCallbackAndAssert(t)
+ defer createTempDirCallback()
+
  // Test export source artifactory
- transferConfigCmd := createTransferConfigCommand(t, serverDetails, nil)
+ transferConfigCmd := createTransferConfigCommand(t, serverDetails, nil).SetSourceWorkingDir(tmpDir)
  exportDir, cleanUp, err := transferConfigCmd.exportSourceArtifactory()
  assert.NoError(t, err)
  assert.DirExists(t, exportDir)
  assert.NoError(t, cleanUp())
  assert.NoDirExists(t, exportDir)
+ assert.True(t, strings.HasPrefix(exportDir, tmpDir))
 }
 
 func TestImportToTargetArtifactory(t *testing.T) {
@@ -143,7 +151,7 @@ func TestValidateTargetServer(t *testing.T) {
 
 func TestVerifyConfigImportPluginNotInstalled(t *testing.T) {
  // Create transfer config command
- testServer, serverDetails, _ := commonTests.CreateRtRestsMockServer(t, func(w http.ResponseWriter, r *http.Request) {
+ testServer, serverDetails, _ := commonTests.CreateRtRestsMockServer(t, func(w http.ResponseWriter, _ *http.Request) {
  w.WriteHeader(http.StatusNotFound)
  _, err := w.Write([]byte("Not found"))
  assert.NoError(t, err)
@@ -157,7 +165,7 @@ func TestVerifyConfigImportPluginNotInstalled(t *testing.T) {
 
 func TestVerifyConfigImportPluginForbidden(t *testing.T) {
  // Create transfer config command
- testServer, serverDetails, _ := commonTests.CreateRtRestsMockServer(t, func(w http.ResponseWriter, r *http.Request) {
+ testServer, serverDetails, _ := commonTests.CreateRtRestsMockServer(t, func(w http.ResponseWriter, _ *http.Request) {
  w.WriteHeader(http.StatusForbidden)
  _, err := w.Write([]byte("An admin user is required"))
  assert.NoError(t, err)
@@ -169,6 +177,34 @@ func TestVerifyConfigImportPluginForbidden(t *testing.T) {
  assert.ErrorContains(t, err, "Response from Artifactory: 403 Forbidden.")
 }
 
+func TestSetExportPath(t *testing.T) {
+ transferConfigBase := NewTransferConfigCommand(nil, nil)
+
+ // Create export path and check results
+ exportPath, unsetTempDir, err := transferConfigBase.createExportPath()
+ unsetTempDir()
+ assert.NoError(t, err)
+ assert.NotEmpty(t, exportPath)
+ assert.DirExists(t, exportPath)
+
+ // Create working dir
+ tmpDir, createTempDirCallback := tests.CreateTempDirWithCallbackAndAssert(t)
+ defer createTempDirCallback()
+ tmpDir = filepath.Join(tmpDir, "test-export-dir")
+ assert.NoError(t, os.MkdirAll(tmpDir, 0700))
+ transferConfigBase.sourceWorkingDir = tmpDir
+
+ // Create export path with custom working dir
+ exportPath, unsetTempDir, err = transferConfigBase.createExportPath()
+ unsetTempDir()
+ assert.NoError(t, err)
+ assert.True(t, strings.HasPrefix(exportPath, tmpDir))
+ assert.DirExists(t, exportPath)
+
+ // Ensure unsetTempDir did work
+ assert.NotContains(t, fileutils.GetTempDirBase(), "test-export-dir")
+}
+
 func createTransferConfigCommand(t *testing.T, sourceServerDetails, targetServerDetails *config.ServerDetails) *TransferConfigCommand {
  transferConfigBase := NewTransferConfigCommand(sourceServerDetails, targetServerDetails)
  var err error

go.mod

@@ -92,7 +92,7 @@ require (
  gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20230423061743-def5242e8ac8
+replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20230430083747-590ae14f9dca
 
 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20230418123708-71a0dbbcb331
 

go.sum

@@ -202,8 +202,8 @@ github.com/jfrog/build-info-go v1.9.2 h1:gSX9PH3whFcAMtM9dlPxRE7u9YuYcx8IkfVXQKR
 github.com/jfrog/build-info-go v1.9.2/go.mod h1:hHXyLsG0SW1jQa4g6q8x2LGAvvX/MMqWVFTcIUAF2PI=
 github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27 h1:jX3UD9qVfj9cuyOe7pN7LlB9JKH5A/3vctjnBpWCKsU=
 github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0=
-github.com/jfrog/jfrog-client-go v1.28.1-0.20230423061743-def5242e8ac8 h1:ttTpZzsbKo8eGHr5EqiVPJgY6IUG2BM6bwApixUnJv8=
-github.com/jfrog/jfrog-client-go v1.28.1-0.20230423061743-def5242e8ac8/go.mod h1:X5LKqXKQByyxVvP/MpqYQZdR5eIvdoC6uyn6EtKw8H0=
+github.com/jfrog/jfrog-client-go v1.28.1-0.20230430083747-590ae14f9dca h1:khI87cFWk8NKf8pJ2rs81V80KLN8Ex3EqEGbMP3VJG8=
+github.com/jfrog/jfrog-client-go v1.28.1-0.20230430083747-590ae14f9dca/go.mod h1:X5LKqXKQByyxVvP/MpqYQZdR5eIvdoC6uyn6EtKw8H0=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=