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

Merge pull request #1279 from aluzzardi/europa-output

Browse Source 
europa: up: support --output
This commit is contained in:
Sam Alba 2021-12-21 09:48:04 -08:00 committed by GitHub
commit f3caa342e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,10 +148,23 @@ func europaUp(ctx context.Context, cl *client.Client, args ...string) error {
}
return cl.Do(ctx, p.Context(), func(ctx context.Context, s solver.Solver) error {
if err := p.Up(ctx, s); err != nil {
computed, err := p.Up(ctx, s)
if err != nil {
return err
}
if output := viper.GetString("output"); output != "" {
data := computed.JSON().PrettyString()
if output == "-" {
fmt.Println(data)
return nil
}
err := os.WriteFile(output, []byte(data), 0600)
if err != nil {
lg.Fatal().Err(err).Str("path", output).Msg("failed to write output")
}
}
return nil
})
}
@ -206,6 +219,7 @@ func checkInputs(ctx context.Context, env *environment.Environment) error {
func init() {
upCmd.Flags().BoolP("force", "f", false, "Force up, disable inputs check")
upCmd.Flags().String("output", "", "Write computed output. Prints on stdout if set to-")
if err := viper.BindPFlags(upCmd.Flags()); err != nil {
panic(err)

8
plan/plan.go
View File

@ -86,7 +86,7 @@ func (p *Plan) registerLocalDirs() error {
}
// Up executes the plan
func (p *Plan) Up(ctx context.Context, s solver.Solver) error {
func (p *Plan) Up(ctx context.Context, s solver.Solver) (*compiler.Value, error) {
ctx, span := otel.Tracer("dagger").Start(ctx, "plan.Up")
defer span.End()
@ -98,7 +98,7 @@ func (p *Plan) Up(ctx context.Context, s solver.Solver) error {
newRunner(p.context, s, computed),
)
if err := flow.Run(ctx); err != nil {
return err
return nil, err
}
if src, err := computed.Source(); err == nil {
@ -109,9 +109,9 @@ func (p *Plan) Up(ctx context.Context, s solver.Solver) error {
// Check explicitly if the context is canceled.
select {
case <-ctx.Done():
return ctx.Err()
return nil, ctx.Err()
default:
return nil
return computed, nil
}
}