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

environments only ignore the compute layer if it is empty instead of logging a fatal error

Browse Source 
Signed-off-by: Sam Alba <sam.alba@gmail.com>
This commit is contained in:
Sam Alba 2021-06-01 14:14:45 +02:00
parent 10d1b01f2a
commit 06a515f496
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
environment/environment.go
View File

@ -2,7 +2,6 @@ package environment
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"io/fs" "io/fs"
"strings" "strings"
@ -325,15 +324,12 @@ 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 == "" {
return nil, errors.New("environment has been computed yet")
}
src, err := e.prepare(ctx) src, err := e.prepare(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if e.state.Computed != "" {
computed, err := compiler.DecodeJSON("", []byte(e.state.Computed)) computed, err := compiler.DecodeJSON("", []byte(e.state.Computed))
if err != nil { if err != nil {
return nil, err return nil, err
@ -342,6 +338,7 @@ func (e *Environment) ScanOutputs(ctx context.Context) ([]*compiler.Value, error
if err := src.FillPath(cue.MakePath(), computed); err != nil { if err := src.FillPath(cue.MakePath(), computed); err != nil {
return nil, err return nil, err
} }
}
return scanOutputs(ctx, src), nil return scanOutputs(ctx, src), nil
} }