From bf8ee5a75a78a47feed0a4193ae64e50fdb35634 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Wed, 24 Aug 2022 09:28:39 -0500 Subject: [PATCH] Allow colons in windows file paths the `podman save` command was failing on windows due to the use of a colon between the drive letter and first directory. the check was intended for Linux and not windows. Fixes #15247 [NO NEW TESTS NEEDED] Signed-off-by: Brent Baude --- cmd/podman/parse/net.go | 9 --------- cmd/podman/parse/parse.go | 18 ++++++++++++++++++ cmd/podman/parse/parse_windows.go | 5 +++++ 3 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 cmd/podman/parse/parse.go create mode 100644 cmd/podman/parse/parse_windows.go diff --git a/cmd/podman/parse/net.go b/cmd/podman/parse/net.go index 9228c7127c..a5c7a0d956 100644 --- a/cmd/podman/parse/net.go +++ b/cmd/podman/parse/net.go @@ -151,15 +151,6 @@ func parseEnvOrLabelFile(envOrLabel map[string]string, filename, configType stri return scanner.Err() } -// ValidateFileName returns an error if filename contains ":" -// as it is currently not supported -func ValidateFileName(filename string) error { - if strings.Contains(filename, ":") { - return fmt.Errorf("invalid filename (should not contain ':') %q", filename) - } - return nil -} - // ValidURL checks a string urlStr is a url or not func ValidURL(urlStr string) error { url, err := url.ParseRequestURI(urlStr) diff --git a/cmd/podman/parse/parse.go b/cmd/podman/parse/parse.go new file mode 100644 index 0000000000..47db066d35 --- /dev/null +++ b/cmd/podman/parse/parse.go @@ -0,0 +1,18 @@ +//go:build !windows +// +build !windows + +package parse + +import ( + "fmt" + "strings" +) + +// ValidateFileName returns an error if filename contains ":" +// as it is currently not supported +func ValidateFileName(filename string) error { + if strings.Contains(filename, ":") { + return fmt.Errorf("invalid filename (should not contain ':') %q", filename) + } + return nil +} diff --git a/cmd/podman/parse/parse_windows.go b/cmd/podman/parse/parse_windows.go new file mode 100644 index 0000000000..794f4216d3 --- /dev/null +++ b/cmd/podman/parse/parse_windows.go @@ -0,0 +1,5 @@ +package parse + +func ValidateFileName(filename string) error { + return nil +}