feat(run): Seperate the run dir from the stack

This is because our tarring can't filter out the .nitric

Author: asalkeld

pkg/cmd/root.go

@@ -19,7 +19,6 @@ package main
 import (
 	"fmt"
 	"os"
-	"path"
 	"strings"
 	"time"
 
@@ -35,6 +34,7 @@ import (
 	cmdTarget "github.com/nitrictech/newcli/pkg/cmd/target"
 	"github.com/nitrictech/newcli/pkg/output"
 	"github.com/nitrictech/newcli/pkg/tasklet"
+	"github.com/nitrictech/newcli/pkg/utils"
 )
 
 const configFileName = ".nitric-config"
@@ -107,7 +107,7 @@ func initConfig() {
 
 		// Search config in home directory with name ".nitric" (without extension).
 		viper.AddConfigPath(home)
-		viper.AddConfigPath(path.Join(home, ".config", "nitric"))
+		viper.AddConfigPath(utils.NitricConfigDir())
 		viper.SetConfigType("yaml")
 		viper.SetConfigName(".nitric-config")
 	}

pkg/cmd/run/root.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
+	"path"
 	"path/filepath"
 	"syscall"
 	"time"
@@ -64,7 +65,8 @@ var runCmd = &cobra.Command{
 		}
 		tasklet.MustRun(createBaseImage, tasklet.Opts{Signal: term})
 
-		ls := run.NewLocalServices(stackPath)
+		ls := run.NewLocalServices(path.Base(stackPath), stackPath)
+
 		memerr := make(chan error)
 
 		startLocalServices := tasklet.Runner{

pkg/run/run.go

@@ -20,8 +20,10 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"path"
 	"time"
 
+	"github.com/nitrictech/newcli/pkg/utils"
 	"github.com/nitrictech/nitric/pkg/membrane"
 	boltdb_service "github.com/nitrictech/nitric/pkg/plugins/document/boltdb"
 	secret_service "github.com/nitrictech/nitric/pkg/plugins/secret/dev"
@@ -36,13 +38,15 @@ type LocalServices interface {
 }
 
 type localServices struct {
+	stackName string
 	stackPath string
 	mio       *MinioServer
 	mem       *membrane.Membrane
 }
 
-func NewLocalServices(stackPath string) LocalServices {
+func NewLocalServices(stackName, stackPath string) LocalServices {
 	return &localServices{
+		stackName: stackName,
 		stackPath: stackPath,
 	}
 }
@@ -65,8 +69,10 @@ func (l *localServices) Running() bool {
 }
 
 func (l *localServices) Start() error {
+	runDir := path.Join(utils.NitricRunDir(), l.stackName)
+
 	var err error
-	l.mio, err = NewMinio("./.nitric/run", "test-run")
+	l.mio, err = NewMinio(runDir, "test-run")
 	if err != nil {
 		return err
 	}
@@ -87,14 +93,14 @@ func (l *localServices) Start() error {
 	}
 
 	// Connect dev documents
-	os.Setenv("LOCAL_DB_DIR", "./.nitric/run")
+	os.Setenv("LOCAL_DB_DIR", runDir)
 	dp, err := boltdb_service.New()
 	if err != nil {
 		return err
 	}
 
 	// Connect secrets plugin
-	os.Setenv("LOCAL_SEC_DIR", "./.nitric/run")
+	os.Setenv("LOCAL_SEC_DIR", runDir)
 	secp, err := secret_service.New()
 	if err != nil {
 		return err

pkg/templates/contents.go

@@ -61,7 +61,7 @@ var _ Downloader = &downloader{}
 
 func NewDownloader() Downloader {
 	return &downloader{
-		configPath: path.Join(utils.NitricHome(), "store", "repositories.yml"),
+		configPath: path.Join(utils.NitricTemplatesDir(), "repositories.yml"),
 		newGetter:  utils.NewGetter,
 	}
 }

pkg/utils/paths.go

@@ -19,7 +19,9 @@ package utils
 import (
 	"log"
 	"os"
+	"os/user"
 	"path"
+	"runtime"
 	"strings"
 )
 
@@ -35,10 +37,9 @@ func SplitPath(p string) []string {
 	return strings.FieldsFunc(p, slashSplitter)
 }
 
-// Gets the nitric home directory
-func NitricHome() string {
+// homeDir gets the nitric home directory
+func homeDir() string {
 	nitricHomeEnv := os.Getenv("NITRIC_HOME")
-
 	if nitricHomeEnv != "" {
 		return nitricHomeEnv
 	}
@@ -50,3 +51,33 @@ func NitricHome() string {
 
 	return path.Join(dirname, ".nitric")
 }
+
+// NitricRunDir returns the directory to place runtime data.
+func NitricRunDir() string {
+	if runtime.GOOS == "linux" {
+		u, err := user.Current()
+		if err != nil {
+			log.Fatal(err)
+		}
+		return path.Join("/run/user/", u.Uid, "nitric")
+	}
+	return path.Join(homeDir(), "run")
+}
+
+// NitricTemplatesDir returns the directory to place template related data.
+func NitricTemplatesDir() string {
+	return path.Join(homeDir(), "store")
+}
+
+// NitricConfigDir returns the directory to find configuration.
+func NitricConfigDir() string {
+	if runtime.GOOS == "linux" {
+		dirname, err := os.UserHomeDir()
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		return path.Join(dirname, ".config", "nitric")
+	}
+	return homeDir()
+}