Package manager login command - Docker, Podman

artifactory/commands/container/containermanagercommand.go

@@ -41,7 +41,11 @@ func (cm *ContainerCommand) PerformLogin(serverDetails *config.ServerDetails, co
 			}
 		}
 		loginConfig := &container.ContainerManagerLoginConfig{ServerDetails: serverDetails}
-		return container.ContainerManagerLogin(cm.image, loginConfig, containerManagerType)
+		imageRegistry, err := cm.image.GetRegistry()
+		if err != nil {
+			return err
+		}
+		return container.ContainerManagerLogin(imageRegistry, loginConfig, containerManagerType)
 	}
 	return nil
 }

artifactory/commands/packagemanagerlogin/packagemanagerlogin.go

@@ -10,15 +10,42 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/repository"
 	commandsutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/npm"
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/yarn"
 	"github.com/jfrog/jfrog-cli-core/v2/common/project"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
+	"golang.org/x/exp/maps"
+	"net/url"
+	"sort"
 )
 
+// packageManagerToRepositoryPackageType maps project types to corresponding Artifactory repository package types.
+var packageManagerToRepositoryPackageType = map[project.ProjectType]string{
+	// Npm package managers
+	project.Npm:  repository.Npm,
+	project.Yarn: repository.Npm,
+
+	// Python (pypi) package managers
+	project.Pip:    repository.Pypi,
+	project.Pipenv: repository.Pypi,
+	project.Poetry: repository.Pypi,
+
+	// Nuget package managers
+	project.Nuget:  repository.Nuget,
+	project.Dotnet: repository.Nuget,
+
+	// Docker package managers
+	project.Docker: repository.Docker,
+	project.Podman: repository.Docker,
+
+	project.Go: repository.Go,
+}
+
 // PackageManagerLoginCommand configures registries and authentication for various package manager (npm, Yarn, Pip, Pipenv, Poetry, Go)
 type PackageManagerLoginCommand struct {
 	// packageManager represents the type of package manager (e.g., NPM, Yarn).
@@ -40,20 +67,23 @@ func NewPackageManagerLoginCommand(packageManager project.ProjectType) *PackageM
 	}
 }
 
+// GetSupportedPackageManagersList returns a sorted list of supported package managers.
+func GetSupportedPackageManagersList() []project.ProjectType {
+	allSupportedPackageManagers := maps.Keys(packageManagerToRepositoryPackageType)
+	sort.Slice(allSupportedPackageManagers, func(i, j int) bool {
+		return allSupportedPackageManagers[i] < allSupportedPackageManagers[j]
+	})
+	return allSupportedPackageManagers
+}
+
 // packageManagerToPackageType maps project types to corresponding Artifactory package types (e.g., npm, pypi).
 func packageManagerToPackageType(packageManager project.ProjectType) (string, error) {
-	switch packageManager {
-	case project.Npm, project.Yarn:
-		return repository.Npm, nil
-	case project.Pip, project.Pipenv, project.Poetry:
-		return repository.Pypi, nil
-	case project.Go:
-		return repository.Go, nil
-	case project.Nuget, project.Dotnet:
-		return repository.Nuget, nil
-	default:
-		return "", errorutils.CheckErrorf("unsupported package manager: %s", packageManager)
+	// Retrieve the package type from the map.
+	if packageType, exists := packageManagerToRepositoryPackageType[packageManager]; exists {
+		return packageType, nil
 	}
+	// Return an error if the package manager is unsupported.
+	return "", errorutils.CheckErrorf("unsupported package manager: %s", packageManager)
 }
 
 // CommandName returns the name of the login command.
@@ -95,14 +125,16 @@ func (pmlc *PackageManagerLoginCommand) Run() (err error) {
 		err = pmlc.configureGo()
 	case project.Nuget, project.Dotnet:
 		err = pmlc.configureDotnetNuget()
+	case project.Docker, project.Podman:
+		err = pmlc.configureContainer()
 	default:
 		err = errorutils.CheckErrorf("unsupported package manager: %s", pmlc.packageManager)
 	}
 	if err != nil {
 		return fmt.Errorf("failed to configure %s: %w", pmlc.packageManager.String(), err)
 	}
 
-	log.Info(fmt.Sprintf("Successfully configured %s to use JFrog Artifactory repository '%s'.", pmlc.packageManager.String(), pmlc.repoName))
+	log.Output(fmt.Sprintf("Successfully configured %s to use JFrog Artifactory repository '%s'.", coreutils.PrintBoldTitle(pmlc.packageManager.String()), coreutils.PrintBoldTitle(pmlc.repoName)))
 	return nil
 }
 
@@ -239,3 +271,36 @@ func (pmlc *PackageManagerLoginCommand) configureDotnetNuget() error {
 	// Add the repository as a source in the NuGet configuration with credentials for authentication.
 	return dotnet.AddSourceToNugetConfig(toolchainType, sourceUrl, user, password)
 }
+
+// configureContainer configures container managers like Docker or Podman to authenticate with JFrog Artifactory.
+// It performs a login using the container manager's CLI command.
+//
+// For Docker:
+//
+//	docker login <artifactory-url-without-scheme> -u <username> -p <password>
+//
+// For Podman:
+//
+//	podman login <artifactory-url-without-scheme> -u <username> -p <password>
+func (pmlc *PackageManagerLoginCommand) configureContainer() error {
+	var containerManagerType container.ContainerManagerType
+	switch pmlc.packageManager {
+	case project.Docker:
+		containerManagerType = container.DockerClient
+	case project.Podman:
+		containerManagerType = container.Podman
+	default:
+		return errorutils.CheckErrorf("unsupported container manager: %s", pmlc.packageManager)
+	}
+	// Parse the URL to remove the scheme (https:// or http://)
+	parsedURL, err := url.Parse(pmlc.serverDetails.GetUrl())
+	if err != nil {
+		return err
+	}
+	urlWithoutScheme := parsedURL.Host + parsedURL.Path
+	return container.ContainerManagerLogin(
+		urlWithoutScheme,
+		&container.ContainerManagerLoginConfig{ServerDetails: pmlc.serverDetails},
+		containerManagerType,
+	)
+}

artifactory/utils/container/containermanager.go

@@ -189,11 +189,7 @@ func (loginCmd *LoginCmd) RunCmd() error {
 
 // First we'll try to log in assuming a proxy-less tag (e.g. "registry-address/docker-repo/image:ver").
 // If fails, we will try assuming a reverse proxy tag (e.g. "registry-address-docker-repo/image:ver").
-func ContainerManagerLogin(image *Image, config *ContainerManagerLoginConfig, containerManager ContainerManagerType) error {
-	imageRegistry, err := image.GetRegistry()
-	if err != nil {
-		return err
-	}
+func ContainerManagerLogin(imageRegistry string, config *ContainerManagerLoginConfig, containerManager ContainerManagerType) error {
 	username := config.ServerDetails.User
 	password := config.ServerDetails.Password
 	// If access-token exists, perform login with it.
@@ -206,7 +202,7 @@ func ContainerManagerLogin(image *Image, config *ContainerManagerLoginConfig, co
 	}
 	// Perform login.
 	cmd := &LoginCmd{DockerRegistry: imageRegistry, Username: username, Password: password, containerManager: containerManager}
-	err = cmd.RunCmd()
+	err := cmd.RunCmd()
 	if exitCode := coreutils.GetExitCode(err, 0, 0, false); exitCode == coreutils.ExitCodeNoError {
 		// Login succeeded
 		return nil

artifactory/utils/repositoryutils.go

@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"fmt"
 	"github.com/jfrog/gofrog/datastructures"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
@@ -101,7 +102,7 @@ func SelectRepositoryInteractively(serverDetails *config.ServerDetails, repoFilt
 		return filteredRepos[0], nil
 	}
 	// Prompt the user to select a repository.
-	return ioutils.AskFromListWithMismatchConfirmation("Please select a repository to login to:", "Repository not found.", ioutils.ConvertToSuggests(filteredRepos)), nil
+	return ioutils.AskFromListWithMismatchConfirmation(fmt.Sprintf("Please select a %s %s repository to configure:", repoFilterParams.RepoType, repoFilterParams.PackageType), "Repository not found.", ioutils.ConvertToSuggests(filteredRepos)), nil
 }
 
 // GetFilteredRepositoriesWithFilterParams returns the names of local, remote, virtual, and federated repositories filtered by their names and type.

common/project/projectconfig.go

@@ -26,6 +26,7 @@ const (
 type ProjectType int
 
 const (
+	// When adding new ProjectType here, Must also add it as a string to the ProjectTypes slice
 	Go ProjectType = iota
 	Pip
 	Pipenv
@@ -41,6 +42,8 @@ const (
 	Terraform
 	Cocoapods
 	Swift
+	Docker
+	Podman
 )
 
 type ConfigType string
@@ -66,12 +69,24 @@ var ProjectTypes = []string{
 	"terraform",
 	"cocoapods",
 	"swift",
+	"docker",
+	"podman",
 }
 
 func (projectType ProjectType) String() string {
 	return ProjectTypes[projectType]
 }
 
+// FromString converts a string to its corresponding ProjectType
+func FromString(value string) ProjectType {
+	for i, v := range ProjectTypes {
+		if v == value {
+			return ProjectType(i)
+		}
+	}
+	return -1
+}
+
 type MissingResolverErr struct {
 	message string
 }

utils/ioutils/questionnaire.go

@@ -1,6 +1,8 @@
 package ioutils
 
 import (
+	"fmt"
+	"os"
 	"regexp"
 	"strconv"
 	"strings"
@@ -82,7 +84,9 @@ func interruptKeyBind() prompt.Option {
 	interrupt := prompt.KeyBind{
 		Key: prompt.ControlC,
 		Fn: func(buf *prompt.Buffer) {
-			panic("Interrupted")
+			// Gracefully exit the program
+			fmt.Println("\nOperation interrupted. Exiting...")
+			os.Exit(0)
 		},
 	}
 	return prompt.OptionAddKeyBind(interrupt)
@@ -177,7 +181,7 @@ func validateAnswer(answer string, options []prompt.Suggest, allowVars bool) boo
 // If the provided answer does not appear in list, confirm the choice.
 func AskFromListWithMismatchConfirmation(promptPrefix, misMatchMsg string, options []prompt.Suggest) string {
 	for {
-		answer := prompt.Input(promptPrefix+" ", prefixCompleter(options), interruptKeyBind())
+		answer := prompt.Input(promptPrefix+" ", prefixCompleter(options), interruptKeyBind(), prompt.OptionShowCompletionAtStart(), prompt.OptionCompletionOnDown())
 		if answer == "" {
 			log.Output(EmptyValueMsg)
 		}