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

cmd/up: disable output list when not a tty + better error handling

Browse Source 
Signed-off-by: Sam Alba <sam.alba@gmail.com>
This commit is contained in:
Sam Alba 2021-05-31 18:09:14 +02:00
parent 571b5c8618
commit efb4ee209e
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,10 @@ func ListOutputs(ctx context.Context, st *state.State, all bool) {
Str("environment", st.Name). Str("environment", st.Name).
Logger() Logger()
if st.Computed == "" {
lg.Fatal().Msg("cannot list environment outputs: please run `dagger up` first")
}
c, err := client.New(ctx, "", false) c, err := client.New(ctx, "", false)
if err != nil { if err != nil {
lg.Fatal().Err(err).Msg("unable to create client") lg.Fatal().Err(err).Msg("unable to create client")
@ -87,7 +91,7 @@ func ListOutputs(ctx context.Context, st *state.State, all bool) {
}) })
if err != nil { if err != nil {
lg.Warn().Err(err).Msg("failed to query environment") lg.Fatal().Err(err).Msg("failed to query environment")
} }
} }

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

@ -48,6 +48,11 @@ var upCmd = &cobra.Command{
lg.Fatal().Err(err).Msg("failed to update environment") lg.Fatal().Err(err).Msg("failed to update environment")
} }
if !term.IsTerminal(int(os.Stdout.Fd())) {
lg.Debug().Msg("not a tty, output list disabled")
return
}
output.ListOutputs(ctx, st, false) output.ListOutputs(ctx, st, false)
}, },
} }

2
environment/environment.go
View File

@ -326,7 +326,7 @@ func (e *Environment) ScanInputs(ctx context.Context, mergeUserInputs bool) ([]*
func (e *Environment) ScanOutputs(ctx context.Context) ([]*compiler.Value, error) { func (e *Environment) ScanOutputs(ctx context.Context) ([]*compiler.Value, error) {
if e.state.Computed == "" { if e.state.Computed == "" {
return nil, errors.New("cannot query environment outputs: please run `dagger up` first") return nil, errors.New("environment has been computed yet")
} }
src, err := e.prepare(ctx) src, err := e.prepare(ctx)