Parse relPath without potential query params.

Signed-off-by: Ernst von Oelsen <[email protected]>
carvel-dev · Dec 4, 2024 · 2ed4e9b · 2ed4e9b
1 parent d4d3b0f
commit 2ed4e9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/files/file.go b/pkg/files/file.go
@@ -77,7 +77,6 @@ func NewSortedFilesFromPaths(paths []string, opts SymlinkAllowOpts) ([]*File, er
 
 		case strings.HasPrefix(path, "http://") || strings.HasPrefix(path, "https://"):
 			file, err := NewFileFromSource(NewCachedSource(NewHTTPSource(path)))
-			file.relPath = strings.Split(file.relPath, "?")[0]
 			if err != nil {
 				return nil, err
 			}

diff --git a/pkg/files/sources.go b/pkg/files/sources.go
@@ -97,7 +97,9 @@ func (s HTTPSource) Description() string {
 	return fmt.Sprintf("HTTP URL '%s'", s.url)
 }
 
-func (s HTTPSource) RelativePath() (string, error) { return path.Base(s.url), nil }
+func (s HTTPSource) RelativePath() (string, error) {
+	return path.Base(strings.Split(s.url, "?")[0]), nil
+}
 
 func (s HTTPSource) Bytes() ([]byte, error) {
 	resp, err := s.Client.Get(s.url)