From c5a431ff3e96b302f3bb339b57f28b852dbd8db1 Mon Sep 17 00:00:00 2001 From: Deepak Kumar Date: Tue, 7 Jul 2026 17:58:36 +0200 Subject: [PATCH 1/3] doc: corrected instructions to start local artifactory server --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bca8ca184..64f245eee 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -189,7 +189,7 @@ go test -v github.com/jfrog/jfrog-cli -test.gradle [flags] ##### Requirements - Make sure the `RTLIC` environment variable is configured with a valid license. -- You can start an Artifactory container by running the `startArtifactory.sh` script located in the `testdata/docker/artifactory` directory. Before running the tests, wait for Artifactory to finish booting up in the container. +- You can start an Artifactory container by running the `start.sh` script located in the `testdata/docker/artifactory` directory. Before running the tests, wait for Artifactory to finish booting up in the container. | Flag | Description | | ------------------------- | ----------------------------------- | From bfa045f5cf4aa9535b23e06d054202b0f73d0e4c Mon Sep 17 00:00:00 2001 From: Deepak Kumar Date: Tue, 7 Jul 2026 17:31:03 +0200 Subject: [PATCH 2/3] chore: updated integration test for `jf helm package` relates to https://github.com/jfrog/jfrog-cli-artifactory/pull/501 --- helm_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/helm_test.go b/helm_test.go index 4e30557bb..d5fb1b415 100644 --- a/helm_test.go +++ b/helm_test.go @@ -218,9 +218,14 @@ func TestHelmPackageWithBuildInfo(t *testing.T) { err = helmCmd.Run() require.NoError(t, err, "helm dependency update should succeed") + chartArchiveDestinationDir := filepath.Join(chartDir, "target") + err = os.MkdirAll(chartArchiveDestinationDir, 0o755) + require.NoError(t, err, "Unable to create target directory for chart archive") + jfrogCli := coreTests.NewJfrogCli(execMain, "jfrog", "") args := []string{ "helm", "package", ".", + "--destination", chartArchiveDestinationDir, "--build-name=" + buildName, "--build-number=" + buildNumber, } From 98f41609ef5736ab03cd7bd141fc434c94d59b19 Mon Sep 17 00:00:00 2001 From: Deepak Kumar Date: Tue, 7 Jul 2026 17:57:29 +0200 Subject: [PATCH 3/3] feat: create package alias for helm Allows intercepting helm CLI calls to be intercepted by jfrog CLI. We use helm-maven-plugin in our builds, which under the hood executes `helm dependency`, `helm package` and `helm push` commands. Without this feature we only have a dirty workaround to create a shim which mimics package aliasing feature in order to capture helm chart in a build-info. This allows us to keep using `helm-maven-plugin` and indirectly invoke `jf helm` to record the build-info along with maven artifacts. **Feature was originally requested as a support ticket 427008** --- ghostfrog_test.go | 7 ++++--- packagealias/packagealias.go | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ghostfrog_test.go b/ghostfrog_test.go index f714b8ec5..7e1ec375a 100644 --- a/ghostfrog_test.go +++ b/ghostfrog_test.go @@ -468,10 +468,11 @@ func TestGhostFrogHighFanOutStress(t *testing.T) { // E2E-030: setup-jfrog-cli native integration func TestGhostFrogSetupJFrogCLINativeIntegration(t *testing.T) { homeDir := initGhostFrogTest(t) - installAliases(t, "npm,mvn,go,pip") + tools := []string{"npm", "mvn", "go", "pip", "helm"} + installAliases(t, strings.Join(tools, ",")) binDir := aliasBinDir(homeDir) - for _, tool := range []string{"npm", "mvn", "go", "pip"} { + for _, tool := range tools { _, err := os.Stat(aliasToolPath(homeDir, tool)) require.NoError(t, err, "alias for %s should exist", tool) } @@ -484,7 +485,7 @@ func TestGhostFrogSetupJFrogCLINativeIntegration(t *testing.T) { // Verify alias dir is populated entries, err := os.ReadDir(binDir) require.NoError(t, err) - assert.GreaterOrEqual(t, len(entries), 4, "should have at least 4 alias entries") + assert.GreaterOrEqual(t, len(entries), len(tools), fmt.Sprintf("should have at least %d alias entries", len(tools))) } // E2E-031: Auto build-info publish (requires Artifactory) diff --git a/packagealias/packagealias.go b/packagealias/packagealias.go index 8c1881f82..05268ecab 100644 --- a/packagealias/packagealias.go +++ b/packagealias/packagealias.go @@ -34,6 +34,7 @@ var SupportedTools = []string{ "gem", "bundle", "apk", + "helm", } // AliasMode represents how a tool should be handled