Merge pull request #285 from riverar/fix-windows-paths

Remove characters from cache path that are invalid on Windows

Author: nkubala

cmd/diff_test.go

@@ -44,6 +44,7 @@ var imageDiffs = []imageDiff{
 	{"", "", true},
 	{"gcr.io/google-appengine/python", "gcr.io/google-appengine/debian9", false},
 	{"gcr.io/google-appengine/python", "cats", true},
+	{"mcr.microsoft.com/mcr/hello-world:latest", "mcr.microsoft.com/mcr/hello-world:latest", false},
 }
 
 func TestDiffImages(t *testing.T) {

cmd/root.go

@@ -168,7 +168,7 @@ func getCacheDir(imageName string) (string, error) {
 	}
 	rootDir := filepath.Join(cacheDir, ".container-diff", "cache")
 	imageName = strings.Replace(imageName, string(os.PathSeparator), "", -1)
-	return filepath.Join(rootDir, filepath.Clean(imageName)), nil
+	return filepath.Join(rootDir, pkgutil.CleanFilePath(imageName)), nil
 }
 
 func getWriter(outputFile string) (io.Writer, error) {

pkg/util/fs_utils.go

@@ -207,3 +207,11 @@ func DirIsEmpty(path string) (bool, error) {
 	}
 	return false, err
 }
+
+// CleanFilePath removes characters from a given path that cannot be used
+// in paths by the underlying platform (e.g. Windows)
+func CleanFilePath(dirtyPath string) string {
+	var windowsReplacements = []string{"<", "_", ">", "_", ":", "_", "?", "_", "*", "_", "?", "_", "|", "_"}
+	replacer := strings.NewReplacer(windowsReplacements...)
+	return filepath.Clean(replacer.Replace(dirtyPath))
+}

pkg/util/image_utils.go

@@ -161,8 +161,7 @@ func GetImage(imageName string, includeLayers bool, cacheDir string) (Image, err
 	if err != nil {
 		return Image{}, err
 	}
-	dirName := strings.Replace(RemoveTag(imageName)+"@"+imageDigest.String(), ":", "", -1)
-	path, err := getExtractPathForName(dirName, cacheDir)
+	path, err := getExtractPathForName(RemoveTag(imageName)+"@"+imageDigest.String(), cacheDir)
 	if err != nil {
 		return Image{}, err
 	}