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

environment inputs scanning can now scan including the user inputs with the plan

Browse Source 
Signed-off-by: Sam Alba <sam.alba@gmail.com>
This commit is contained in:
Sam Alba 2021-05-27 18:45:24 +02:00
parent 894976e824
commit eba35e285b
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
environment/environment.go
View File

@ -165,9 +165,9 @@ func (e *Environment) LocalDirs() map[string]string {
return dirs return dirs
} }
// Up missing values in environment configuration, and write them to state. // prepare initializes the Environment with inputs and plan code
func (e *Environment) Up(ctx context.Context, s solver.Solver) error { func (e *Environment) prepare(ctx context.Context) (*compiler.Value, error) {
span, ctx := opentracing.StartSpanFromContext(ctx, "environment.Up") span, _ := opentracing.StartSpanFromContext(ctx, "environment.Prepare")
defer span.Finish() defer span.Finish()
// Reset the computed values // Reset the computed values
@ -175,9 +175,23 @@ func (e *Environment) Up(ctx context.Context, s solver.Solver) error {
src := compiler.NewValue() src := compiler.NewValue()
if err := src.FillPath(cue.MakePath(), e.plan); err != nil { if err := src.FillPath(cue.MakePath(), e.plan); err != nil {
return err return nil, err
} }
if err := src.FillPath(cue.MakePath(), e.input); err != nil { if err := src.FillPath(cue.MakePath(), e.input); err != nil {
return nil, err
}
return src, nil
}
// Up missing values in environment configuration, and write them to state.
func (e *Environment) Up(ctx context.Context, s solver.Solver) error {
span, ctx := opentracing.StartSpanFromContext(ctx, "environment.Up")
defer span.Finish()
// Set user inputs and plan code
src, err := e.prepare(ctx)
if err != nil {
return err return err
} }
@ -294,6 +308,17 @@ func newPipelineRunner(computed *compiler.Value, s solver.Solver) cueflow.Runner
}) })
} }
func (e *Environment) ScanInputs(ctx context.Context) []*compiler.Value { func (e *Environment) ScanInputs(ctx context.Context, mergeUserInputs bool) ([]*compiler.Value, error) {
return scanInputs(ctx, e.plan) src := e.plan
if mergeUserInputs {
// Set user inputs and plan code
var err error
src, err = e.prepare(ctx)
if err != nil {
return nil, err
}
}
return scanInputs(ctx, src), nil
} }