From a05d58686e3473f1dfca990bb6a5e280a666204c Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Thu, 16 Jul 2020 13:12:42 -0400 Subject: [PATCH] resolvers: do not join paths, it is assumed they are already joined Signed-off-by: Alfredo Deza --- imgbom/scope/resolvers/directory_resolver.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/imgbom/scope/resolvers/directory_resolver.go b/imgbom/scope/resolvers/directory_resolver.go index eb61d55b3..32ddfd0bb 100644 --- a/imgbom/scope/resolvers/directory_resolver.go +++ b/imgbom/scope/resolvers/directory_resolver.go @@ -74,14 +74,8 @@ func (s DirectoryResolver) FilesByGlob(patterns ...string) ([]file.Reference, er func (s DirectoryResolver) MultipleFileContentsByRef(f ...file.Reference) (map[file.Reference]string, error) { refContents := make(map[file.Reference]string) for _, fileRef := range f { - resolvedPath := path.Join(s.Path, string(fileRef.Path)) - _, err := os.Stat(resolvedPath) - if os.IsNotExist(err) { - continue - } else if err != nil { - log.Errorf("path (%s) is not valid: %v", resolvedPath, err) - } - contents, err := fileContents(file.Path(resolvedPath)) + contents, err := fileContents(fileRef.Path) + if err != nil { return refContents, fmt.Errorf("could not read contents of file: %s", fileRef.Path) }