Improve upload archive progress bar

Signed-off-by: Michael Sverdlov <[email protected]>

Author: sverdlov93

go.mod

@@ -188,7 +188,7 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-replace github.com/jfrog/jfrog-cli-core/v2 => github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20250127125540-3206abde70dc
+replace github.com/jfrog/jfrog-cli-core/v2 => github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20250127171615-1dd5d75c0c3b
 
 // replace github.com/jfrog/jfrog-cli-security => github.com/EyalDelarea/jfrog-cli-security v0.0.0-20241121103043-02719f295f02
 

go.sum

@@ -363,8 +363,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20250127125540-3206abde70dc h1:QojsVDrpLKqDKt3Ic5Ejma6Imop7D5GKxB9UjxOMT1s=
-github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20250127125540-3206abde70dc/go.mod h1:o75B8DnTffZIvR303MrAAmOYWqkoIXfXwhYZ2NlHV0c=
+github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20250127171615-1dd5d75c0c3b h1:u+v+zIoOdrVkl/5SJSAHit0yUQtel0aEHi8dD9qWTI8=
+github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20250127171615-1dd5d75c0c3b/go.mod h1:o75B8DnTffZIvR303MrAAmOYWqkoIXfXwhYZ2NlHV0c=
 github.com/terminalstatic/go-xsd-validate v0.1.5 h1:RqpJnf6HGE2CB/lZB1A8BYguk8uRtcvYAPLCF15qguo=
 github.com/terminalstatic/go-xsd-validate v0.1.5/go.mod h1:18lsvYFofBflqCrvo1umpABZ99+GneNTw2kEEc8UPJw=
 github.com/testcontainers/testcontainers-go v0.34.0 h1:5fbgF0vIN5u+nD3IWabQwRybuB4GY8G2HHgCkbMzMHo=

maven_test.go

@@ -370,6 +370,7 @@ func TestSetupMavenCommand(t *testing.T) {
 	if !*tests.TestMaven {
 		t.Skip("Skipping Maven test. To run go test add the '-test.maven=true' option.")
 	}
+
 	homeDir, err := os.UserHomeDir()
 	assert.NoError(t, err)
 	restoreFunc := prepareMavenSetupTest(t, homeDir)
@@ -391,11 +392,11 @@ func TestSetupMavenCommand(t *testing.T) {
 	assert.NoError(t, os.RemoveAll(filepath.Join(homeDir, ".m2", "repository", "org", "apache", "commons", "commons-lang3")))
 
 	// Run `mvn install` to resolve the artifact from Artifactory and force it to be downloaded.
-	err = exec.Command("mvn", "dependency:resolve",
+	output, err := exec.Command("mvn", "dependency:resolve",
 		"-DgroupId=org.apache.commons",
 		"-DartifactId=commons-lang3",
-		"-Dversion=3.8.1").Run()
-	assert.NoError(t, err)
+		"-Dversion=3.8.1").Output()
+	assert.NoError(t, err, fmt.Sprintf("%s\n%q", string(output), err))
 
 	// Validate that the artifact exists in the cache after running the test.
 	// This confirms that the setup command worked and the artifact was resolved from Artifactory.
@@ -406,6 +407,7 @@ func TestSetupMavenCommand(t *testing.T) {
 }
 
 func prepareMavenSetupTest(t *testing.T, homeDir string) func() {
+	initMavenTest(t, false)
 	settingsXml := filepath.Join(homeDir, ".m2", "settings.xml")
 
 	// Back up the existing settings.xml file and ensure restoration after the test.

npm_test.go

@@ -776,6 +776,7 @@ func TestSetupNpmCommand(t *testing.T) {
 	if !*tests.TestNpm {
 		t.Skip("Skipping npm test. To run go test add the '-test.npm=true' option.")
 	}
+	initNpmTest(t)
 	// Validate that the module does not exist in the cache before running the test.
 	client, err := httpclient.ClientBuilder().Build()
 	assert.NoError(t, err)
@@ -786,9 +787,8 @@ func TestSetupNpmCommand(t *testing.T) {
 	jfrogCli := coretests.NewJfrogCli(execMain, "jfrog", "")
 	assert.NoError(t, execGo(jfrogCli, "setup", "npm", "--repo="+tests.NpmRemoteRepo))
 	// Run 'npm install' to resolve the module from Artifactory and force it to be downloaded from Artifactory.
-	err = exec.Command("npm", "install", "[email protected]", "--cache", t.TempDir(), "--prefix", t.TempDir()).Run()
-	assert.NoError(t, err)
-
+	output, err := exec.Command("npm", "install", "[email protected]", "--cache", t.TempDir(), "--prefix", t.TempDir()).Output()
+	assert.NoError(t, err, fmt.Sprintf("%s\n%q", string(output), err))
 	// Validate that the module exists in the cache after running the test.
 	// That means that the setup command worked and the 'go get' resolved the module from Artifactory.
 	_, res, err := client.GetRemoteFileDetails(moduleCacheUrl, artHttpDetails)

nuget_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/xml"
+	"fmt"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
 	"github.com/jfrog/jfrog-client-go/http/httpclient"
 	"github.com/jfrog/jfrog-client-go/utils/io"
@@ -214,7 +215,7 @@ type testInitNewConfigDescriptor struct {
 func TestInitNewConfig(t *testing.T) {
 	baseRtUrl := "http://some/url"
 	expectedV2Url := baseRtUrl + "/api/nuget"
-	expectedV3Url := baseRtUrl + "/api/nuget/v3"
+	expectedV3Url := baseRtUrl + "/api/nuget/v3/index.json"
 	testsSuites := []testInitNewConfigDescriptor{
 		{"useNugetAddSourceV2", true, expectedV2Url},
 		{"useNugetAddSourceV3", false, expectedV3Url},
@@ -299,6 +300,7 @@ func testSetupCommand(t *testing.T, packageManager project.ProjectType) {
 	if !*tests.TestNuget {
 		t.Skip("Skipping nuget test. To run go test add the '-test.nuget=true' option.")
 	}
+	initNugetTest(t)
 	restoreFunc := prepareSetupTest(t, packageManager)
 	defer func() {
 		restoreFunc()
@@ -314,11 +316,13 @@ func testSetupCommand(t *testing.T, packageManager project.ProjectType) {
 	assert.NoError(t, execGo(jfrogCli, "setup", packageManager.String(), "--repo="+tests.NugetRemoteRepo))
 
 	// Run install some random (Nunit) package to test the setup command.
+	var output []byte
 	if packageManager == project.Dotnet {
-		assert.NoError(t, exec.Command(packageManager.String(), "add", "package", "NUnit", "--version", "4.0.1").Run())
+		output, err = exec.Command(packageManager.String(), "add", "package", "NUnit", "--version", "4.0.1").Output()
 	} else {
-		assert.NoError(t, exec.Command(packageManager.String(), "install", "NUnit", "-Version", "4.0.1", "-OutputDirectory", t.TempDir(), "-NoHttpCache").Run())
+		output, err = exec.Command(packageManager.String(), "install", "NUnit", "-Version", "4.0.1", "-OutputDirectory", t.TempDir(), "-NoHttpCache").Output()
 	}
+	assert.NoError(t, err, fmt.Sprintf("%s\n%q", string(output), err))
 
 	// Validate that the package exists in the cache after running the test.
 	// That means that the setup command worked and the package resolved from Artifactory.