Thales Maciel
ecb18ce6ca
Three test seams were still package-level mutable vars, which tests
had to swap before use. That's the classic path to flaky parallel
tests — two goroutines fighting over the same global fake. Push each
down to the struct that owns the behaviour.
internal/daemon/dns_routing.go
lookupExecutableFunc + vmDNSAddrFunc → fields on *HostNetwork,
defaulted at newHostNetwork time. dns_routing_test builds
HostNetwork{..., lookupExecutable: stub, vmDNSAddr: stub} inline,
no more t.Cleanup dance around package-level vars.
internal/daemon/preflight.go + doctor.go
vsockHostDevicePath (mutable string) → vsockHostDevice field on
*VMService, defaulted via defaultVsockHostDevice constant in
newVMService. Preflight reads s.vsockHostDevice; doctor reads
d.vm.vsockHostDevice. Logger test sets d.vm.vsockHostDevice = tmp
after wireServices.
internal/daemon/workspace/workspace.go
HostCommandOutputFunc → *Inspector struct with a Runner field.
Every git-using helper (GitOutput, GitTrimmedOutput,
GitResolvedConfigValue, RunHostCommand, ListSubmodules,
ListOverlayPaths, CountUntrackedPaths, InspectRepo,
ImportRepoToGuest, PrepareRepoCopy) is now a method on *Inspector.
NewInspector() wraps the real host runner for production;
WorkspaceService holds one via repoInspector, CLI deps holds one
too. cli_test.go's submodule-rejection test builds its own
Inspector with a scripted Runner instead of patching a global.
Pure helpers (FinalizeScript, ResolveSourcePath, ParsePrepareMode,
ShellQuote, FormatStepError, GitFileURL, ParseNullSeparatedOutput)
stay free functions since they don't touch the host.
Sentinel: grep for HostCommandOutputFunc, lookupExecutableFunc,
vmDNSAddrFunc, vsockHostDevicePath is now empty across internal/.
make lint test green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
55 lines
1.6 KiB
Go
55 lines
1.6 KiB
Go
package daemon
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
)
|
|
|
|
const vmResolverRouteDomain = "~vm"
|
|
|
|
func (n *HostNetwork) syncVMDNSResolverRouting(ctx context.Context) error {
|
|
if n == nil || n.vmDNS == nil {
|
|
return nil
|
|
}
|
|
if strings.TrimSpace(n.config.BridgeName) == "" {
|
|
return nil
|
|
}
|
|
if _, err := n.lookupExecutable("resolvectl"); err != nil {
|
|
return nil
|
|
}
|
|
if _, err := n.runner.Run(ctx, "ip", "link", "show", n.config.BridgeName); err != nil {
|
|
return nil
|
|
}
|
|
serverAddr := strings.TrimSpace(n.vmDNSAddr(n.vmDNS))
|
|
if serverAddr == "" {
|
|
return nil
|
|
}
|
|
if _, err := n.runner.RunSudo(ctx, "resolvectl", "dns", n.config.BridgeName, serverAddr); err != nil {
|
|
return err
|
|
}
|
|
if _, err := n.runner.RunSudo(ctx, "resolvectl", "domain", n.config.BridgeName, vmResolverRouteDomain); err != nil {
|
|
return err
|
|
}
|
|
_, err := n.runner.RunSudo(ctx, "resolvectl", "default-route", n.config.BridgeName, "no")
|
|
return err
|
|
}
|
|
|
|
func (n *HostNetwork) clearVMDNSResolverRouting(ctx context.Context) error {
|
|
if n == nil || strings.TrimSpace(n.config.BridgeName) == "" {
|
|
return nil
|
|
}
|
|
if _, err := n.lookupExecutable("resolvectl"); err != nil {
|
|
return nil
|
|
}
|
|
if _, err := n.runner.Run(ctx, "ip", "link", "show", n.config.BridgeName); err != nil {
|
|
return nil
|
|
}
|
|
_, err := n.runner.RunSudo(ctx, "resolvectl", "revert", n.config.BridgeName)
|
|
return err
|
|
}
|
|
|
|
func (n *HostNetwork) ensureVMDNSResolverRouting(ctx context.Context) {
|
|
if err := n.syncVMDNSResolverRouting(ctx); err != nil && n.logger != nil {
|
|
n.logger.Warn("vm dns resolver route sync failed", "bridge", n.config.BridgeName, "error", err.Error())
|
|
}
|
|
}
|