From b5d97f633c960a826577fd80cb1d29e392dce34b Mon Sep 17 00:00:00 2001 From: bndw Date: Fri, 23 Jan 2026 21:10:04 -0800 Subject: Move default host from config file to state.json Instead of a separate ~/.config/deploy/config file, the default host is now stored as default_host in state.json. This simplifies the config and keeps all state in one place. The init command now automatically sets the default host if none is configured. --- cmd/deploy/manage.go | 93 ++++++++++++++++++++-------------------------------- 1 file changed, 36 insertions(+), 57 deletions(-) (limited to 'cmd/deploy/manage.go') diff --git a/cmd/deploy/manage.go b/cmd/deploy/manage.go index 3cee1f4..1f52b92 100644 --- a/cmd/deploy/manage.go +++ b/cmd/deploy/manage.go @@ -5,7 +5,6 @@ import ( "fmt" "os" - "github.com/bdw/deploy/internal/config" "github.com/bdw/deploy/internal/ssh" "github.com/bdw/deploy/internal/state" ) @@ -23,14 +22,16 @@ func runRemove(args []string) { name := fs.Args()[0] - // Get host from flag or config + // Load state + st, err := state.Load() + if err != nil { + fmt.Fprintf(os.Stderr, "Error loading state: %v\n", err) + os.Exit(1) + } + + // Get host from flag or state default if *host == "" { - cfg, err := config.Load() - if err != nil { - fmt.Fprintf(os.Stderr, "Error loading config: %v\n", err) - os.Exit(1) - } - *host = cfg.Host + *host = st.GetDefaultHost() } if *host == "" { @@ -39,13 +40,6 @@ func runRemove(args []string) { os.Exit(1) } - // Load state - st, err := state.Load() - if err != nil { - fmt.Fprintf(os.Stderr, "Error loading state: %v\n", err) - os.Exit(1) - } - // Get app info app, err := st.GetApp(*host, name) if err != nil { @@ -128,14 +122,16 @@ func runLogs(args []string) { name := fs.Args()[0] - // Get host from flag or config + // Load state + st, err := state.Load() + if err != nil { + fmt.Fprintf(os.Stderr, "Error loading state: %v\n", err) + os.Exit(1) + } + + // Get host from flag or state default if *host == "" { - cfg, err := config.Load() - if err != nil { - fmt.Fprintf(os.Stderr, "Error loading config: %v\n", err) - os.Exit(1) - } - *host = cfg.Host + *host = st.GetDefaultHost() } if *host == "" { @@ -144,13 +140,6 @@ func runLogs(args []string) { os.Exit(1) } - // Load state to verify app exists - st, err := state.Load() - if err != nil { - fmt.Fprintf(os.Stderr, "Error loading state: %v\n", err) - os.Exit(1) - } - app, err := st.GetApp(*host, name) if err != nil { fmt.Fprintf(os.Stderr, "Error: %v\n", err) @@ -207,14 +196,16 @@ func runStatus(args []string) { name := fs.Args()[0] - // Get host from flag or config + // Load state + st, err := state.Load() + if err != nil { + fmt.Fprintf(os.Stderr, "Error loading state: %v\n", err) + os.Exit(1) + } + + // Get host from flag or state default if *host == "" { - cfg, err := config.Load() - if err != nil { - fmt.Fprintf(os.Stderr, "Error loading config: %v\n", err) - os.Exit(1) - } - *host = cfg.Host + *host = st.GetDefaultHost() } if *host == "" { @@ -223,13 +214,6 @@ func runStatus(args []string) { os.Exit(1) } - // Load state to verify app exists - st, err := state.Load() - if err != nil { - fmt.Fprintf(os.Stderr, "Error loading state: %v\n", err) - os.Exit(1) - } - app, err := st.GetApp(*host, name) if err != nil { fmt.Fprintf(os.Stderr, "Error: %v\n", err) @@ -274,14 +258,16 @@ func runRestart(args []string) { name := fs.Args()[0] - // Get host from flag or config + // Load state + st, err := state.Load() + if err != nil { + fmt.Fprintf(os.Stderr, "Error loading state: %v\n", err) + os.Exit(1) + } + + // Get host from flag or state default if *host == "" { - cfg, err := config.Load() - if err != nil { - fmt.Fprintf(os.Stderr, "Error loading config: %v\n", err) - os.Exit(1) - } - *host = cfg.Host + *host = st.GetDefaultHost() } if *host == "" { @@ -290,13 +276,6 @@ func runRestart(args []string) { os.Exit(1) } - // Load state to verify app exists - st, err := state.Load() - if err != nil { - fmt.Fprintf(os.Stderr, "Error loading state: %v\n", err) - os.Exit(1) - } - app, err := st.GetApp(*host, name) if err != nil { fmt.Fprintf(os.Stderr, "Error: %v\n", err) -- cgit v1.2.3