From 8c699b8c0f0f88d651535b0dcc1aef95305ef458 Mon Sep 17 00:00:00 2001 From: yahavi Date: Thu, 28 Dec 2023 18:13:17 +0200 Subject: [PATCH] Transfer - Use tmp dir under user home --- go.mod | 2 +- go.sum | 4 ++-- transfer_test.go | 13 +++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 156c3c372..cb51c439d 100644 --- a/go.mod +++ b/go.mod @@ -130,7 +130,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20231224075754-92c93a2d086e +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/yahavi/jfrog-cli-core/v2 v2.0.0-20231229155141-f007e892f9f3 // replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20231220105505-e62769dde9da diff --git a/go.sum b/go.sum index dcaa08531..1867af85e 100644 --- a/go.sum +++ b/go.sum @@ -136,8 +136,6 @@ github.com/jfrog/gofrog v1.4.0 h1:s7eysVnmIBfVheMs4LPU43MAlxwPa4K8u2N5h7kwzXA= github.com/jfrog/gofrog v1.4.0/go.mod h1:AQo5Fq0G9nDEF6icH7MYQK0iohR4HuEAXl8jaxRuT6Q= github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY= github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= -github.com/jfrog/jfrog-cli-core/v2 v2.47.9 h1:3MoGn5M5hOzFZx42B3liuVm2GDmhdLeGfc3DQGsz5ZE= -github.com/jfrog/jfrog-cli-core/v2 v2.47.9/go.mod h1:l5y34dJhQ0W16o7OrCUjTQdGikoZPKTRI1NKGneoJ0g= github.com/jfrog/jfrog-client-go v1.35.5 h1:1QlrXdMhGi099Cs3mVKIpeVre2w1DiYhU7WGSEH2gQU= github.com/jfrog/jfrog-client-go v1.35.5/go.mod h1:Leua+MdhCV+M4gl746PcTsHF8dDP7+LLJ/NgHCTl/Fo= github.com/jszwec/csvutil v1.8.0 h1:G7vS2LGdpZZDH1HmHeNbxOaJ/ZnJlpwGFvOkTkJzzNk= @@ -301,6 +299,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-20231229155141-f007e892f9f3 h1:/uAzO+F+tirDnTUNEUDhTNbT0eIlRms5B4R8woa6fnQ= +github.com/yahavi/jfrog-cli-core/v2 v2.0.0-20231229155141-f007e892f9f3/go.mod h1:l5y34dJhQ0W16o7OrCUjTQdGikoZPKTRI1NKGneoJ0g= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= diff --git a/transfer_test.go b/transfer_test.go index 90bed37eb..943476aa5 100644 --- a/transfer_test.go +++ b/transfer_test.go @@ -298,17 +298,18 @@ func TestUnsupportedRunStatusVersion(t *testing.T) { defer cleanUp() // Create run status file with lower version. - transferDir, err := coreutils.GetJfrogTransferDir() - assert.NoError(t, err) + transferDir, actualError := coreutils.GetJfrogTransferDir() + assert.NoError(t, actualError) assert.NoError(t, os.MkdirAll(transferDir, 0777)) statusFilePath := filepath.Join(transferDir, coreutils.JfrogTransferRunStatusFileName) trs := state.TransferRunStatus{Version: 0} - content, err := json.Marshal(trs) - assert.NoError(t, err) + content, actualError := json.Marshal(trs) + assert.NoError(t, actualError) assert.NoError(t, os.WriteFile(statusFilePath, content, 0600)) - err = artifactoryCli.WithoutCredentials().Exec("transfer-files", inttestutils.SourceServerId, inttestutils.TargetServerId, "--include-repos="+tests.RtRepo1+";"+tests.RtRepo2) - assert.Equal(t, err, state.GetOldTransferDirectoryStructureError()) + expectedError := state.GetOldTransferDirectoryStructureError() + actualError = artifactoryCli.WithoutCredentials().Exec("transfer-files", inttestutils.SourceServerId, inttestutils.TargetServerId, "--include-repos="+tests.RtRepo1+";"+tests.RtRepo2) + assert.ErrorAs(t, expectedError, &actualError) } func TestTransferWithRepoSnapshot(t *testing.T) {