From 0fe2ef4fe42ca9c60b07b6c776a8362350a1c013 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <sh.github.6811@hykes.org>
Date: Thu, 4 Feb 2021 20:56:32 +0000
Subject: [PATCH] Simplify Env API: Compute/Components instead of Compute/Walk

Signed-off-by: Solomon Hykes <sh.github.6811@hykes.org>
---
 dagger/env.go   | 79 ++++++++++++++++++++++++-------------------------
 dagger/value.go | 19 ++++++++++++
 2 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/dagger/env.go b/dagger/env.go
index a9b87dd1..a5582dc3 100644
--- a/dagger/env.go
+++ b/dagger/env.go
@@ -165,22 +165,18 @@ func (env *Env) LocalDirs(ctx context.Context) (map[string]string, error) {
 		lg.Debug().Str("func", "Env.LocalDirs").Interface("result", dirs).Msg("done")
 	}()
 	// 1. Walk env state, scan compute script for each component.
-	_, err := env.Walk(ctx, func(ctx context.Context, c *Component, out *Fillable) error {
+	for _, c := range env.Components() {
 		lg.Debug().
 			Str("func", "Env.LocalDirs").
 			Str("component", c.Value().Path().String()).
 			Msg("scanning next component for local dirs")
 		cdirs, err := c.LocalDirs(ctx)
 		if err != nil {
-			return err
+			return dirs, err
 		}
 		for k, v := range cdirs {
 			dirs[k] = v
 		}
-		return nil
-	})
-	if err != nil {
-		return dirs, err
 	}
 	// 2. Scan updater script
 	updirs, err := env.updater.LocalDirs(ctx)
@@ -193,31 +189,24 @@ func (env *Env) LocalDirs(ctx context.Context) (map[string]string, error) {
 	return dirs, nil
 }
 
-// Compute missing values in env configuration, and write them to state.
-func (env *Env) Compute(ctx context.Context, s Solver) error {
-	output, err := env.Walk(ctx, func(ctx context.Context, c *Component, out *Fillable) error {
-		lg := log.Ctx(ctx)
-
-		lg.
-			Debug().
-			Msg("[Env.Compute] processing")
-		if _, err := c.Compute(ctx, s, out); err != nil {
-			lg.
-				Error().
-				Err(err).
-				Msg("component failed")
-			return err
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-	return env.set(
-		env.base,
-		env.input,
-		output,
+// Return a list of components in the env config.
+func (env *Env) Components() []*Component {
+	components := []*Component{}
+	env.State().Walk(
+		func(v *Value) bool {
+			c, err := NewComponent(v)
+			if os.IsNotExist(err) {
+				return true
+			}
+			if err != nil {
+				return false
+			}
+			components = append(components, c)
+			return false // skip nested components, as cueflow does not allow them
+		},
+		nil,
 	)
+	return components
 }
 
 // FIXME: this is just a 3-way merge. Add var args to Value.Merge.
@@ -285,11 +274,8 @@ func (env *Env) Export(fs FS) (FS, error) {
 	return fs, nil
 }
 
-// FIXME: don't need ctx here
-type EnvWalkFunc func(context.Context, *Component, *Fillable) error
-
-// Walk components and return any computed values
-func (env *Env) Walk(ctx context.Context, fn EnvWalkFunc) (*Value, error) {
+// Compute missing values in env configuration, and write them to state.
+func (env *Env) Compute(ctx context.Context, s Solver) error {
 	lg := log.Ctx(ctx)
 
 	// Cueflow cue instance
@@ -300,9 +286,9 @@ func (env *Env) Walk(ctx context.Context, fn EnvWalkFunc) (*Value, error) {
 		Msg("walking")
 
 	// Initialize empty output
-	out, err := env.cc.EmptyStruct()
+	output, err := env.cc.EmptyStruct()
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	// Cueflow config
@@ -325,7 +311,7 @@ func (env *Env) Walk(ctx context.Context, fn EnvWalkFunc) (*Value, error) {
 			lg.Debug().Msg("cueflow task: filling result")
 			// Merge task value into output
 			var err error
-			out, err = out.MergePath(t.Value(), t.Path())
+			output, err = output.MergePath(t.Value(), t.Path())
 			if err != nil {
 				lg.
 					Error().
@@ -362,15 +348,26 @@ func (env *Env) Walk(ctx context.Context, fn EnvWalkFunc) (*Value, error) {
 					Str("dependency", dep.Path().String()).
 					Msg("dependency detected")
 			}
-			return fn(ctx, c, NewFillable(t))
+			if _, err := c.Compute(ctx, s, NewFillable(t)); err != nil {
+				lg.
+					Error().
+					Err(err).
+					Msg("component failed")
+				return err
+			}
+			return nil
 		}), nil
 	}
 	// Orchestrate execution with cueflow
 	flow := cueflow.New(flowCfg, flowInst, flowMatchFn)
 	if err := flow.Run(ctx); err != nil {
-		return out, err
+		return err
 	}
-	return out, nil
+	return env.set(
+		env.base,
+		env.input,
+		output,
+	)
 }
 
 // Return the component at the specified path in the config, eg. `www`
diff --git a/dagger/value.go b/dagger/value.go
index cf4056f5..c7073524 100644
--- a/dagger/value.go
+++ b/dagger/value.go
@@ -192,6 +192,25 @@ func (v *Value) IsConcreteR() error {
 	return v.val.Validate(cue.Concrete(true))
 }
 
+func (v *Value) Walk(before func(*Value) bool, after func(*Value)) {
+	// FIXME: lock?
+	var (
+		llBefore func(cue.Value) bool
+		llAfter  func(cue.Value)
+	)
+	if before != nil {
+		llBefore = func(child cue.Value) bool {
+			return before(v.Wrap(child))
+		}
+	}
+	if after != nil {
+		llAfter = func(child cue.Value) {
+			after(v.Wrap(child))
+		}
+	}
+	v.val.Walk(llBefore, llAfter)
+}
+
 // Export concrete values to JSON. ignoring non-concrete values.
 // Contrast with cue.Value.MarshalJSON which requires all values
 // to be concrete.