P2.2-P2.9, P3.2-P3.10, P4.1-P4.3: Complete Phases 2, 3, and 4
11 work units built in parallel and merged: Agent handlers (Phase 2): - P2.2 Deploy: pull images, stop/remove/run containers, update registry - P2.3 Lifecycle: stop/start/restart with desired_state tracking - P2.4 Status: list (registry), live check (runtime), get status (drift+events) - P2.5 Sync: receive desired state, reconcile unmanaged containers - P2.6 File transfer: push/pull scoped to /srv/<service>/, path validation - P2.7 Adopt: match <service>-* containers, derive component names - P2.8 Monitor: continuous watch loop, drift/flap alerting, event pruning - P2.9 Snapshot: VACUUM INTO database backup command CLI commands (Phase 3): - P3.2 Login, P3.3 Deploy, P3.4 Stop/Start/Restart - P3.5 List/Ps/Status, P3.6 Sync, P3.7 Adopt - P3.8 Service show/edit/export, P3.9 Push/Pull, P3.10 Node list/add/remove Deployment artifacts (Phase 4): - Systemd units (agent service + backup timer) - Example configs (CLI + agent) - Install script (idempotent) All packages: build, vet, lint (0 issues), test (all pass). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,8 +1,14 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
mcpv1 "git.wntrmute.dev/kyle/mcp/gen/mcp/v1"
|
||||
"git.wntrmute.dev/kyle/mcp/internal/config"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
@@ -11,9 +17,7 @@ func pushCmd() *cobra.Command {
|
||||
Use: "push <local-file> <service> [path]",
|
||||
Short: "Copy a local file into /srv/<service>/[path]",
|
||||
Args: cobra.RangeArgs(2, 3),
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
return fmt.Errorf("not implemented")
|
||||
},
|
||||
RunE: runPush,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,8 +26,116 @@ func pullCmd() *cobra.Command {
|
||||
Use: "pull <service> <path> [local-file]",
|
||||
Short: "Copy a file from /srv/<service>/<path> to local",
|
||||
Args: cobra.RangeArgs(2, 3),
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
return fmt.Errorf("not implemented")
|
||||
},
|
||||
RunE: runPull,
|
||||
}
|
||||
}
|
||||
|
||||
func runPush(_ *cobra.Command, args []string) error {
|
||||
localFile := args[0]
|
||||
serviceName := args[1]
|
||||
|
||||
remotePath := filepath.Base(localFile)
|
||||
if len(args) == 3 {
|
||||
remotePath = args[2]
|
||||
}
|
||||
|
||||
f, err := os.Open(localFile) //nolint:gosec // user-specified path
|
||||
if err != nil {
|
||||
return fmt.Errorf("open local file %q: %w", localFile, err)
|
||||
}
|
||||
defer func() { _ = f.Close() }()
|
||||
|
||||
info, err := f.Stat()
|
||||
if err != nil {
|
||||
return fmt.Errorf("stat local file %q: %w", localFile, err)
|
||||
}
|
||||
mode := uint32(info.Mode().Perm())
|
||||
|
||||
content, err := io.ReadAll(f)
|
||||
if err != nil {
|
||||
return fmt.Errorf("read local file %q: %w", localFile, err)
|
||||
}
|
||||
|
||||
cfg, err := config.LoadCLIConfig(cfgPath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("load config: %w", err)
|
||||
}
|
||||
|
||||
_, address, err := findServiceNode(cfg, serviceName)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
client, conn, err := dialAgent(address, cfg)
|
||||
if err != nil {
|
||||
return fmt.Errorf("dial agent: %w", err)
|
||||
}
|
||||
defer func() { _ = conn.Close() }()
|
||||
|
||||
resp, err := client.PushFile(context.Background(), &mcpv1.PushFileRequest{
|
||||
Service: serviceName,
|
||||
Path: remotePath,
|
||||
Content: content,
|
||||
Mode: mode,
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("push file: %w", err)
|
||||
}
|
||||
|
||||
if !resp.GetSuccess() {
|
||||
return fmt.Errorf("push file: %s", resp.GetError())
|
||||
}
|
||||
|
||||
fmt.Printf("Pushed %s to %s:%s/%s\n", localFile, serviceName, "/srv/"+serviceName, remotePath)
|
||||
return nil
|
||||
}
|
||||
|
||||
func runPull(_ *cobra.Command, args []string) error {
|
||||
serviceName := args[0]
|
||||
remotePath := args[1]
|
||||
|
||||
localFile := filepath.Base(remotePath)
|
||||
if len(args) == 3 {
|
||||
localFile = args[2]
|
||||
}
|
||||
|
||||
cfg, err := config.LoadCLIConfig(cfgPath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("load config: %w", err)
|
||||
}
|
||||
|
||||
_, address, err := findServiceNode(cfg, serviceName)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
client, conn, err := dialAgent(address, cfg)
|
||||
if err != nil {
|
||||
return fmt.Errorf("dial agent: %w", err)
|
||||
}
|
||||
defer func() { _ = conn.Close() }()
|
||||
|
||||
resp, err := client.PullFile(context.Background(), &mcpv1.PullFileRequest{
|
||||
Service: serviceName,
|
||||
Path: remotePath,
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("pull file: %w", err)
|
||||
}
|
||||
|
||||
if resp.GetError() != "" {
|
||||
return fmt.Errorf("pull file: %s", resp.GetError())
|
||||
}
|
||||
|
||||
mode := os.FileMode(resp.GetMode())
|
||||
if mode == 0 {
|
||||
mode = 0o644
|
||||
}
|
||||
|
||||
if err := os.WriteFile(localFile, resp.GetContent(), mode); err != nil {
|
||||
return fmt.Errorf("write local file %q: %w", localFile, err)
|
||||
}
|
||||
|
||||
fmt.Printf("Pulled %s:%s to %s (mode %04o)\n", serviceName, remotePath, localFile, mode)
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user