Improve upload archive progress bar

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

Author: sverdlov93

artifactory/commands/dotnet/dotnetcommand.go

@@ -15,7 +15,6 @@ import (
 	"net/url"
 	"os"
 	"path"
-	"path/filepath"
 	"strings"
 )
 
@@ -211,21 +210,6 @@ func RemoveSourceFromNugetConfigIfExists(cmdType dotnet.ToolchainType) error {
 	return nil
 }
 
-// CreateConfigFileIfNeeded creates a new config file if it does not exist.
-func CreateConfigFileIfNeeded(customConfigPath string) error {
-	// Ensure the file exists
-	exists, err := fileutils.IsFileExists(customConfigPath, false)
-	if err != nil || exists {
-		return err
-	}
-	// If the file does not exist, create it
-	if err = os.MkdirAll(filepath.Dir(customConfigPath), 0755); err != nil {
-		return err
-	}
-	// Write the default config content to the file
-	return os.WriteFile(customConfigPath, []byte("<configuration></configuration>"), 0644)
-}
-
 // Checks if the user provided input such as -configfile flag or -Source flag.
 // If those flags were provided, NuGet will use the provided configs (default config file or the one with -configfile)
 // If neither provided, we are initializing our own config.
@@ -343,6 +327,10 @@ func GetSourceDetails(details *config.ServerDetails, repoName string, useNugetV2
 		nugetApi = "api/nuget"
 	}
 	u.Path = path.Join(u.Path, nugetApi, repoName)
+	// Append "index.json" for NuGet V3
+	if !useNugetV2 {
+		u.Path = path.Join(u.Path, "index.json")
+	}
 	sourceURL = u.String()
 
 	user = details.User

artifactory/commands/dotnet/dotnetcommand_test.go

@@ -87,7 +87,7 @@ func TestInitNewConfig(t *testing.T) {
 	assert.Equal(t, `<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="JFrogCli" value="https://server.com/artifactory/api/nuget/v3/test-repo" protocolVersion="3" allowInsecureConnections="true"/>
+    <add key="JFrogCli" value="https://server.com/artifactory/api/nuget/v3/test-repo/index.json" protocolVersion="3" allowInsecureConnections="true"/>
   </packageSources>
   <packageSourceCredentials>
     <JFrogCli>
@@ -133,7 +133,7 @@ func TestGetSourceDetails(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, "user", user)
 	assert.Equal(t, "pass", pass)
-	assert.Equal(t, "https://server.com/artifactory/api/nuget/v3/repo-name", url)
+	assert.Equal(t, "https://server.com/artifactory/api/nuget/v3/repo-name/index.json", url)
 	server.Password = ""
 	server.AccessToken = "abc123"
 	url, user, pass, err = GetSourceDetails(server, repoName, true)
@@ -223,45 +223,3 @@ func createNewDotnetModule(t *testing.T, tmpDir string) *build.DotnetModule {
 	assert.NoError(t, err)
 	return module
 }
-
-func TestCreateConfigFileIfNeeded(t *testing.T) {
-	testCases := []struct {
-		name          string
-		configPath    string
-		fileExists    bool
-		expectedError error
-	}{
-		{
-			name:       "File does not exist, create file with default content",
-			configPath: "/custom/path/NuGet.Config",
-			fileExists: false,
-		},
-		{
-			name:       "File exists, no changes",
-			configPath: "/custom/path/NuGet.Config",
-			fileExists: true,
-		},
-	}
-
-	// Setup for testing file existence and creation
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			configPath := filepath.Join(t.TempDir(), testCase.configPath)
-			if testCase.fileExists {
-				assert.NoError(t, os.MkdirAll(filepath.Dir(configPath), 0777))
-				assert.NoError(t, os.WriteFile(configPath, []byte{}, 0644))
-			}
-			err := CreateConfigFileIfNeeded(configPath)
-			assert.NoError(t, err)
-
-			if !testCase.fileExists {
-				// Read the content of the file
-				content, err := os.ReadFile(configPath)
-				assert.NoError(t, err)
-
-				// Assert the content is the default config content
-				assert.Equal(t, "<configuration></configuration>", string(content))
-			}
-		})
-	}
-}

artifactory/commands/setup/setup_test.go

@@ -370,7 +370,7 @@ func testBuildToolLoginCommandConfigureDotnetNuget(t *testing.T, packageManager
 
 			nugetConfigContent := string(nugetConfigContentBytes)
 
-			assert.Contains(t, nugetConfigContent, fmt.Sprintf("add key=\"%s\" value=\"https://acme.jfrog.io/artifactory/api/nuget/v3/test-repo\"", dotnet.SourceName))
+			assert.Contains(t, nugetConfigContent, fmt.Sprintf("add key=\"%s\" value=\"https://acme.jfrog.io/artifactory/api/nuget/v3/test-repo/index.json\"", dotnet.SourceName))
 
 			if testCase.accessToken != "" {
 				// Validate token-based authentication (The token is encoded so we can't test it)