upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-04-24 07:37:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #31416 from MarcAntoineRaymond/dev-v3
Some checks are pending
build-test / build (push) Waiting to run
Details
CodeQL / Analyze (push) Waiting to run
Details
golangci-lint / golangci-lint (push) Waiting to run
Details

Browse source 
[v3 backport] Fix `helm pull` untar dir check with repo urls
This commit is contained in:
Scott Rigby 2025-11-05 18:22:40 -05:00 committed by GitHub
commit 8b53467dd9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/helm/pull_test.go
View file

@ -147,6 +147,18 @@ func TestPullCmd(t *testing.T) {
failExpect: "Failed to fetch chart version",
wantError: true,
},
{
name: "Chart fetch using repo URL with untardir",
args: "signtest --version=0.1.0 --untar --untardir repo-url-test --repo " + srv.URL(),
expectFile: "./signtest",
expectDir: true,
},
{
name: "Chart fetch using repo URL with untardir and previous pull",
args: "signtest --version=0.1.0 --untar --untardir repo-url-test --repo " + srv.URL(),
failExpect: "failed to untar",
wantError: true,
},
{
name: "Fetch OCI Chart",
args: fmt.Sprintf("oci://%s/u/ocitestuser/oci-dependent-chart --version 0.1.0", ociSrv.RegistryURL),

5
pkg/action/pull.go
View file

@ -121,15 +121,16 @@ func (p *Pull) Run(chartRef string) (string, error) {
defer os.RemoveAll(dest)
}
downloadSourceRef := chartRef
if p.RepoURL != "" {
chartURL, err := repo.FindChartInAuthAndTLSAndPassRepoURL(p.RepoURL, p.Username, p.Password, chartRef, p.Version, p.CertFile, p.KeyFile, p.CaFile, p.InsecureSkipTLSverify, p.PassCredentialsAll, getter.All(p.Settings))
if err != nil {
return out.String(), err
}
chartRef = chartURL
downloadSourceRef = chartURL
}
saved, v, err := c.DownloadTo(chartRef, p.Version, dest)
saved, v, err := c.DownloadTo(downloadSourceRef, p.Version, dest)
if err != nil {
return out.String(), err
}