Move directory function from store → store/dirnames

This is to break the cycle that store depends on limayaml, and networks
depends on store, so limayaml cannot depend on networks to allow network
name validation.

Signed-off-by: Jan Dubois <[email protected]>

Author: jandubois

cmd/limactl/main.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/lima-vm/lima/pkg/store"
+	"github.com/lima-vm/lima/pkg/store/dirnames"
 	"github.com/lima-vm/lima/pkg/version"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -41,7 +41,7 @@ func newApp() *cobra.Command {
 		}
 		// Make sure either $HOME or $LIMA_HOME is defined, so we don't need
 		// to check for errors later
-		if _, err := store.LimaDir(); err != nil {
+		if _, err := dirnames.LimaDir(); err != nil {
 			return err
 		}
 		return nil

pkg/networks/commands.go

@@ -2,7 +2,7 @@ package networks
 
 import (
 	"fmt"
-	"github.com/lima-vm/lima/pkg/store"
+	"github.com/lima-vm/lima/pkg/store/dirnames"
 )
 
 const (
@@ -29,7 +29,7 @@ func (config *NetworksConfig) PIDFile(name, daemon string) string {
 }
 
 func (config *NetworksConfig) LogFile(name, daemon, stream string) string {
-	networksDir, _ := store.LimaNetworksDir()
+	networksDir, _ := dirnames.LimaNetworksDir()
 	return fmt.Sprintf("%s/%s_%s.%s.log", networksDir, name, daemon, stream)
 }
 

pkg/networks/config.go

@@ -10,7 +10,7 @@ import (
 	"runtime"
 	"sync"
 
-	"github.com/lima-vm/lima/pkg/store"
+	"github.com/lima-vm/lima/pkg/store/dirnames"
 	"github.com/lima-vm/lima/pkg/store/filenames"
 )
 
@@ -27,7 +27,7 @@ var cache struct {
 func load() {
 	cache.Do(func() {
 		var configDir string
-		configDir, cache.err = store.LimaConfigDir()
+		configDir, cache.err = dirnames.LimaConfigDir()
 		if cache.err != nil {
 			return
 		}

pkg/networks/reconcile.go

@@ -11,6 +11,7 @@ import (
 	"sync"
 
 	"github.com/lima-vm/lima/pkg/store"
+	"github.com/lima-vm/lima/pkg/store/dirnames"
 	"github.com/sirupsen/logrus"
 )
 
@@ -84,7 +85,7 @@ func (config *NetworksConfig) startDaemon(ctx context.Context, name, daemon stri
 		return err
 	}
 
-	networksDir, _ := store.LimaNetworksDir()
+	networksDir, _ := dirnames.LimaNetworksDir()
 	if err := os.MkdirAll(networksDir, 0755); err != nil {
 		return err
 	}

pkg/sshutil/sshutil.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/lima-vm/lima/pkg/lockutil"
 	"github.com/lima-vm/lima/pkg/osutil"
-	"github.com/lima-vm/lima/pkg/store"
+	"github.com/lima-vm/lima/pkg/store/dirnames"
 	"github.com/lima-vm/lima/pkg/store/filenames"
 	"github.com/sirupsen/logrus"
 )
@@ -41,7 +41,7 @@ func readPublicKey(f string) (PubKey, error) {
 // an identity explicitly.
 func DefaultPubKeys(loadDotSSH bool) ([]PubKey, error) {
 	// Read $LIMA_HOME/_config/user.pub
-	configDir, err := store.LimaConfigDir()
+	configDir, err := dirnames.LimaConfigDir()
 	if err != nil {
 		return nil, err
 	}
@@ -103,7 +103,7 @@ func DefaultPubKeys(loadDotSSH bool) ([]PubKey, error) {
 }
 
 func CommonArgs(useDotSSH bool) ([]string, error) {
-	configDir, err := store.LimaConfigDir()
+	configDir, err := dirnames.LimaConfigDir()
 	if err != nil {
 		return nil, err
 	}

pkg/store/dirnames/dirnames.go

@@ -0,0 +1,47 @@
+package dirnames
+
+import (
+	"path/filepath"
+	"os"
+
+	"github.com/lima-vm/lima/pkg/store/filenames"
+)
+
+// DotLima is a directory that appears under the home directory.
+const DotLima = ".lima"
+
+// LimaDir returns the abstract path of `~/.lima` (or $LIMA_HOME, if set).
+//
+// NOTE: We do not use `~/Library/Application Support/Lima` on macOS.
+// We use `~/.lima` so that we can have enough space for the length of the socket path,
+// which can be only 104 characters on macOS.
+func LimaDir() (string, error) {
+	dir := os.Getenv("LIMA_HOME")
+	if dir == "" {
+		homeDir, err := os.UserHomeDir()
+		if err != nil {
+			return "", err
+		}
+		dir = filepath.Join(homeDir, DotLima)
+	}
+	return dir, nil
+}
+
+// LimaConfigDir returns the path of the config directory, $LIMA_HOME/_config.
+func LimaConfigDir() (string, error) {
+	limaDir, err := LimaDir()
+	if err != nil {
+		return "", err
+	}
+	return filepath.Join(limaDir, filenames.ConfigDir), nil
+}
+
+// LimaNetworksDir returns the path of the networks log directory, $LIMA_HOME/_networks.
+func LimaNetworksDir() (string, error) {
+	limaDir, err := LimaDir()
+	if err != nil {
+		return "", err
+	}
+	return filepath.Join(limaDir, filenames.NetworksDir), nil
+}
+

pkg/store/store.go

@@ -7,50 +7,12 @@ import (
 
 	"github.com/containerd/containerd/identifiers"
 	"github.com/lima-vm/lima/pkg/limayaml"
-	"github.com/lima-vm/lima/pkg/store/filenames"
+	"github.com/lima-vm/lima/pkg/store/dirnames"
 )
 
-// DotLima is a directory that appears under the home directory.
-const DotLima = ".lima"
-
-// LimaDir returns the abstract path of `~/.lima` (or $LIMA_HOME, if set).
-//
-// NOTE: We do not use `~/Library/Application Support/Lima` on macOS.
-// We use `~/.lima` so that we can have enough space for the length of the socket path,
-// which can be only 104 characters on macOS.
-func LimaDir() (string, error) {
-	dir := os.Getenv("LIMA_HOME")
-	if dir == "" {
-		homeDir, err := os.UserHomeDir()
-		if err != nil {
-			return "", err
-		}
-		dir = filepath.Join(homeDir, DotLima)
-	}
-	return dir, nil
-}
-
-// LimaConfigDir returns the path of the config directory, $LIMA_HOME/_config.
-func LimaConfigDir() (string, error) {
-	limaDir, err := LimaDir()
-	if err != nil {
-		return "", err
-	}
-	return filepath.Join(limaDir, filenames.ConfigDir), nil
-}
-
-// LimaNetworksDir returns the path of the networks log directory, $LIMA_HOME/_networks.
-func LimaNetworksDir() (string, error) {
-	limaDir, err := LimaDir()
-	if err != nil {
-		return "", err
-	}
-	return filepath.Join(limaDir, filenames.NetworksDir), nil
-}
-
 // Instances returns the names of the instances under LimaDir.
 func Instances() ([]string, error) {
-	limaDir, err := LimaDir()
+	limaDir, err := dirnames.LimaDir()
 	if err != nil {
 		return nil, err
 	}
@@ -74,7 +36,7 @@ func InstanceDir(name string) (string, error) {
 	if err := identifiers.Validate(name); err != nil {
 		return "", err
 	}
-	limaDir, err := LimaDir()
+	limaDir, err := dirnames.LimaDir()
 	if err != nil {
 		return "", err
 	}