kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge branch 'main' into package-manager

Browse Source
This commit is contained in:
Tihomir Jovicic
2021-08-23 06:37:47 +02:00
parent a3d2f72ea3 6a73f1de80
commit 85e870f8dd
57 changed files with 1264 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/dagger/cmd/common/common.go
View File

@@ -5,6 +5,7 @@ import (
"fmt"
"strings"
"github.com/docker/buildx/util/buildflags"
"github.com/rs/zerolog/log"
"github.com/spf13/viper"
"go.dagger.io/dagger/client"
@@ -145,10 +146,23 @@ func ValueDocOneLine(val *compiler.Value) string {
}
// NewClient creates a new client
func NewClient(ctx context.Context, noCache bool) *client.Client {
func NewClient(ctx context.Context) *client.Client {
lg := log.Ctx(ctx)
cl, err := client.New(ctx, "", noCache)
cacheExports, err := buildflags.ParseCacheEntry(viper.GetStringSlice("cache-to"))
if err != nil {
lg.Fatal().Err(err).Msg("unable to parse --export-cache options")
}
cacheImports, err := buildflags.ParseCacheEntry(viper.GetStringSlice("cache-fron"))
if err != nil {
lg.Fatal().Err(err).Msg("unable to parse --import-cache options")
}
cl, err := client.New(ctx, "", client.Config{
CacheExports: cacheExports,
CacheImports: cacheImports,
NoCache: viper.GetBool("no-cache"),
})
if err != nil {
lg.Fatal().Err(err).Msg("unable to create client")
}

30
cmd/dagger/cmd/compute.go
View File

@@ -168,9 +168,27 @@ var computeCmd = &cobra.Command{
}
}
cl := common.NewClient(ctx, viper.GetBool("no-cache"))
cl := common.NewClient(ctx)
err := cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
v := compiler.NewValue()
plan, err := st.CompilePlan(ctx)
if err != nil {
lg.Fatal().Err(err).Msg("failed to compile plan")
}
if err := v.FillPath(cue.MakePath(), plan); err != nil {
lg.Fatal().Err(err).Msg("failed to compile plan")
}
inputs, err := st.CompileInputs()
if err != nil {
lg.Fatal().Err(err).Msg("failed to compile inputs")
}
if err := v.FillPath(cue.MakePath(), inputs); err != nil {
lg.Fatal().Err(err).Msg("failed to compile inputs")
}
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)
@@ -178,13 +196,6 @@ var computeCmd = &cobra.Command{
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
}
@@ -208,7 +219,6 @@ func init() {
computeCmd.Flags().StringSlice("input-git", []string{}, "TARGET=REMOTE#REF")
computeCmd.Flags().String("input-json", "", "JSON")
computeCmd.Flags().String("input-yaml", "", "YAML")
computeCmd.Flags().Bool("no-cache", false, "disable cache")
if err := viper.BindPFlags(computeCmd.Flags()); err != nil {
panic(err)

2
cmd/dagger/cmd/doc.go
View File

@@ -318,7 +318,7 @@ func loadCode(packageName string) (*compiler.Value, error) {
stdlib.Path: stdlib.FS,
}
src, err := compiler.Build(sources, packageName)
src, err := compiler.Build("/config", sources, packageName)
if err != nil {
return nil, err
}

2
cmd/dagger/cmd/edit.go
View File

@@ -76,7 +76,7 @@ var editCmd = &cobra.Command{
st.Plan = newState.Plan
st.Inputs = newState.Inputs
cl := common.NewClient(ctx, false)
cl := common.NewClient(ctx)
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)

17
cmd/dagger/cmd/input/list.go
View File

@@ -6,7 +6,6 @@ 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/compiler"
@@ -42,12 +41,8 @@ var listCmd = &cobra.Command{
doneCh := common.TrackWorkspaceCommand(ctx, cmd, workspace, st)
c, err := client.New(ctx, "", false)
if err != nil {
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 {
c := common.NewClient(ctx)
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
@@ -67,6 +62,13 @@ var listCmd = &cobra.Command{
}
}
if !viper.GetBool("show-optional") && !viper.GetBool("all") {
// skip input if there is already a default value
if hasDefault {
continue
}
}
fmt.Fprintf(w, "%s\t%s\t%t\t%s\n",
inp.Path(),
common.FormatValue(inp),
@@ -100,6 +102,7 @@ func isUserSet(env *state.State, val *compiler.Value) bool {
func init() {
listCmd.Flags().BoolP("all", "a", false, "List all inputs (include non-overridable)")
listCmd.Flags().Bool("show-optional", false, "List optional inputs (those with default values)")
if err := viper.BindPFlags(listCmd.Flags()); err != nil {
panic(err)

2
cmd/dagger/cmd/input/root.go
View File

@@ -50,7 +50,7 @@ func updateEnvironmentInput(ctx context.Context, cmd *cobra.Command, target stri
Value: target,
})
cl := common.NewClient(ctx, false)
cl := common.NewClient(ctx)
st.SetInput(target, input)

2
cmd/dagger/cmd/output/list.go
View File

@@ -40,7 +40,7 @@ var listCmd = &cobra.Command{
doneCh := common.TrackWorkspaceCommand(ctx, cmd, workspace, st)
cl := common.NewClient(ctx, false)
cl := common.NewClient(ctx)
err := cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
return ListOutputs(ctx, env, true)
})

40
cmd/dagger/cmd/query.go
View File

@@ -1,15 +1,12 @@
package cmd
import (
"context"
"fmt"
"cuelang.org/go/cue"
"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"
@@ -45,28 +42,27 @@ var queryCmd = &cobra.Command{
doneCh := common.TrackWorkspaceCommand(ctx, cmd, workspace, state)
cl := common.NewClient(ctx, false)
cueVal := compiler.NewValue()
err := cl.Do(ctx, state, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
if !viper.GetBool("no-plan") {
if err := cueVal.FillPath(cue.MakePath(), env.Plan()); err != nil {
return err
}
if !viper.GetBool("no-plan") {
plan, err := state.CompilePlan(ctx)
if err != nil {
lg.Fatal().Err(err).Msg("failed to compile plan")
}
if err := cueVal.FillPath(cue.MakePath(), plan); err != nil {
lg.Fatal().Err(err).Msg("failed to compile plan")
}
}
if !viper.GetBool("no-input") {
inputs, err := state.CompileInputs()
if err != nil {
lg.Fatal().Err(err).Msg("failed to compile inputs")
}
if !viper.GetBool("no-input") {
if err := cueVal.FillPath(cue.MakePath(), env.Input()); err != nil {
return err
}
if err := cueVal.FillPath(cue.MakePath(), inputs); err != nil {
lg.Fatal().Err(err).Msg("failed to compile inputs")
}
return nil
})
<-doneCh
if err != nil {
lg.Fatal().Err(err).Msg("failed to query environment")
}
if !viper.GetBool("no-computed") && state.Computed != "" {
@@ -79,6 +75,8 @@ var queryCmd = &cobra.Command{
}
}
<-doneCh
cueVal = cueVal.LookupPath(cuePath)
if viper.GetBool("concrete") {
@@ -98,7 +96,7 @@ var queryCmd = &cobra.Command{
case "json":
fmt.Println(cueVal.JSON().PrettyString())
case "yaml":
lg.Fatal().Err(err).Msg("yaml format not yet implemented")
lg.Fatal().Msg("yaml format not yet implemented")
case "text":
out, err := cueVal.String()
if err != nil {

7
cmd/dagger/cmd/root.go
View File

@@ -26,6 +26,13 @@ var rootCmd = &cobra.Command{
func init() {
rootCmd.PersistentFlags().String("log-format", "", "Log format (json, pretty). Defaults to json if the terminal is not a tty")
rootCmd.PersistentFlags().StringP("log-level", "l", "info", "Log level")
rootCmd.PersistentFlags().Bool("no-cache", false, "Disable caching")
rootCmd.PersistentFlags().StringArray("cache-to", []string{},
"Cache export destinations (eg. user/app:cache, type=local,dest=path/to/dir)")
rootCmd.PersistentFlags().StringArray("cache-from", []string{},
"External cache sources (eg. user/app:cache, type=local,src=path/to/dir)")
rootCmd.PersistentFlags().StringP("environment", "e", "", "Select an environment")
rootCmd.PersistentFlags().StringP("workspace", "w", "", "Specify a workspace (defaults to current git repository)")

3
cmd/dagger/cmd/up.go
View File

@@ -43,7 +43,7 @@ var upCmd = &cobra.Command{
doneCh := common.TrackWorkspaceCommand(ctx, cmd, workspace, st)
cl := common.NewClient(ctx, viper.GetBool("no-cache"))
cl := common.NewClient(ctx)
err := cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
// check that all inputs are set
@@ -104,7 +104,6 @@ func checkInputs(ctx context.Context, env *environment.Environment) error {
}
func init() {
upCmd.Flags().Bool("no-cache", false, "Disable all run cache")
upCmd.Flags().BoolP("force", "f", false, "Force up, disable inputs check")
if err := viper.BindPFlags(upCmd.Flags()); err != nil {

4
cmd/dagger/cmd/version.go
View File

@@ -59,10 +59,6 @@ var versionCmd = &cobra.Command{
func init() {
versionCmd.Flags().Bool("check", false, "check if dagger is up to date")
versionCmd.InheritedFlags().MarkHidden("environment")
versionCmd.InheritedFlags().MarkHidden("log-level")
versionCmd.InheritedFlags().MarkHidden("log-format")
if err := viper.BindPFlags(versionCmd.Flags()); err != nil {
panic(err)
}