diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-11-05 06:00:39 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-11-05 06:00:39 +0900 |
| commit | fba201c9953a490da914b09e09eaaa697a4b36e1 (patch) | |
| tree | 9aa54e81577b6e3e580176f266d70a286ed52d9e /internal/outcome | |
| parent | 7f27a6dc5173bc6c4b71918b98a2d6b72bd37d30 (diff) | |
container/std: relocate rule types
This enables its use in hst for #15.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/outcome')
| -rw-r--r-- | internal/outcome/dispatcher.go | 5 | ||||
| -rw-r--r-- | internal/outcome/dispatcher_test.go | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/internal/outcome/dispatcher.go b/internal/outcome/dispatcher.go index 443148c6..3427a484 100644 --- a/internal/outcome/dispatcher.go +++ b/internal/outcome/dispatcher.go @@ -13,6 +13,7 @@ import ( "hakurei.app/container" "hakurei.app/container/check" "hakurei.app/container/seccomp" + "hakurei.app/container/std" "hakurei.app/internal" "hakurei.app/message" "hakurei.app/system/dbus" @@ -86,7 +87,7 @@ type syscallDispatcher interface { containerWait(z *container.Container) error // seccompLoad provides [seccomp.Load]. - seccompLoad(rules []seccomp.NativeRule, flags seccomp.ExportFlag) error + seccompLoad(rules []std.NativeRule, flags seccomp.ExportFlag) error // mustHsuPath provides [internal.MustHsuPath]. mustHsuPath() *check.Absolute @@ -151,7 +152,7 @@ func (direct) containerStart(z *container.Container) error { return z.Start() } func (direct) containerServe(z *container.Container) error { return z.Serve() } func (direct) containerWait(z *container.Container) error { return z.Wait() } -func (direct) seccompLoad(rules []seccomp.NativeRule, flags seccomp.ExportFlag) error { +func (direct) seccompLoad(rules []std.NativeRule, flags seccomp.ExportFlag) error { return seccomp.Load(rules, flags) } diff --git a/internal/outcome/dispatcher_test.go b/internal/outcome/dispatcher_test.go index 87a24e6c..41a2a31a 100644 --- a/internal/outcome/dispatcher_test.go +++ b/internal/outcome/dispatcher_test.go @@ -21,6 +21,7 @@ import ( "hakurei.app/container" "hakurei.app/container/check" "hakurei.app/container/seccomp" + "hakurei.app/container/std" "hakurei.app/container/stub" "hakurei.app/hst" "hakurei.app/message" @@ -435,7 +436,7 @@ func (k *kstub) containerWait(z *container.Container) error { return k.expectCheckContainer(k.Expects("containerWait"), z) } -func (k *kstub) seccompLoad(rules []seccomp.NativeRule, flags seccomp.ExportFlag) error { +func (k *kstub) seccompLoad(rules []std.NativeRule, flags seccomp.ExportFlag) error { k.Helper() return k.Expects("seccompLoad").Error( stub.CheckArgReflect(k.Stub, "rules", rules, 0), @@ -722,6 +723,6 @@ func (panicDispatcher) fatalf(string, ...any) { pa func (panicDispatcher) notifyContext(context.Context, ...os.Signal) (context.Context, context.CancelFunc) { panic("unreachable") } -func (panicDispatcher) seccompLoad([]seccomp.NativeRule, seccomp.ExportFlag) error { +func (panicDispatcher) seccompLoad([]std.NativeRule, seccomp.ExportFlag) error { panic("unreachable") } |