Skip to content

chore: fix correct filename for provenance file (#1492) #1497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jakobmoellerdev merged 1 commit into from
Jun 3, 2025
Merged

chore: fix correct filename for provenance file (#1492) #1497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion api/ocm/extensions/download/handlers/helm/download_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ var _ = Describe("upload", func() {
})
It("register helm download handler by name for special artifact type", func() {
MustBeSuccessful(download.RegisterHandlerByName(env, helm.PATH, nil, download.ForArtifactType(ArtifactType)))

repo := Must(ctf.Open(env.OCMContext(), accessobj.ACC_READONLY, CTFPath, 0o777, env))
cv := Must(repo.LookupComponentVersion(Component, Version))
path := Must(download.DownloadResource(env.OCMContext(), Must(cv.SelectResources(selectors.Identity(v1.Identity{"name": SpecialOCIResource})))[0], "/resource", download.WithFileSystem(env.FileSystem())))
Expand All @@ -94,6 +93,7 @@ var _ = Describe("upload", func() {
cv := Must(repo.LookupComponentVersion(Component, Version))
path := Must(download.DownloadResource(env.OCMContext(), Must(cv.SelectResources(selectors.Identity(v1.Identity{"name": UnusualOCIResource})))[0], "/resource", download.WithFileSystem(env.FileSystem())))
MustBeSuccessful(tarutils.ExtractArchiveToFs(env.FileSystem(), path, env.FileSystem()))
Expect(Must(vfs.FileExists(env.FileSystem(), path+".prov"))).To(BeTrue())
Expect(Must(vfs.FileExists(env.FileSystem(), "/postgresql/Chart.yaml"))).To(BeTrue())
})

Expand All @@ -103,6 +103,7 @@ var _ = Describe("upload", func() {
cv := Must(repo.LookupComponentVersion(Component, Version))
path := Must(download.DownloadResource(env.OCMContext(), Must(cv.SelectResources(selectors.Identity(v1.Identity{"name": UnusualOCIResource})))[0], "/path.tgz", download.WithFileSystem(env.FileSystem())))
MustBeSuccessful(tarutils.ExtractArchiveToFs(env.FileSystem(), path, env.FileSystem()))
Expect(Must(vfs.FileExists(env.FileSystem(), path+".prov"))).To(BeTrue())
Expect(Must(vfs.FileExists(env.FileSystem(), "/postgresql/Chart.yaml"))).To(BeTrue())
})

Expand All @@ -112,6 +113,7 @@ var _ = Describe("upload", func() {
cv := Must(repo.LookupComponentVersion(Component, Version))
path := Must(download.DownloadResource(env.OCMContext(), Must(cv.SelectResources(selectors.Identity(v1.Identity{"name": UnusualOCIResource})))[0], "/path.tar.gz", download.WithFileSystem(env.FileSystem())))
MustBeSuccessful(tarutils.ExtractArchiveToFs(env.FileSystem(), path, env.FileSystem()))
Expect(Must(vfs.FileExists(env.FileSystem(), path+".prov"))).To(BeTrue())
Expect(Must(vfs.FileExists(env.FileSystem(), "/postgresql/Chart.yaml"))).To(BeTrue())
})

Expand Down
19 changes: 4 additions & 15 deletions api/ocm/extensions/download/handlers/helm/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"errors"
"fmt"
"io"
"path/filepath"
"strings"

"github.com/mandelsoft/goutils/finalizer"
Expand Down Expand Up @@ -156,7 +155,10 @@ func download(p common.Printer, art oci.ArtifactAccess, path string, fs vfs.File
return "", "", err
}
finalize.Close(provBlob)
prov = trimExtN(chart, 2) + ".prov"

// Path to provenance file is the same as chart, but with .prov suffix. See
// https://github.com/helm/helm-www/blob/cf3e4f875101fa3f72ff6194499b5365723f0ec1/content/en/docs/topics/provenance.md
prov = chart + ".prov"
if err := write(p, provBlob, prov, fs); err != nil {
return "", "", err
}
Expand All @@ -167,19 +169,6 @@ func download(p common.Printer, art oci.ArtifactAccess, path string, fs vfs.File
return chart, prov, nil
}

// trimExtN trims the file extension from the path, at most n times.
// This is useful for removing the ".tgz" or ".tar.gz" suffix from a file name.
func trimExtN(path string, n int) string {
for i := 0; i < n; i++ {
trimmed := strings.TrimSuffix(path, filepath.Ext(path))
if trimmed == path {
break
}
path = trimmed
}
return path
}

func findLayer(layers []ocispec.Descriptor, mediaType string) (*ocispec.Descriptor, error) {
var candidates []*ocispec.Descriptor

Expand Down
21 changes: 0 additions & 21 deletions api/ocm/extensions/download/handlers/helm/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,3 @@ func TestAssureArchiveSuffix(t *testing.T) {
}
}
}

func TestTrimExtN(t *testing.T) {
tests := []struct {
input string
n int
expected string
}{
{"chart.tgz", 1, "chart"},
{"chart.tar.gz", 1, "chart.tar"},
{"chart.tar.gz", 2, "chart"},
{"archive.zip", 1, "archive"},
{"archive", 1, "archive"},
}

for _, tt := range tests {
result := trimExtN(tt.input, tt.n)
if result != tt.expected {
t.Errorf("trimExtN(%q, %d) = %q; want %q", tt.input, tt.n, result, tt.expected)
}
}
}