Thales Maciel
2a7f55f028
Workspace-mode vm run and vm workspace prepare used to copy both tracked AND untracked non-ignored files into the guest. That silently catches local .env files, scratch notes, credentials, and any other working-tree state a developer hasn't explicitly gitignored — a real data-exposure footgun given the golden image ships Docker and the usual dev tooling. Flip the default to tracked-only. Users who actually want the fuller set opt in with --include-untracked (documented in both commands' help). Gitignored files are still always excluded regardless of the flag. Add --dry-run to both vm run and vm workspace prepare. Dry-run inspects the repo CLI-side (no VM created, no daemon RPC needed since the daemon is always local and the inspection is a pure git read), prints the exact file list + mode, and exits. A byte-level preview of what would land in the guest. When running real (non-dry) and untracked files exist in the repo but are being skipped under the new default, print a one-line notice pointing to --include-untracked so users aren't surprised when the guest is missing something they expected. Signature changes: - ListOverlayPaths takes an includeUntracked bool (tracked always; untracked gated by flag). - InspectRepo takes the same flag and passes it through. - VMWorkspacePrepareParams gains IncludeUntracked. - WorkspaceService.workspaceInspectRepo seam signature widened to match (4 callers in tests updated). New workspace package tests cover both modes and verify that gitignored files never leak regardless of the flag. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
85 lines
3.5 KiB
Go
85 lines
3.5 KiB
Go
package daemon
|
|
|
|
import (
|
|
"context"
|
|
"log/slog"
|
|
"time"
|
|
|
|
ws "banger/internal/daemon/workspace"
|
|
"banger/internal/model"
|
|
"banger/internal/paths"
|
|
"banger/internal/store"
|
|
"banger/internal/system"
|
|
)
|
|
|
|
// WorkspaceService owns workspace.prepare / workspace.export plus the
|
|
// ssh-key + git-identity sync that runs as part of VM start's
|
|
// prepare_work_disk capability hook. The workspaceLocks set lives here
|
|
// so its scope (serialise concurrent tar imports on the same VM) is
|
|
// obvious at the field definition.
|
|
//
|
|
// The inspect/import test seams are per-service fields so tests inject
|
|
// fakes without mutating package-level state.
|
|
type WorkspaceService struct {
|
|
runner system.CommandRunner
|
|
logger *slog.Logger
|
|
config model.DaemonConfig
|
|
layout paths.Layout
|
|
store *store.Store
|
|
|
|
// workspaceLocks serialises concurrent workspace.prepare /
|
|
// workspace.export on the same VM. Separate from vmLocks so slow
|
|
// guest I/O doesn't block lifecycle ops.
|
|
workspaceLocks vmLockSet
|
|
|
|
// Peer-service access via narrow function-typed dependencies.
|
|
// WorkspaceService doesn't hold pointers to the full VMService or
|
|
// HostNetwork; it only sees the exact operations it needs.
|
|
vmResolver func(ctx context.Context, idOrName string) (model.VMRecord, error)
|
|
aliveChecker func(vm model.VMRecord) bool
|
|
waitGuestSSH func(ctx context.Context, address string, interval time.Duration) error
|
|
dialGuest func(ctx context.Context, address string) (guestSSHClient, error)
|
|
imageResolver func(ctx context.Context, idOrName string) (model.Image, error)
|
|
imageWorkSeed func(ctx context.Context, image model.Image, fingerprint string) error
|
|
withVMLockByRef func(ctx context.Context, idOrName string, fn func(model.VMRecord) (model.VMRecord, error)) (model.VMRecord, error)
|
|
|
|
beginOperation func(name string, attrs ...any) *operationLog
|
|
|
|
// Test seams.
|
|
workspaceInspectRepo func(ctx context.Context, sourcePath, branchName, fromRef string, includeUntracked bool) (ws.RepoSpec, error)
|
|
workspaceImport func(ctx context.Context, client ws.GuestClient, spec ws.RepoSpec, guestPath string, mode model.WorkspacePrepareMode) error
|
|
}
|
|
|
|
type workspaceServiceDeps struct {
|
|
runner system.CommandRunner
|
|
logger *slog.Logger
|
|
config model.DaemonConfig
|
|
layout paths.Layout
|
|
store *store.Store
|
|
vmResolver func(ctx context.Context, idOrName string) (model.VMRecord, error)
|
|
aliveChecker func(vm model.VMRecord) bool
|
|
waitGuestSSH func(ctx context.Context, address string, interval time.Duration) error
|
|
dialGuest func(ctx context.Context, address string) (guestSSHClient, error)
|
|
imageResolver func(ctx context.Context, idOrName string) (model.Image, error)
|
|
imageWorkSeed func(ctx context.Context, image model.Image, fingerprint string) error
|
|
withVMLockByRef func(ctx context.Context, idOrName string, fn func(model.VMRecord) (model.VMRecord, error)) (model.VMRecord, error)
|
|
beginOperation func(name string, attrs ...any) *operationLog
|
|
}
|
|
|
|
func newWorkspaceService(deps workspaceServiceDeps) *WorkspaceService {
|
|
return &WorkspaceService{
|
|
runner: deps.runner,
|
|
logger: deps.logger,
|
|
config: deps.config,
|
|
layout: deps.layout,
|
|
store: deps.store,
|
|
vmResolver: deps.vmResolver,
|
|
aliveChecker: deps.aliveChecker,
|
|
waitGuestSSH: deps.waitGuestSSH,
|
|
dialGuest: deps.dialGuest,
|
|
imageResolver: deps.imageResolver,
|
|
imageWorkSeed: deps.imageWorkSeed,
|
|
withVMLockByRef: deps.withVMLockByRef,
|
|
beginOperation: deps.beginOperation,
|
|
}
|
|
}
|