diff --git a/cmd/hakurei/command_test.go b/cmd/hakurei/command_test.go index e489291..82e67f2 100644 --- a/cmd/hakurei/command_test.go +++ b/cmd/hakurei/command_test.go @@ -77,7 +77,7 @@ Flags: t.Parallel() out := new(bytes.Buffer) - c := buildCommand(t.Context(), message.NewMsg(nil), new(earlyHardeningErrs), out) + c := buildCommand(t.Context(), message.New(nil), new(earlyHardeningErrs), out) if err := c.Parse(tc.args); !errors.Is(err, command.ErrHelp) && !errors.Is(err, flag.ErrHelp) { t.Errorf("Parse: error = %v; want %v", err, command.ErrHelp) diff --git a/cmd/hakurei/main.go b/cmd/hakurei/main.go index dcea40c..169ac6c 100644 --- a/cmd/hakurei/main.go +++ b/cmd/hakurei/main.go @@ -32,7 +32,7 @@ func main() { log.SetPrefix("hakurei: ") log.SetFlags(0) - msg := message.NewMsg(log.Default()) + msg := message.New(log.Default()) early := earlyHardeningErrs{ yamaLSM: container.SetPtracer(0), diff --git a/cmd/hakurei/parse_test.go b/cmd/hakurei/parse_test.go index 81f9605..e98e945 100644 --- a/cmd/hakurei/parse_test.go +++ b/cmd/hakurei/parse_test.go @@ -28,7 +28,7 @@ func TestShortIdentifier(t *testing.T) { func TestTryIdentifier(t *testing.T) { t.Parallel() - msg := message.NewMsg(nil) + msg := message.New(nil) id := hst.ID{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10, diff --git a/cmd/hakurei/print_test.go b/cmd/hakurei/print_test.go index 9b1922c..98ca806 100644 --- a/cmd/hakurei/print_test.go +++ b/cmd/hakurei/print_test.go @@ -761,7 +761,7 @@ func TestPrintPs(t *testing.T) { t.Parallel() var printBuf, logBuf bytes.Buffer - msg := message.NewMsg(log.New(&logBuf, "check: ", 0)) + msg := message.New(log.New(&logBuf, "check: ", 0)) msg.SwapVerbose(true) printPs(msg, &printBuf, testTime, s, tc.short, tc.json) if got := printBuf.String(); got != tc.want { diff --git a/cmd/hpkg/main.go b/cmd/hpkg/main.go index 757dc14..0ce1945 100644 --- a/cmd/hpkg/main.go +++ b/cmd/hpkg/main.go @@ -24,7 +24,7 @@ var ( func main() { log.SetPrefix("hpkg: ") log.SetFlags(0) - msg := message.NewMsg(log.Default()) + msg := message.New(log.Default()) if err := os.Setenv("SHELL", pathShell.String()); err != nil { log.Fatalf("cannot set $SHELL: %v", err) diff --git a/container/container.go b/container/container.go index 3ba87da..1e23897 100644 --- a/container/container.go +++ b/container/container.go @@ -404,7 +404,7 @@ func (p *Container) ProcessState() *os.ProcessState { // New returns the address to a new instance of [Container] that requires further initialisation before use. func New(ctx context.Context, msg message.Msg) *Container { if msg == nil { - msg = message.NewMsg(nil) + msg = message.New(nil) } p := &Container{ctx: ctx, msg: msg, Params: Params{Ops: new(Ops)}} diff --git a/container/container_test.go b/container/container_test.go index b7d0e9d..67d795f 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -556,7 +556,7 @@ func testContainerCancel( func TestContainerString(t *testing.T) { t.Parallel() - msg := message.NewMsg(nil) + msg := message.New(nil) c := container.NewCommand(t.Context(), msg, check.MustAbs("/run/current-system/sw/bin/ldd"), "ldd", "/usr/bin/env") c.SeccompFlags |= seccomp.AllowMultiarch c.SeccompRules = seccomp.Preset( @@ -721,7 +721,7 @@ func TestMain(m *testing.M) { } func helperNewContainerLibPaths(ctx context.Context, libPaths *[]*check.Absolute, args ...string) (c *container.Container) { - msg := message.NewMsg(nil) + msg := message.New(nil) c = container.NewCommand(ctx, msg, absHelperInnerPath, "helper", args...) c.Env = append(c.Env, envDoCheck+"=1") c.Bind(check.MustAbs(os.Args[0]), absHelperInnerPath, 0) diff --git a/container/executable_test.go b/container/executable_test.go index 38e8943..486d14d 100644 --- a/container/executable_test.go +++ b/container/executable_test.go @@ -11,7 +11,7 @@ import ( func TestExecutable(t *testing.T) { t.Parallel() for i := 0; i < 16; i++ { - if got := container.MustExecutable(message.NewMsg(nil)); got != os.Args[0] { + if got := container.MustExecutable(message.New(nil)); got != os.Args[0] { t.Errorf("MustExecutable: %q, want %q", got, os.Args[0]) } } diff --git a/container/init.go b/container/init.go index 5c4d251..fd513ef 100644 --- a/container/init.go +++ b/container/init.go @@ -461,7 +461,7 @@ func TryArgv0(msg message.Msg) { if msg == nil { log.SetPrefix(initName + ": ") log.SetFlags(0) - msg = message.NewMsg(log.Default()) + msg = message.New(log.Default()) } if len(os.Args) > 0 && path.Base(os.Args[0]) == initName { diff --git a/internal/outcome/main_test.go b/internal/outcome/main_test.go index f25264b..14aa34d 100644 --- a/internal/outcome/main_test.go +++ b/internal/outcome/main_test.go @@ -29,7 +29,7 @@ import ( func TestOutcomeMain(t *testing.T) { t.Parallel() - msg := message.NewMsg(nil) + msg := message.New(nil) msg.SwapVerbose(testing.Verbose()) testCases := []struct { @@ -40,7 +40,7 @@ func TestOutcomeMain(t *testing.T) { wantSys *system.I wantParams *container.Params }{ - {"template", new(stubNixOS), hst.Template(), checkExpectInstanceId, system.New(panicMsgContext{}, message.NewMsg(nil), 1000009). + {"template", new(stubNixOS), hst.Template(), checkExpectInstanceId, system.New(panicMsgContext{}, message.New(nil), 1000009). // spParamsOp Ensure(m("/tmp/hakurei.0"), 0711). diff --git a/internal/outcome/shim.go b/internal/outcome/shim.go index c4cae09..48ff756 100644 --- a/internal/outcome/shim.go +++ b/internal/outcome/shim.go @@ -78,7 +78,7 @@ const shimName = "shim" // Shim does not return. func Shim(msg message.Msg) { if msg == nil { - msg = message.NewMsg(log.Default()) + msg = message.New(log.Default()) } shimEntrypoint(direct{msg}) } diff --git a/internal/outcome/spdbus_test.go b/internal/outcome/spdbus_test.go index 26f1fdc..3fa8ad4 100644 --- a/internal/outcome/spdbus_test.go +++ b/internal/outcome/spdbus_test.go @@ -80,7 +80,7 @@ func TestSpDBusOp(t *testing.T) { "--broadcast=org.freedesktop.portal.*=@/org/freedesktop/portal/*", )}}, nil, nil), }, func() *system.I { - sys := system.New(panicMsgContext{}, message.NewMsg(nil), checkExpectUid) + sys := system.New(panicMsgContext{}, message.New(nil), checkExpectUid) sys.Ephemeral(system.Process, m(wantInstancePrefix), 0711) if err := sys.ProxyDBus( dbus.NewConfig(config.ID, true, true), nil, @@ -162,7 +162,7 @@ func TestSpDBusOp(t *testing.T) { "--talk=org.freedesktop.UPower", )}}, nil, nil), }, func() *system.I { - sys := system.New(panicMsgContext{}, message.NewMsg(nil), checkExpectUid) + sys := system.New(panicMsgContext{}, message.New(nil), checkExpectUid) sys.Ephemeral(system.Process, m(wantInstancePrefix), 0711) if err := sys.ProxyDBus( config.SessionBus, config.SystemBus, diff --git a/message/message.go b/message/message.go index 36f8ae4..aa4870f 100644 --- a/message/message.go +++ b/message/message.go @@ -52,7 +52,7 @@ type Msg interface { } // defaultMsg is the default implementation of the [Msg] interface. -// The zero value is not safe for use. Callers should use the [NewMsg] function instead. +// The zero value is not safe for use. Callers should use the [New] function instead. type defaultMsg struct { verbose atomic.Bool @@ -60,10 +60,10 @@ type defaultMsg struct { Suspendable } -// NewMsg initialises a downstream [log.Logger] for a new [Msg]. -// The [log.Logger] should no longer be configured after NewMsg returns. +// New initialises a downstream [log.Logger] for a new [Msg]. +// The [log.Logger] should no longer be configured after [New] returns. // If downstream is nil, a new logger is initialised in its place. -func NewMsg(downstream *log.Logger) Msg { +func New(downstream *log.Logger) Msg { if downstream == nil { downstream = log.New(log.Writer(), "container: ", 0) } diff --git a/message/message_test.go b/message/message_test.go index 6b781e3..c455b7e 100644 --- a/message/message_test.go +++ b/message/message_test.go @@ -51,7 +51,7 @@ func TestDefaultMsg(t *testing.T) { t.Run("logger", func(t *testing.T) { t.Run("nil", func(t *testing.T) { - got := message.NewMsg(nil).GetLogger() + got := message.New(nil).GetLogger() if out := got.Writer().(*message.Suspendable).Downstream; out != log.Writer() { t.Errorf("GetLogger: Downstream = %#v", out) @@ -64,7 +64,7 @@ func TestDefaultMsg(t *testing.T) { t.Run("takeover", func(t *testing.T) { l := log.New(io.Discard, "\x00", 0xdeadbeef) - got := message.NewMsg(l) + got := message.New(l) if logger := got.GetLogger(); logger != l { t.Errorf("GetLogger: %#v, want %#v", logger, l) @@ -169,7 +169,7 @@ func TestDefaultMsg(t *testing.T) { }}, } - msg := message.NewMsg(log.New(&dw, "test: ", 0)) + msg := message.New(log.New(&dw, "test: ", 0)) for _, step := range steps { // these share the same writer, so cannot be subtests t.Logf("running step %q", step.name) diff --git a/system/dbus/dbus_test.go b/system/dbus/dbus_test.go index abe324b..85aae5b 100644 --- a/system/dbus/dbus_test.go +++ b/system/dbus/dbus_test.go @@ -93,9 +93,9 @@ func testProxyFinaliseStartWaitCloseString(t *testing.T, useSandbox bool) { t.Run("invalid start", func(t *testing.T) { if !useSandbox { - p = dbus.NewDirect(t.Context(), message.NewMsg(nil), nil, nil) + p = dbus.NewDirect(t.Context(), message.New(nil), nil, nil) } else { - p = dbus.New(t.Context(), message.NewMsg(nil), nil, nil) + p = dbus.New(t.Context(), message.New(nil), nil, nil) } if err := p.Start(); !errors.Is(err, syscall.ENOTRECOVERABLE) { @@ -125,9 +125,9 @@ func testProxyFinaliseStartWaitCloseString(t *testing.T, useSandbox bool) { defer cancel() output := new(strings.Builder) if !useSandbox { - p = dbus.NewDirect(ctx, message.NewMsg(nil), final, output) + p = dbus.NewDirect(ctx, message.New(nil), final, output) } else { - p = dbus.New(ctx, message.NewMsg(nil), final, output) + p = dbus.New(ctx, message.New(nil), final, output) } { // check invalid wait behaviour diff --git a/system/system_test.go b/system/system_test.go index 83d97a6..2798787 100644 --- a/system/system_test.go +++ b/system/system_test.go @@ -82,7 +82,7 @@ func TestNew(t *testing.T) { t.Errorf("recover: %v, want %v", r, want) } }() - New(nil, message.NewMsg(nil), 0) + New(nil, message.New(nil), 0) }) t.Run("msg", func(t *testing.T) { @@ -102,11 +102,11 @@ func TestNew(t *testing.T) { t.Errorf("recover: %v, want %v", r, want) } }() - New(t.Context(), message.NewMsg(nil), -1) + New(t.Context(), message.New(nil), -1) }) }) - sys := New(t.Context(), message.NewMsg(nil), 0xdeadbeef) + sys := New(t.Context(), message.New(nil), 0xdeadbeef) if sys.ctx == nil { t.Error("New: ctx = nil") } @@ -125,51 +125,51 @@ func TestEqual(t *testing.T) { want bool }{ {"simple UID", - New(t.Context(), message.NewMsg(nil), 150), - New(t.Context(), message.NewMsg(nil), 150), + New(t.Context(), message.New(nil), 150), + New(t.Context(), message.New(nil), 150), true}, {"simple UID differ", - New(t.Context(), message.NewMsg(nil), 150), - New(t.Context(), message.NewMsg(nil), 151), + New(t.Context(), message.New(nil), 150), + New(t.Context(), message.New(nil), 151), false}, {"simple UID nil", - New(t.Context(), message.NewMsg(nil), 150), + New(t.Context(), message.New(nil), 150), nil, false}, {"op length mismatch", - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"), - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Ensure(m("/run"), 0755), false}, {"op value mismatch", - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Ensure(m("/run"), 0644), - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Ensure(m("/run"), 0755), false}, {"op type mismatch", - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Wayland(m("/proc/nonexistent/dst"), m("/proc/nonexistent/src"), "\x00", "\x00"), - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Ensure(m("/run"), 0755), false}, {"op equals", - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Ensure(m("/run"), 0755), - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Ensure(m("/run"), 0755), true},