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

cmd/up: show outputs at the end of the config execution

Browse Source 
Signed-off-by: Sam Alba <sam.alba@gmail.com>
This commit is contained in:
Sam Alba 2021-05-31 16:14:57 +02:00
parent 44a919e7f8
commit d6b6142065
2 changed files with 56 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,9 @@ import (
"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"
"github.com/spf13/viper"
)
@ -35,56 +37,60 @@ var listCmd = &cobra.Command{
workspace := common.CurrentWorkspace(ctx)
st := common.CurrentEnvironmentState(ctx, workspace)
lg = lg.With().
Str("environment", st.Name).
Logger()
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 {
outputs, err := env.ScanOutputs(ctx)
if err != nil {
return err
}
w := tabwriter.NewWriter(os.Stdout, 0, 4, 2, ' ', 0)
fmt.Fprintln(w, "Output\tType\tValue\tDescription")
for _, out := range outputs {
valStr := "-"
if out.IsConcreteR() == nil {
valStr, err = out.Cue().String()
if err != nil {
return err
}
} else if !viper.GetBool("all") {
continue
}
valStr = strings.ReplaceAll(valStr, "\n", "\\n")
fmt.Fprintf(w, "%s\t%s\t%s\t%s\n",
out.Path(),
common.ValueType(out),
valStr,
common.ValueDocString(out),
)
}
w.Flush()
return nil
})
if err != nil {
lg.Fatal().Err(err).Msg("failed to query environment")
}
ListOutputs(ctx, st, viper.GetBool("all"))
},
}
func ListOutputs(ctx context.Context, st *state.State, all bool) {
lg := log.Ctx(ctx).With().
Str("environment", st.Name).
Logger()
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 {
outputs, err := env.ScanOutputs(ctx)
if err != nil {
return err
}
w := tabwriter.NewWriter(os.Stdout, 0, 4, 2, ' ', 0)
fmt.Fprintln(w, "Output\tType\tValue\tDescription")
for _, out := range outputs {
valStr := "-"
if out.IsConcreteR() == nil {
valStr, err = out.Cue().String()
if err != nil {
return err
}
} else if !all {
continue
}
valStr = strings.ReplaceAll(valStr, "\n", "\\n")
fmt.Fprintf(w, "%s\t%s\t%s\t%s\n",
out.Path(),
common.ValueType(out),
valStr,
common.ValueDocString(out),
)
}
w.Flush()
return nil
})
if err != nil {
lg.Fatal().Err(err).Msg("failed to query environment")
}
}
func init() {
listCmd.Flags().BoolP("all", "a", false, "List all outputs (include non-concrete)")

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

@ -7,6 +7,7 @@ import (
"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"
@ -46,6 +47,8 @@ var upCmd = &cobra.Command{
if err := workspace.Save(ctx, st); err != nil {
lg.Fatal().Err(err).Msg("failed to update environment")
}
output.ListOutputs(ctx, st, false)
},
}