add error in extractFilename and realize that ResolveEnvironmentRepla…

…cement better execute before getting the filename

pkg/util/command_util.go

@@ -216,11 +216,17 @@ func URLDestinationFilepath(rawurl, dest, cwd string, envs []string) (string, er
 		}
 		return dest, nil
 	}
-	urlBase := extractFilename(rawurl)
-	urlBase, err := ResolveEnvironmentReplacement(urlBase, envs, true)
+
+	urlBase, err := ResolveEnvironmentReplacement(rawurl, envs, true)
+	if err != nil {
+		return "", err
+	}
+
+	urlBase, err = extractFilename(urlBase)
 	if err != nil {
 		return "", err
 	}
+
 	destPath := filepath.Join(dest, urlBase)
 
 	if !filepath.IsAbs(dest) {
@@ -472,9 +478,11 @@ func getUID(userStr string) (uint32, error) {
 }
 
 // ExtractFilename extracts the filename from a URL without its query url
-func extractFilename(rawURL string) string {
-	// not necessarily return an error, due to parsing ambiguities https://pkg.go.dev/net/url#Parse
-	parsedURL, _ := url.Parse(rawURL)
+func extractFilename(rawURL string) (string, error) {
+	parsedURL, err := url.Parse(rawURL)
+	if err != nil {
+		return "", err
+	}
 	filename := filepath.Base(parsedURL.Path)
-	return filename
+	return filename, nil
 }