#29 Use ~/.cache/tfvm if exists, event on macOS.

cbuschka · Sep 27, 2021 · a9eae97 · a9eae97
1 parent 9d577e7
commit a9eae97
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/internal/inventory/dir.go b/internal/inventory/dir.go
@@ -91,11 +91,21 @@ func getDefaultInventoryDir(fs fs, platform platformPkg.Platform) (string, error
 		return oldInventoryDir, nil
 	}
 
+	xdgInventoryDir := getDefaultInventoryDirForXDG(homeDir)
+	xdgInventoryDirExists, err := fs.IsDir(xdgInventoryDir)
+	if err != nil {
+		return "", nil
+	}
+
+	if xdgInventoryDirExists {
+		return xdgInventoryDir, nil
+	}
+
 	if platform.IsMacOS() {
 		return getDefaultInventoryDirForMacOS(homeDir), nil
 	}
 
-	return getDefaultInventoryDirForXDG(homeDir), nil
+	return xdgInventoryDir, nil
 }
 
 func getDefaultInventoryDirForMacOS(homeDir string) string {

diff --git a/internal/inventory/dir_test.go b/internal/inventory/dir_test.go
@@ -25,7 +25,7 @@ func (m *mockFs) GetHomeDir() (string, error) {
 	return adjustPathForRuntimeOS("/HOME"), nil
 }
 
-func TestInventoryDirOnMacOSIsDotTfvmIfExists(t *testing.T) {
+func TestInventoryDirOnMacOSIsDotTfvmIfExistsAndDotTfvmNotPresent(t *testing.T) {
 
 	inventoryDir, err := getInventoryDir(fs(&mockFs{existingDirs: []string{adjustPathForRuntimeOS("/HOME/.tfvm")}}), platformPkg.Platform{Os: "darwin", Arch: "arm64"})
 	if err != nil {
@@ -36,7 +36,18 @@ func TestInventoryDirOnMacOSIsDotTfvmIfExists(t *testing.T) {
 	assert.Equal(t, adjustPathForRuntimeOS("/HOME/.tfvm"), inventoryDir)
 }
 
-func TestInventoryDirOnMacOSIsLibraryCachesTfvmIfDotTfvmNotPresent(t *testing.T) {
+func TestInventoryDirOnMacOSIsDotCacheTfvmIfExists(t *testing.T) {
+
+	inventoryDir, err := getInventoryDir(fs(&mockFs{existingDirs: []string{adjustPathForRuntimeOS("/HOME/.cache/tfvm")}}), platformPkg.Platform{Os: "darwin", Arch: "arm64"})
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	assert.Equal(t, adjustPathForRuntimeOS("/HOME/.cache/tfvm"), inventoryDir)
+}
+
+func TestInventoryDirOnMacOSIsLibraryCachesTfvmIfNeitherDotTfvmNorDotCacheTfvmPresent(t *testing.T) {
 
 	inventoryDir, err := getInventoryDir(fs(&mockFs{existingDirs: []string{}}), platformPkg.Platform{Os: "darwin", Arch: "arm64"})
 	if err != nil {