Merge pull request #817 from samalba/unify-buildkit-client

Unify buildkit clients

client/client.go

@@ -69,13 +69,13 @@ func New(ctx context.Context, host string, noCache bool) (*Client, error) {
 type DoFunc func(context.Context, *environment.Environment, solver.Solver) error
 
 // FIXME: return completed *Route, instead of *compiler.Value
-func (c *Client) Do(ctx context.Context, state *state.State, fn DoFunc) (*environment.Environment, error) {
+func (c *Client) Do(ctx context.Context, state *state.State, fn DoFunc) error {
 	lg := log.Ctx(ctx)
 	eg, gctx := errgroup.WithContext(ctx)
 
 	environment, err := environment.New(state)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	// Spawn print function
@@ -92,7 +92,7 @@ func (c *Client) Do(ctx context.Context, state *state.State, fn DoFunc) (*enviro
 		return c.buildfn(gctx, state, environment, fn, events)
 	})
 
-	return environment, eg.Wait()
+	return eg.Wait()
 }
 
 func (c *Client) buildfn(ctx context.Context, st *state.State, env *environment.Environment, fn DoFunc, ch chan *bk.SolveStatus) error {

cmd/dagger/cmd/common/common.go

@@ -9,8 +9,6 @@ import (
 	"github.com/spf13/viper"
 	"go.dagger.io/dagger/client"
 	"go.dagger.io/dagger/compiler"
-	"go.dagger.io/dagger/environment"
-	"go.dagger.io/dagger/solver"
 	"go.dagger.io/dagger/state"
 )
 
@@ -83,20 +81,6 @@ func CurrentEnvironmentState(ctx context.Context, workspace *state.Workspace) *s
 	return environments[0]
 }
 
-// Re-compute an environment (equivalent to `dagger up`).
-func EnvironmentUp(ctx context.Context, cl *client.Client, state *state.State, noCache bool) *environment.Environment {
-	lg := log.Ctx(ctx)
-
-	result, err := cl.Do(ctx, state, func(ctx context.Context, environment *environment.Environment, s solver.Solver) error {
-		log.Ctx(ctx).Debug().Msg("bringing environment up")
-		return environment.Up(ctx, s)
-	})
-	if err != nil {
-		lg.Fatal().Err(err).Msg("failed to up environment")
-	}
-	return result
-}
-
 // FormatValue returns the String representation of the cue value
 func FormatValue(val *compiler.Value) string {
 	if val.HasAttr("artifact") {

cmd/dagger/cmd/compute.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -8,10 +9,11 @@ import (
 	"strings"
 
 	"cuelang.org/go/cue"
-	"go.dagger.io/dagger/client"
 	"go.dagger.io/dagger/cmd/dagger/cmd/common"
 	"go.dagger.io/dagger/cmd/dagger/logger"
 	"go.dagger.io/dagger/compiler"
+	"go.dagger.io/dagger/environment"
+	"go.dagger.io/dagger/solver"
 	"go.dagger.io/dagger/state"
 	"go.mozilla.org/sops/v3"
 	"go.mozilla.org/sops/v3/decrypt"
@@ -164,24 +166,34 @@ var computeCmd = &cobra.Command{
 			}
 		}
 
-		cl, err := client.New(ctx, "", false)
+		cl := common.NewClient(ctx, viper.GetBool("no-cache"))
+
+		err := cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
+			// check that all inputs are set
+			checkInputs(ctx, env)
+
+			if err := env.Up(ctx, s); err != nil {
+				return err
+			}
+
+			v := compiler.NewValue()
+			if err := v.FillPath(cue.MakePath(), env.Plan()); err != nil {
+				return err
+			}
+			if err := v.FillPath(cue.MakePath(), env.Input()); err != nil {
+				return err
+			}
+			if err := v.FillPath(cue.MakePath(), env.Computed()); err != nil {
+				return err
+			}
+
+			fmt.Println(v.JSON())
+			return nil
+		})
+
 		if err != nil {
-			lg.Fatal().Err(err).Msg("unable to create client")
+			lg.Fatal().Err(err).Msg("failed to up environment")
 		}
-		environment := common.EnvironmentUp(ctx, cl, st, viper.GetBool("no-cache"))
-
-		v := compiler.NewValue()
-		if err := v.FillPath(cue.MakePath(), environment.Plan()); err != nil {
-			lg.Fatal().Err(err).Msg("failed to merge")
-		}
-		if err := v.FillPath(cue.MakePath(), environment.Input()); err != nil {
-			lg.Fatal().Err(err).Msg("failed to merge")
-		}
-		if err := v.FillPath(cue.MakePath(), environment.Computed()); err != nil {
-			lg.Fatal().Err(err).Msg("failed to merge")
-		}
-
-		fmt.Println(v.JSON())
 	},
 }
 

cmd/dagger/cmd/edit.go

@@ -71,7 +71,7 @@ var editCmd = &cobra.Command{
 		st.Inputs = newState.Inputs
 
 		cl := common.NewClient(ctx, false)
-		_, err = cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
+		err = cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
 			// check for cue errors by scanning all the inputs
 			_, err := env.ScanInputs(ctx, true)
 			if err != nil {

cmd/dagger/cmd/input/list.go

@@ -45,7 +45,7 @@ var listCmd = &cobra.Command{
 			lg.Fatal().Err(err).Msg("unable to create client")
 		}
 
-		_, err = c.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
+		err = c.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
 			inputs, err := env.ScanInputs(ctx, false)
 			if err != nil {
 				return err

cmd/dagger/cmd/input/root.go

@@ -43,7 +43,7 @@ func updateEnvironmentInput(ctx context.Context, cl *client.Client, target strin
 
 	st.SetInput(target, input)
 
-	_, err := cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
+	err := cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
 		// the inputs are set, check for cue errors by scanning all the inputs
 		_, err := env.ScanInputs(ctx, true)
 		if err != nil {

cmd/dagger/cmd/output/list.go

@@ -6,12 +6,10 @@ import (
 	"os"
 	"text/tabwriter"
 
-	"go.dagger.io/dagger/client"
 	"go.dagger.io/dagger/cmd/dagger/cmd/common"
 	"go.dagger.io/dagger/cmd/dagger/logger"
 	"go.dagger.io/dagger/environment"
 	"go.dagger.io/dagger/solver"
-	"go.dagger.io/dagger/state"
 
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
@@ -36,51 +34,48 @@ var listCmd = &cobra.Command{
 		workspace := common.CurrentWorkspace(ctx)
 		st := common.CurrentEnvironmentState(ctx, workspace)
 
-		ListOutputs(ctx, st, true)
+		cl := common.NewClient(ctx, false)
+		err := cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
+			return ListOutputs(ctx, env, true)
+		})
+
+		if err != nil {
+			lg.Fatal().Err(err).Msg("failed to scan outputs")
+		}
 	},
 }
 
-func ListOutputs(ctx context.Context, st *state.State, isTTY bool) {
+func ListOutputs(ctx context.Context, env *environment.Environment, isTTY bool) error {
 	lg := log.Ctx(ctx).With().
-		Str("environment", st.Name).
+		Str("environment", env.Name()).
 		Logger()
 
-	c, err := client.New(ctx, "", false)
+	outputs, err := env.ScanOutputs(ctx)
 	if err != nil {
-		lg.Fatal().Err(err).Msg("unable to create client")
+		lg.Error().Err(err).Msg("failed to scan outputs")
+		return err
 	}
 
-	_, err = c.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
+	if !isTTY {
-		outputs, err := env.ScanOutputs(ctx)
-		if err != nil {
-			return err
-		}
-
-		if !isTTY {
-			for _, out := range outputs {
-				lg.Info().Str("name", out.Path().String()).
-					Str("value", fmt.Sprintf("%v", out.Cue())).
-					Msg("output")
-			}
-			return nil
-		}
-
-		w := tabwriter.NewWriter(os.Stdout, 0, 4, 2, ' ', 0)
-		fmt.Fprintln(w, "Output\tValue\tDescription")
-
 		for _, out := range outputs {
-			fmt.Fprintf(w, "%s\t%s\t%s\n",
+			lg.Info().Str("name", out.Path().String()).
-				out.Path(),
+				Str("value", fmt.Sprintf("%v", out.Cue())).
-				common.FormatValue(out),
+				Msg("output")
-				common.ValueDocOneLine(out),
-			)
 		}
-
-		w.Flush()
 		return nil
-	})
-
-	if err != nil {
-		lg.Fatal().Err(err).Msg("failed to query environment")
 	}
+
+	w := tabwriter.NewWriter(os.Stdout, 0, 4, 2, ' ', 0)
+	fmt.Fprintln(w, "Output\tValue\tDescription")
+
+	for _, out := range outputs {
+		fmt.Fprintf(w, "%s\t%s\t%s\n",
+			out.Path(),
+			common.FormatValue(out),
+			common.ValueDocOneLine(out),
+		)
+	}
+
+	w.Flush()
+	return nil
 }

cmd/dagger/cmd/query.go

@@ -1,13 +1,15 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 
 	"cuelang.org/go/cue"
-	"go.dagger.io/dagger/client"
 	"go.dagger.io/dagger/cmd/dagger/cmd/common"
 	"go.dagger.io/dagger/cmd/dagger/logger"
 	"go.dagger.io/dagger/compiler"
+	"go.dagger.io/dagger/environment"
+	"go.dagger.io/dagger/solver"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -42,28 +44,26 @@ var queryCmd = &cobra.Command{
 			cuePath = cue.ParsePath(args[0])
 		}
 
-		c, err := client.New(ctx, "", false)
+		cl := common.NewClient(ctx, false)
-		if err != nil {
-			lg.Fatal().Err(err).Msg("unable to create client")
-		}
-
-		environment, err := c.Do(ctx, state, nil)
-		if err != nil {
-			lg.Fatal().Err(err).Msg("failed to query environment")
-		}
-
 		cueVal := compiler.NewValue()
 
-		if !viper.GetBool("no-plan") {
+		err := cl.Do(ctx, state, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
-			if err := cueVal.FillPath(cue.MakePath(), environment.Plan()); err != nil {
+			if !viper.GetBool("no-plan") {
-				lg.Fatal().Err(err).Msg("failed to merge plan")
+				if err := cueVal.FillPath(cue.MakePath(), env.Plan()); err != nil {
+					return err
+				}
 			}
-		}
 
-		if !viper.GetBool("no-input") {
+			if !viper.GetBool("no-input") {
-			if err := cueVal.FillPath(cue.MakePath(), environment.Input()); err != nil {
+				if err := cueVal.FillPath(cue.MakePath(), env.Input()); err != nil {
-				lg.Fatal().Err(err).Msg("failed to merge plan with output")
+					return err
+				}
 			}
+			return nil
+		})
+
+		if err != nil {
+			lg.Fatal().Err(err).Msg("failed to query environment")
 		}
 
 		if !viper.GetBool("no-computed") && state.Computed != "" {

cmd/dagger/cmd/up.go

@@ -2,17 +2,16 @@ package cmd
 
 import (
 	"context"
+	"errors"
 	"os"
 
 	"cuelang.org/go/cue"
-	"go.dagger.io/dagger/client"
 	"go.dagger.io/dagger/cmd/dagger/cmd/common"
 	"go.dagger.io/dagger/cmd/dagger/cmd/output"
 	"go.dagger.io/dagger/cmd/dagger/logger"
 	"go.dagger.io/dagger/compiler"
 	"go.dagger.io/dagger/environment"
 	"go.dagger.io/dagger/solver"
-	"go.dagger.io/dagger/state"
 	"golang.org/x/term"
 
 	"github.com/rs/zerolog/log"
@@ -40,42 +39,45 @@ var upCmd = &cobra.Command{
 
 		cl := common.NewClient(ctx, viper.GetBool("no-cache"))
 
-		// check that all inputs are set
+		err := cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
-		checkInputs(ctx, cl, st)
+			// check that all inputs are set
+			if err := checkInputs(ctx, env); err != nil {
+				return err
+			}
 
-		result := common.EnvironmentUp(ctx, cl, st, viper.GetBool("no-cache"))
+			if err := env.Up(ctx, s); err != nil {
+				return err
+			}
 
-		st.Computed = result.Computed().JSON().PrettyString()
+			st.Computed = env.Computed().JSON().PrettyString()
-		if err := workspace.Save(ctx, st); err != nil {
+			if err := workspace.Save(ctx, st); err != nil {
-			lg.Fatal().Err(err).Msg("failed to update environment")
+				return err
+			}
+
+			return output.ListOutputs(ctx, env, term.IsTerminal(int(os.Stdout.Fd())))
+		})
+
+		if err != nil {
+			lg.Fatal().Err(err).Msg("failed to up environment")
 		}
-
-		output.ListOutputs(ctx, st, term.IsTerminal(int(os.Stdout.Fd())))
 	},
 }
 
-func checkInputs(ctx context.Context, cl *client.Client, st *state.State) {
+func checkInputs(ctx context.Context, env *environment.Environment) error {
 	lg := log.Ctx(ctx)
 	warnOnly := viper.GetBool("force")
 
 	notConcreteInputs := []*compiler.Value{}
-	_, err := cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
+	inputs, err := env.ScanInputs(ctx, true)
-		inputs, err := env.ScanInputs(ctx, true)
-		if err != nil {
-			return err
-		}
-
-		for _, i := range inputs {
-			if i.IsConcreteR(cue.Optional(true)) != nil {
-				notConcreteInputs = append(notConcreteInputs, i)
-			}
-		}
-
-		return nil
-	})
-
 	if err != nil {
-		lg.Fatal().Err(err).Msg("failed to query environment")
+		lg.Error().Err(err).Msg("failed to scan inputs")
+		return err
+	}
+
+	for _, i := range inputs {
+		if i.IsConcreteR(cue.Optional(true)) != nil {
+			notConcreteInputs = append(notConcreteInputs, i)
+		}
 	}
 
 	for _, i := range notConcreteInputs {
@@ -87,8 +89,10 @@ func checkInputs(ctx context.Context, cl *client.Client, st *state.State) {
 	}
 
 	if !warnOnly && len(notConcreteInputs) > 0 {
-		lg.Fatal().Int("missing", len(notConcreteInputs)).Msg("some required inputs are not set, please re-run with `--force` if you think it's a mistake")
+		return errors.New("some required inputs are not set, please re-run with `--force` if you think it's a mistake")
 	}
+
+	return nil
 }
 
 func init() {