Merge branch 'master' into feature/tharing/server-id-for-login-command

Author: tim-goto

.github/workflows/pnpmTests.yml

@@ -0,0 +1,89 @@
+name: pnpm Tests
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "master"
+  pull_request_target:
+    types: [labeled]
+    branches:
+      - "master"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  pnpm-Tests:
+    name: "pnpm 10 tests (${{ matrix.os.name }})"
+    if: github.event_name == 'workflow_dispatch' || github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'safe to test')
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - name: ubuntu
+            version: 24.04
+          - name: windows
+            version: 2022
+          - name: macos
+            version: 14
+    runs-on: ${{ matrix.os.name }}-${{ matrix.os.version }}
+    steps:
+      - name: Skip macOS - JGC-413
+        if: matrix.os.name == 'macos'
+        run: |
+          echo "::warning::JGC-413 - Skip until artifactory bootstrap in osx is fixed"
+          exit 0
+
+      - name: Checkout code
+        if: matrix.os.name != 'macos'
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}
+
+      - name: Setup FastCI
+        if: matrix.os.name != 'macos'
+        uses: jfrog-fastci/fastci@v0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
+
+      - name: Install Node.js
+        if: matrix.os.name != 'macos'
+        uses: actions/setup-node@v5
+        with:
+          node-version: "20"
+
+      - name: Install pnpm 10
+        if: matrix.os.name != 'macos'
+        run: npm install -g pnpm@10
+
+      - name: Validate pnpm version is 10
+        if: matrix.os.name != 'macos'
+        shell: bash
+        run: |
+          PNPM_VER=$(pnpm --version)
+          PNPM_MAJOR=$(echo "$PNPM_VER" | cut -d. -f1)
+          echo "pnpm version: ${PNPM_VER}"
+          if [ "$PNPM_MAJOR" -ne 10 ]; then
+            echo "::error::Expected pnpm 10.x but got ${PNPM_VER}"
+            exit 1
+          fi
+          echo "pnpm ${PNPM_VER} OK"
+
+      - name: Setup Go with cache
+        if: matrix.os.name != 'macos'
+        uses: jfrog/.github/actions/install-go-with-cache@main
+
+      - name: Install local Artifactory
+        if: matrix.os.name != 'macos'
+        uses: jfrog/.github/actions/install-local-artifactory@main
+        with:
+          RTLIC: ${{ secrets.RTLIC }}
+          RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }}
+
+      - name: Run pnpm tests
+        if: matrix.os.name != 'macos'
+        env:
+          YARN_IGNORE_NODE: 1
+        run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.pnpm

.github/workflows/pythonTests.yml

@@ -59,7 +59,7 @@ jobs:
 
       - name: Setup Pipenv
         if: ${{ matrix.suite == 'pipenv' && matrix.os.name != 'macos' }}
-        run: python -m pip install pipenv
+        run: python -m pip install pipenv==2026.2.2
 
       - name: Setup Twine
         if: ${{ matrix.suite == 'pip' && matrix.os.name != 'macos' }}

.gitignore

@@ -35,4 +35,8 @@ node_modules
 
 # Class files
 *.class
-**/testdata/**/bin
+**/testdata/**/bin
+testdata/**/.gradle
+
+# AI agents
+.cursor

buildtools/cli.go

@@ -32,6 +32,7 @@ import (
 	huggingfaceCommands "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/huggingface"
 	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/mvn"
 	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/npm"
+	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/pnpm"
 	containerutils "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/ocicontainer"
 	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/terraform"
 	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/yarn"
@@ -67,6 +68,7 @@ import (
 	"github.com/jfrog/jfrog-cli/docs/buildtools/mvnconfig"
 	"github.com/jfrog/jfrog-cli/docs/buildtools/npmcommand"
 	"github.com/jfrog/jfrog-cli/docs/buildtools/npmconfig"
+	"github.com/jfrog/jfrog-cli/docs/buildtools/pnpmcommand"
 	nugetdocs "github.com/jfrog/jfrog-cli/docs/buildtools/nuget"
 	"github.com/jfrog/jfrog-cli/docs/buildtools/nugetconfig"
 	"github.com/jfrog/jfrog-cli/docs/buildtools/pipconfig"
@@ -436,6 +438,17 @@ func GetCommands() []cli.Command {
 				return cliutils.CreateConfigCmd(c, project.Pnpm)
 			},
 		},
+		{
+			Name:            "pnpm",
+			Flags:           cliutils.GetCommandFlags(cliutils.Pnpm),
+			Usage:           pnpmcommand.GetDescription(),
+			HelpName:        corecommon.CreateUsage("pnpm", pnpmcommand.GetDescription(), pnpmcommand.Usage),
+			UsageText:       pnpmcommand.GetArguments(),
+			SkipFlagParsing: true,
+			BashComplete:    corecommon.CreateBashCompletionFunc("install", "i", "publish", "p"),
+			Category:        buildToolsCategory,
+			Action:          pnpmCmd,
+		},
 		{
 			Name:            "docker",
 			Flags:           cliutils.GetCommandFlags(cliutils.Docker),
@@ -490,7 +503,7 @@ func GetCommands() []cli.Command {
 			Aliases:     []string{"hf"},
 			HelpName:    corecommon.CreateUsage("hugging-face", huggingface.GetDescription(), huggingface.Usage),
 			Description: huggingface.GetDescription(),
-			Hidden:      true,
+			Hidden:      false,
 			Category:    buildToolsCategory,
 			Action: func(c *cli.Context) error {
 				if c.Args().Present() {
@@ -799,6 +812,64 @@ func YarnCmd(c *cli.Context) error {
 	return commands.Exec(yarnCmd)
 }
 
+func pnpmCmd(c *cli.Context) error {
+	if show, err := cliutils.ShowCmdHelpIfNeeded(c, c.Args()); show || err != nil {
+		return err
+	}
+	if c.NArg() < 1 {
+		return cliutils.WrongNumberOfArgumentsHandler(c)
+	}
+	args := cliutils.ExtractCommand(c)
+	cmdName, filteredArgs := getCommandName(args)
+
+	// Extract JFrog-specific flags (--build-name, --build-number, --project, --module, --server-id)
+	// once, so both supported commands and native pass-through use cleaned args.
+	serverDetails, cleanArgs, buildConfiguration, err := extractPnpmOptionsFromArgs(filteredArgs)
+	if err != nil {
+		return err
+	}
+
+	switch cmdName {
+	case "install", "i", "publish":
+		pnpmCommand, err := pnpm.NewCommand(cmdName, cleanArgs, buildConfiguration, serverDetails)
+		if err != nil {
+			return err
+		}
+		return commands.Exec(pnpmCommand)
+	default:
+		return runNativePackageManagerCmd("pnpm", append([]string{cmdName}, cleanArgs...))
+	}
+}
+
+// runNativePackageManagerCmd runs a package manager command directly, passing through stdio.
+func runNativePackageManagerCmd(binary string, args []string) error {
+	cmd := exec.Command(binary, args...)
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd.Run()
+}
+
+// extractPnpmOptionsFromArgs extracts all JFrog CLI options from pnpm command args.
+// Returns server details, cleaned args (with JFrog flags removed), and build configuration.
+func extractPnpmOptionsFromArgs(args []string) (serverDetails *coreConfig.ServerDetails, cleanArgs []string, buildConfig *build.BuildConfiguration, err error) {
+	cleanArgs = append([]string(nil), args...)
+	var serverID string
+	cleanArgs, serverID, err = coreutils.ExtractServerIdFromCommand(cleanArgs)
+	if err != nil {
+		return nil, nil, nil, fmt.Errorf("failed to extract server ID: %w", err)
+	}
+	serverDetails, err = coreConfig.GetSpecificConfig(serverID, true, true)
+	if err != nil {
+		return nil, nil, nil, fmt.Errorf("failed to get server configuration for ID '%s': %w", serverID, err)
+	}
+	cleanArgs, buildConfig, err = build.ExtractBuildDetailsFromArgs(cleanArgs)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	return serverDetails, cleanArgs, buildConfig, nil
+}
+
 func NugetCmd(c *cli.Context) error {
 	if show, err := cliutils.ShowCmdHelpIfNeeded(c, c.Args()); show || err != nil {
 		return err
@@ -1070,7 +1141,7 @@ func buildCmd(c *cli.Context) error {
 	}
 
 	// Extract build configuration and arguments
-	_, rtDetails, _, _, _, cleanArgs, buildConfiguration, err := extractDockerOptionsFromArgs(c.Args())
+	_, rtDetails, _, skipLogin, _, cleanArgs, buildConfiguration, err := extractDockerOptionsFromArgs(c.Args())
 	if err != nil {
 		return err
 	}
@@ -1079,10 +1150,11 @@ func buildCmd(c *cli.Context) error {
 		return err
 	}
 
-	// Login to the docker registry
-	err = loginCmd(c)
-	if err != nil {
-		return err
+	if !skipLogin {
+		err = loginCmd(c)
+		if err != nil {
+			return err
+		}
 	}
 
 	dockerOptions := strategies.DockerBuildOptions{
@@ -1852,12 +1924,8 @@ func pythonCmd(c *cli.Context, projectType project.ProjectType) error {
 			log.Info(fmt.Sprintf("Publishing to repository: %s (from --repository flag)", deployerRepo))
 		}
 
-		// Execute native poetry command directly (similar to Maven FlexPack)
 		log.Info(fmt.Sprintf("Running Poetry %s.", cmdName))
-		poetryCmd := exec.Command("poetry", append([]string{cmdName}, poetryArgs...)...)
-		poetryCmd.Stdout = os.Stdout
-		poetryCmd.Stderr = os.Stderr
-		if err := poetryCmd.Run(); err != nil {
+		if err := runNativePackageManagerCmd("poetry", append([]string{cmdName}, poetryArgs...)); err != nil {
 			return fmt.Errorf("poetry %s failed: %w", cmdName, err)
 		}
 

docker_test.go

@@ -14,6 +14,7 @@ import (
 	"testing"
 	"time"
 
+	urfavecli "github.com/urfave/cli"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 
 	tests2 "github.com/jfrog/jfrog-cli-artifactory/utils/tests"
@@ -1278,6 +1279,48 @@ CMD ["echo", "Hello from buildx"]`, baseImage)
 	inttestutils.ContainerTestCleanup(t, serverDetails, artHttpDetails, imageNameOnly, buildName, tests.OciLocalRepo)
 }
 
+// TestDockerBuildxSkipLoginFails verifies that --skip-login actually skips login.
+// After logging out, buildx --push with --skip-login should fail because no auth is available.
+func TestDockerBuildxSkipLoginFails(t *testing.T) {
+	cleanup := initDockerBuildTest(t)
+	defer cleanup()
+
+	// Prevent urfave/cli from calling os.Exit on command errors
+	origOsExiter := urfavecli.OsExiter
+	urfavecli.OsExiter = func(code int) {}
+	defer func() { urfavecli.OsExiter = origOsExiter }()
+
+	registryHost := *tests.ContainerRegistry
+	if parsedURL, err := url.Parse(registryHost); err == nil && parsedURL.Host != "" {
+		registryHost = parsedURL.Host
+	}
+	imageName := path.Join(registryHost, tests.OciLocalRepo, "test-skip-login")
+	imageTag := imageName + ":v1"
+
+	workspace, err := filepath.Abs(tests.Out)
+	assert.NoError(t, err)
+	assert.NoError(t, fileutils.CreateDirIfNotExist(workspace))
+
+	baseImage := path.Join(registryHost, tests.OciRemoteRepo, "busybox:latest")
+	dockerfileContent := fmt.Sprintf(`FROM %s
+CMD ["echo", "skip-login test"]`, baseImage)
+	dockerfilePath := filepath.Join(workspace, "Dockerfile")
+	assert.NoError(t, os.WriteFile(dockerfilePath, []byte(dockerfileContent), 0644)) //#nosec G703 -- test code
+
+	// Logout from registry so push requires fresh login
+	logoutCmd := exec.Command("docker", "logout", registryHost)
+	assert.NoError(t, logoutCmd.Run())
+
+	// With --skip-login, jf should NOT re-login, so push should fail
+	err = runJfrogCliWithoutAssertion("docker", "buildx", "build",
+		"--platform", "linux/amd64",
+		"-t", imageTag, "-f", dockerfilePath, "--push", "--skip-login", workspace)
+	assert.Error(t, err, "Expected failure: --skip-login should prevent auto-login, causing push to fail without auth")
+
+	// Re-login for subsequent tests
+	runJfrogCli(t, "docker", "login", registryHost)
+}
+
 // TestDockerBuildWithVirtualRepo tests docker build with virtual repository
 func TestDockerBuildWithVirtualRepo(t *testing.T) {
 	cleanup := initDockerBuildTest(t)

docs/buildtools/pnpmcommand/help.go

@@ -0,0 +1,13 @@
+package pnpmcommand
+
+var Usage = []string{"pnpm <pnpm arguments> [command options]"}
+
+func GetDescription() string {
+	return "Run pnpm command."
+}
+
+func GetArguments() string {
+	return `	install, i                Run pnpm install.
+	publish                   Packs and deploys the pnpm package to the designated npm repository.
+	help, h`
+}