added default lookup location for creditfile

Author: MaxThom

.tmux/mir-serve.session.sh

@@ -0,0 +1,27 @@
+# Set a custom session root path. Default is `$HOME`.
+# Must be called before `initialize_session`.
+session_root "$PWD"
+
+# Create session with specified name if it does not already exist. If no
+# argument is given, session name will be based on layout file name.
+if initialize_session "mir"; then
+
+	# Create a new window inline within session layout definition.
+	#new_window "misc"
+
+	# Load a defined window layout.
+	load_window "./.tmux/mir.window.sh"
+	load_window "./.tmux/claude.window.sh"
+	load_window "./.tmux/serve.window.sh"
+	load_window "./.tmux/infra.window.sh"
+	load_window "./.tmux/cfg.window.sh"
+	load_window "./.tmux/book.window.sh"
+	load_window "./.tmux/wiki.window.sh"
+
+	# Select the default active window on session creation.
+	select_window 1
+
+fi
+
+# Finalize session creation and switch/attach to it.
+finalize_and_go_to_session

.tmux/serve.window.sh

@@ -0,0 +1,26 @@
+# Set window root path. Default is `$session_root`.
+# Must be called before `new_window`.
+window_root "$PWD/cmds/mir/"
+
+# Create new window. If no argument is given, window name will be based on
+# layout file name.
+new_window "serve"
+
+#run_cmd "sleep 5 && go run main.go"
+run_cmd 'bash -c "(sleep 5 && go run main.go serve)"'
+
+
+# Split window into panes.
+split_v 20
+#split_h 50
+
+# Run commands.
+#run_cmd "top"     # runs in active pane
+#run_cmd "date" 1  # runs in pane 1
+
+# Paste text
+#send_keys "top"    # paste into active pane
+#send_keys "date" 1 # paste into pane 1
+
+# Set active pane.
+#select_pane 0

TASKS.md

@@ -14,6 +14,7 @@
   - [ ] device security with nats
     - [ ] nkeys/jwt
       - [x] modify sdks
+        [ ] add device,default credential location
       - [x] learn how it work
       - [ ] integrate nsc to cli with default security for device and clients
         - [ ] add the nsc generator
@@ -22,6 +23,7 @@
           - [x] read only
           - [x] read and write
       - [ ] work on compose release, maybe its just a readme
+        - [ ] default config has resolver.conf include commented out
       - [ ] adjust helm release
     - [ ] tls
   - [ ] core bug with reconnect of loading devices

internal/libs/swarm/swarm.go

@@ -171,7 +171,7 @@ func (b *devicesBuilder) Incubate() ([]*mir_apiv1.CreateDeviceResponse, error) {
 			LogLevel(b.logLevel).
 			Store(b.storeOpts).
 			Target(b.s.bus.ConnectedUrl()).
-			UserCredentials(b.credentials).
+			UserCredentialsFile(b.credentials).
 			Schema(b.sch...).Build()
 		if err != nil {
 			errs = errors.Join(err)
@@ -194,7 +194,7 @@ func (b *devicesBuilder) Incubate() ([]*mir_apiv1.CreateDeviceResponse, error) {
 			LogWriters(b.logWriters).
 			Store(b.storeOpts).
 			Target(b.s.bus.ConnectedUrl()).
-			UserCredentials(b.credentials).
+			UserCredentialsFile(b.credentials).
 			Schema(b.sch...).Build()
 		if err != nil {
 			errs = errors.Join(err)
@@ -273,7 +273,7 @@ func (b *deviceBuilder) Incubate() (*mir_apiv1.CreateDeviceResponse, error) {
 		LogWriters(b.logWriters).
 		Store(b.storeOpts).
 		Target(b.s.bus.ConnectedUrl()).
-		UserCredentials(b.credentials).
+		UserCredentialsFile(b.credentials).
 		Schema(b.sch...).Build()
 	if err != nil {
 		return nil, err

justfile

@@ -58,6 +58,10 @@ install-scp host arch="arm64" os="linux":
 tx:
 	tmuxifier s ./.tmux/mir.session.sh
 
+# Start tmux layouts with mir in docker and serve using CLI
+tx-serve:
+	tmuxifier s ./.tmux/mir-serve.session.sh
+
 # Start tmux layouts with mir in docker
 tx-full:
 	tmuxifier s ./.tmux/mir-full.session.sh

pkgs/device/mir/mir_builder.go

@@ -22,7 +22,7 @@ import (
 
 type builder struct {
 	fileOpts            []func(*mir_config.MirConfig)
-	credentials         *string
+	credentialsFiles    []string
 	deviceId            *string
 	deviceIdGenerator   *IdGenerator
 	deviceIdPrefix      *IdPrefix
@@ -82,8 +82,28 @@ func (b builder) DeviceIdPrefix(p IdPrefix) builder {
 	return b
 }
 
-func (b builder) UserCredentials(fullPath string) builder {
-	b.credentials = &fullPath
+func (b builder) UserCredentialsFile(fullPath string) builder {
+	b.credentialsFiles = append(b.credentialsFiles, fullPath)
+	return b
+}
+
+// Look for a user credentials file at those locations in order to authenticate:
+//   - ./device.creds
+//   - ~/.config/mir/device.creds
+//   - /etc/mir/device.creds
+func (b builder) DefaultUserCredentialsFile() builder {
+	userHomeDir, err := os.UserHomeDir()
+	if err != nil {
+		fmt.Println("$HOME is not defined")
+		userHomeDir = "./"
+	}
+	xdgConfigHome := filepath.Join(userHomeDir, ".config", "mir", "device.creds")
+
+	b.credentialsFiles = append(b.credentialsFiles,
+		"/etc/mir/device.creds",
+		xdgConfigHome,
+		"./device.creds",
+	)
 	return b
 }
 
@@ -94,15 +114,12 @@ func (b builder) Target(t string) builder {
 	return b
 }
 
-// Use a configuration file to load the
-// device_id and the target. Specifying those configs
-// in the builder pattern have greater priority
-// then loading from the config file.
-// The file is loaded in folders:
-// - ./device.yaml
-// - ~/.config/mir/device.yaml
-// - /etc/mir/device.yaml
-// $HOME/.config/mir/device.[json|yaml]
+// Use a configuration file to load device configs.
+// Specifying those configs in the builder pattern have greater priority
+// then loading from the config file. The file is loaded in folders:
+//   - ./device.yaml
+//   - ~/.config/mir/device.yaml
+//   - /etc/mir/device.yaml
 func (b builder) DefaultConfigFile() builder {
 	format := mir_config.Yaml
 	fileName := "device.yaml"
@@ -247,8 +264,17 @@ func (b builder) build(extraCfg any) (*Mir, error) {
 	} else if cfg.Mir.Target == "" {
 		cfg.Mir.Target = "nats://127.0.0.1:4222"
 	}
-	if b.credentials != nil {
-		cfg.Mir.Credentials = *b.credentials
+	// Add credential file path
+	if cfg.Mir.Credentials != "" {
+		b.credentialsFiles = append(b.credentialsFiles, cfg.Mir.Credentials)
+	}
+	// Look for first file to exist
+	for i := len(b.credentialsFiles) - 1; i >= 0; i-- {
+		c := b.credentialsFiles[i]
+		if _, err := os.Stat(c); err == nil {
+			cfg.Mir.Credentials = c
+			break
+		}
 	}
 	if b.logLevel != nil {
 		cfg.Mir.LogLevel = b.logLevel.String()