Skip to content

Agent Mesh

Add data-dir flag to sam-node

Tomas Tormoc464facf4bf1
diff --git a/cmd/sam-node/main.go b/cmd/sam-node/main.go
index 7dad48a8..dbf3ac00 100644
--- a/cmd/sam-node/main.go
+++ b/cmd/sam-node/main.go
@@ -68,6 +68,7 @@ var (
logLevelFlag string
configFile string
keyGracePeriodFlag time.Duration
+ dataDirFlag string
apiTokenFlag string
tlsCertFlag string
@@ -99,11 +100,7 @@ func main() {
}
}
- dataDir, err := GetDataDir()
- if err != nil {
- logger.Fatalf("Failed to get data dir: %v", err)
- }
- store, err := NewStore(dataDir)
+ store, err := NewStore(resolveDataDir())
if err != nil {
logger.Fatalf("Failed to open store: %v", err)
}
@@ -257,11 +254,7 @@ func main() {
Short: "Log in to the mesh via interactive OIDC flow",
Run: func(cmd *cobra.Command, args []string) {
ctx := cmd.Context()
- dataDir, err := GetDataDir()
- if err != nil {
- logger.Fatalf("Failed to get data dir: %v", err)
- }
- store, err := NewStore(dataDir)
+ store, err := NewStore(resolveDataDir())
if err != nil {
logger.Fatalf("Failed to open store: %v", err)
}
@@ -364,6 +357,7 @@ func main() {
rootCmd.PersistentFlags().StringVar(&oidcIssuerFlag, "oidc-issuer", "", "OIDC Issuer URL")
rootCmd.PersistentFlags().StringVar(&deviceAuthURLFlag, "device-auth-url", "", "OIDC Device Authorization URL")
rootCmd.PersistentFlags().StringVar(&audienceFlag, "audience", api.DefaultAudience, "OIDC Audience")
+ rootCmd.PersistentFlags().StringVar(&dataDirFlag, "data-dir", os.Getenv("SAM_DATA_DIR"), "Override directory for the agent store (defaults to OS user config dir)")
rootCmd.AddCommand(runCmd)
rootCmd.AddCommand(loginCmd)
@@ -384,6 +378,22 @@ func main() {
}
}
+// resolveDataDir honors --data-dir / $SAM_DATA_DIR if set, else falls back to GetDataDir().
+func resolveDataDir() string {
+ if dataDirFlag != "" {
+ if err := os.MkdirAll(dataDirFlag, 0700); err != nil {
+ logger.Fatalf("Failed to create data directory: %v", err)
+ }
+ return dataDirFlag
+ }
+
+ dir, err := GetDefaultDataDir()
+ if err != nil {
+ logger.Fatalf("Failed to get data dir: %v", err)
+ }
+ return dir
+}
+
// getOrGenerateKey retrieves a persistent private key or creates one if it's the first run
func getOrGenerateKey(s *Store) crypto.PrivKey {
kb, _ := s.LoadKey()
diff --git a/cmd/sam-node/store.go b/cmd/sam-node/store.go
index 8ce4e406..f7226178 100644
--- a/cmd/sam-node/store.go
+++ b/cmd/sam-node/store.go
@@ -35,7 +35,7 @@ type Store struct {
db *bbolt.DB
}
-func GetDataDir() (string, error) {
+func GetDefaultDataDir() (string, error) {
base, err := os.UserConfigDir()
if err != nil {
return "", err
@@ -160,11 +160,9 @@ func (s *Store) Close() error {
}
const (
- bucketBannedPeers = "banned_peers"
+ bucketBannedPeers = "banned_peers"
)
-
-
// IsBanned checks local store to see if this peer is banned.
func (s *Store) IsBanned(p peer.ID) bool {
var banned bool
@@ -180,5 +178,3 @@ func (s *Store) IsBanned(p peer.ID) bool {
})
return banned
}
-
-
diff --git a/tests/e2e/watch.bats b/tests/e2e/watch.bats
index 302a2aba..b979db20 100644
--- a/tests/e2e/watch.bats
+++ b/tests/e2e/watch.bats
@@ -10,15 +10,9 @@ setup() {
TEST_TMPDIR="$(mktemp -d)"
export HOME="$TEST_TMPDIR/home"
- # Match os.UserConfigDir per OS so gen_db.go and sam-node agree on the path.
- # On Linux, os.UserConfigDir honors $XDG_CONFIG_HOME before $HOME/.config, so
- # export it to keep both processes in sync even when the host has it set.
- case "$(uname)" in
- Darwin) DB_PATH="$HOME/Library/Application Support/sam-mesh/agent.db" ;;
- *) export XDG_CONFIG_HOME="$HOME/.config"
- DB_PATH="$XDG_CONFIG_HOME/sam-mesh/agent.db" ;;
- esac
- mkdir -p "$(dirname "$DB_PATH")"
+ export SAM_DATA_DIR="$TEST_TMPDIR/data"
+ DB_PATH="$SAM_DATA_DIR/agent.db"
+ mkdir -p "$SAM_DATA_DIR"
# Generate mock DB
go run tests/e2e/gen_db.go "$DB_PATH"
diff --git a/tests/integration/proxy_test.go b/tests/integration/proxy_test.go
index 1534e75d..7c57a629 100644
--- a/tests/integration/proxy_test.go
+++ b/tests/integration/proxy_test.go
@@ -67,10 +67,7 @@ func TestSamNodeRunWithStoredIdentity(t *testing.T) {
}
_ = db.Close()
- env := append(os.Environ(),
- "HOME="+tmpHome,
- "XDG_CONFIG_HOME="+filepath.Join(tmpHome, ".config"),
- )
+ env := append(os.Environ(), "HOME="+tmpHome)
runOut, runErrOut, err := runCommand(
t,
@@ -84,6 +81,7 @@ func TestSamNodeRunWithStoredIdentity(t *testing.T) {
"--listen", "/ip4/127.0.0.1/tcp/0",
"--bind-addr", "127.0.0.1:0",
"--api-token", "dummy-token",
+ "--data-dir", configDir,
)
if err != context.DeadlineExceeded {
t.Fatalf("expected run command to keep running until timeout, got: %v\nstdout:\n%s\nstderr:\n%s", err, runOut, runErrOut)