internal/app: relocate ops condition

This allows reuse and finer grained testing of fromConfig.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 18 insertions, 45 deletions

diff --git a/internal/app/finalise.go b/internal/app/finalise.go
index bd9cf2b6..491a775b 100644
--- a/internal/app/finalise.go
+++ b/internal/app/finalise.go
@@ -47,8 +47,6 @@ func (k *outcome) finalise(ctx context.Context, msg container.Msg, id *state.ID,
 	// only used for a nil configured env map
 	const envAllocSize = 1 << 6
 
-	var kp finaliseProcess
-
 	if ctx == nil || id == nil {
 		// unreachable
 		panic("invalid call to finalise")
@@ -73,6 +71,8 @@ func (k *outcome) finalise(ctx context.Context, msg container.Msg, id *state.ID,
 		k.ct = ct
 	}
 
+	var kp finaliseProcess
+
 	// hsu expects numerical group ids
 	kp.supp = make([]string, len(config.Groups))
 	for i, name := range config.Groups {
@@ -105,52 +105,25 @@ func (k *outcome) finalise(ctx context.Context, msg container.Msg, id *state.ID,
 	kp.runDirPath, kp.identity, kp.id = s.sc.RunDirPath, s.identity, s.id
 	sys := system.New(k.ctx, msg, s.uid.unwrap())
 
-	{
-		ops := []outcomeOp{
-			// must run first
-			&spParamsOp{},
-
-			// TODO(ophestra): move this late for #8 and #9
-			spFilesystemOp{},
-
-			spRuntimeOp{},
-			spTmpdirOp{},
-			spAccountOp{},
-		}
+	ops := fromConfig(config)
 
-		et := config.Enablements.Unwrap()
-		if et&hst.EWayland != 0 {
-			ops = append(ops, &spWaylandOp{})
-		}
-		if et&hst.EX11 != 0 {
-			ops = append(ops, &spX11Op{})
-		}
-		if et&hst.EPulse != 0 {
-			ops = append(ops, &spPulseOp{})
-		}
-		if et&hst.EDBus != 0 {
-			ops = append(ops, &spDBusOp{})
-		}
-		ops = append(ops, spFinal{})
-
-		stateSys := outcomeStateSys{sys: sys, outcomeState: &s}
-		for _, op := range ops {
-			if err := op.toSystem(&stateSys, config); err != nil {
-				return err
-			}
+	stateSys := outcomeStateSys{sys: sys, outcomeState: &s}
+	for _, op := range ops {
+		if err := op.toSystem(&stateSys, config); err != nil {
+			return err
 		}
+	}
 
-		// TODO(ophestra): move to shim
-		stateParams := outcomeStateParams{params: &k.container, outcomeState: &s}
-		if s.Container.Env == nil {
-			stateParams.env = make(map[string]string, envAllocSize)
-		} else {
-			stateParams.env = maps.Clone(s.Container.Env)
-		}
-		for _, op := range ops {
-			if err := op.toContainer(&stateParams); err != nil {
-				return err
-			}
+	// TODO(ophestra): move to shim
+	stateParams := outcomeStateParams{params: &k.container, outcomeState: &s}
+	if s.Container.Env == nil {
+		stateParams.env = make(map[string]string, envAllocSize)
+	} else {
+		stateParams.env = maps.Clone(s.Container.Env)
+	}
+	for _, op := range ops {
+		if err := op.toContainer(&stateParams); err != nil {
+			return err
 		}
 	}