Improve upload archive progress bar

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

Author: sverdlov93

artifactory/commands/dotnet/dotnetcommand.go

@@ -226,6 +226,7 @@ func GetConfigPathFromEnvIfProvided(cmdType dotnet.ToolchainType) string {
 			return filepath.Join(customDotnetDir, "NuGet.Config")
 		}
 	}
+	// The NUGET_CONFIG_FILE environment variable is supported by both NuGet and dotnet CLI.
 	return os.Getenv("NUGET_CONFIG_FILE")
 }
 

artifactory/commands/setup/setup.go

@@ -124,7 +124,9 @@ func (sc *SetupCommand) Run() (err error) {
 		return errorutils.CheckErrorf("unsupported package manager: %s", sc.packageManager)
 	}
 
-	if sc.repoName == "" {
+	// If the repository name is not provided, and the package manager is not Docker or Podman, prompt the user to select a repository.
+	// Docker and Podman do not require a repository name.
+	if sc.repoName == "" && sc.packageManager != project.Docker && sc.packageManager != project.Podman {
 		// Prompt the user to select a virtual repository that matches the package manager.
 		if err = sc.promptUserToSelectRepository(); err != nil {
 			return err
@@ -170,7 +172,7 @@ func (sc *SetupCommand) promptUserToSelectRepository() (err error) {
 	sc.repoName, err = utils.SelectRepositoryInteractively(
 		sc.serverDetails,
 		repoFilterParams,
-		fmt.Sprintf("To configure %s, we need you to select a %s repository in Artifactory", repoFilterParams.PackageType, repoFilterParams.RepoType))
+		fmt.Sprintf("To configure %s, we need you to select a %s repository in Artifactory:", repoFilterParams.PackageType, repoFilterParams.RepoType))
 
 	return err
 }
@@ -248,8 +250,6 @@ func (sc *SetupCommand) configureNpmPnpm() error {
 // For basic auth:
 //
 //	yarn config set //your-artifactory-url/artifactory/api/npm/<repo-name>/:_auth "<base64-encoded-username:password>"
-//
-// Note: Custom configuration file can be set by setting the YARN_RC_FILENAME environment variable.
 func (sc *SetupCommand) configureYarn() (err error) {
 	repoUrl := commandsutils.GetNpmRepositoryUrl(sc.repoName, sc.serverDetails.ArtifactoryUrl)
 	if err = yarn.ConfigSet(commandsutils.NpmConfigRegistryKey, repoUrl, "yarn", false); err != nil {

artifactory/commands/setup/setup_test.go

@@ -67,18 +67,17 @@ func TestSetupCommand_Pnpm(t *testing.T) {
 }
 
 func testSetupCommandNpmPnpm(t *testing.T, packageManager project.ProjectType) {
-	// Create a temporary directory to act as the environment's npmrc file location.
-	tempDir := t.TempDir()
-	npmrcFilePath := filepath.Join(tempDir, ".npmrc")
-
-	// Set NPM_CONFIG_USERCONFIG to point to the temporary npmrc file path.
-	t.Setenv("NPM_CONFIG_USERCONFIG", npmrcFilePath)
-
-	loginCmd := createTestSetupCommand(packageManager)
-
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
+			// Create a temporary directory to act as the environment's npmrc file location.
+			tempDir := t.TempDir()
+			npmrcFilePath := filepath.Join(tempDir, ".npmrc")
+
+			// Set NPM_CONFIG_USERCONFIG to point to the temporary npmrc file path.
+			t.Setenv("NPM_CONFIG_USERCONFIG", npmrcFilePath)
+
 			// Set up server details for the current test case's authentication type.
+			loginCmd := createTestSetupCommand(packageManager)
 			loginCmd.serverDetails.SetUser(testCase.user)
 			loginCmd.serverDetails.SetPassword(testCase.password)
 			loginCmd.serverDetails.SetAccessToken(testCase.accessToken)

artifactory/utils/container/containermanager.go

@@ -194,7 +194,6 @@ func ContainerManagerLogin(imageRegistry string, config *ContainerManagerLoginCo
 	password := config.ServerDetails.Password
 	// If access-token exists, perform login with it.
 	if config.ServerDetails.AccessToken != "" {
-		log.Debug("Using access-token details in " + containerManager.String() + "-login command.")
 		if username == "" {
 			username = auth.ExtractUsernameFromAccessToken(config.ServerDetails.AccessToken)
 		}