From b8a50755902ece7cd715b9f54ce98893aa31e7bf Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Tue, 31 May 2022 13:12:30 +0300 Subject: [PATCH] When interacting with fs do not use OS specific separators. Signed-off-by: Ville Aikas --- pkg/cosign/tuf/client.go | 3 +-- pkg/cosign/tuf/client_test.go | 13 +++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/cosign/tuf/client.go b/pkg/cosign/tuf/client.go index 7f302f0841b..631fe1309af 100644 --- a/pkg/cosign/tuf/client.go +++ b/pkg/cosign/tuf/client.go @@ -191,8 +191,7 @@ func (t *TUF) getRootStatus() (*RootStatus, error) { } func getRoot(meta map[string]json.RawMessage, fallback fs.FS) (json.RawMessage, error) { - trustedRoot, ok := meta["root.json"] - if ok { + if trustedRoot, ok := meta["root.json"]; ok { return trustedRoot, nil } // On first initialize, there will be no root in the TUF DB, so read from embedded. diff --git a/pkg/cosign/tuf/client_test.go b/pkg/cosign/tuf/client_test.go index fb89a7f1404..e7ebb68faa8 100644 --- a/pkg/cosign/tuf/client_test.go +++ b/pkg/cosign/tuf/client_test.go @@ -24,6 +24,7 @@ import ( "net/http" "net/http/httptest" "os" + "path" "path/filepath" "reflect" "sort" @@ -334,16 +335,16 @@ func TestGetTargetsByMeta(t *testing.T) { func makeMapFS(repo string) (fs fstest.MapFS) { fs = make(fstest.MapFS) _ = filepath.Walk(repo, - func(path string, info os.FileInfo, err error) error { + func(fpath string, info os.FileInfo, err error) error { if err != nil { return err } - rel, _ := filepath.Rel(repo, path) + rel, _ := filepath.Rel(repo, fpath) if info.IsDir() { - fs[filepath.FromSlash(filepath.Join("repository", rel))] = &fstest.MapFile{Mode: os.ModeDir} + fs[path.Join("repository", rel)] = &fstest.MapFile{Mode: os.ModeDir} } else { - b, _ := os.ReadFile(path) - fs[filepath.FromSlash(filepath.Join("repository", rel))] = &fstest.MapFile{Data: b} + b, _ := os.ReadFile(fpath) + fs[path.Join("repository", rel)] = &fstest.MapFile{Data: b} } return nil }) @@ -386,7 +387,7 @@ func TestUpdatedTargetNamesEmbedded(t *testing.T) { if !ok { t.Fatal("fs.ReadFileFS unimplemented for embedded repo") } - if _, err := rd.ReadFile(filepath.FromSlash(filepath.Join("repository", "targets", newTarget))); err == nil { + if _, err := rd.ReadFile(path.Join("repository", "targets", newTarget)); err == nil { t.Fatal("embedded repository should not contain new target") }