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

compiler: fix data race issue

Browse Source 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2021-04-08 16:30:55 -07:00
parent e54f1b0c3a
commit b4c530653c
2 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dagger/compiler/compiler.go
View File

@ -2,6 +2,7 @@ package compiler
import ( import (
"errors" "errors"
"fmt"
"sync" "sync"
"cuelang.org/go/cue" "cuelang.org/go/cue"
@ -28,6 +29,10 @@ func Wrap(v cue.Value, inst *cue.Instance) *Value {
return DefaultCompiler.Wrap(v, inst) return DefaultCompiler.Wrap(v, inst)
} }
func InstanceMerge(src ...interface{}) (*Value, error) {
return DefaultCompiler.InstanceMerge(src...)
}
func Cue() *cue.Runtime { func Cue() *cue.Runtime {
return DefaultCompiler.Cue() return DefaultCompiler.Cue()
} }
@ -74,12 +79,7 @@ func (c *Compiler) Cue() *cue.Runtime {
// Compile an empty value // Compile an empty value
func (c *Compiler) NewValue() *Value { func (c *Compiler) NewValue() *Value {
empty, err := c.Compile("", ` empty, err := c.Compile("", "_")
{
...
_
}
`)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -98,6 +98,40 @@ func (c *Compiler) Compile(name string, src interface{}) (*Value, error) {
return c.Wrap(inst.Value(), inst), nil return c.Wrap(inst.Value(), inst), nil
} }
// InstanceMerge merges multiple values and mirrors the value in the cue.Instance.
// FIXME: AVOID THIS AT ALL COST
// Special case: we must return an instance with the same
// contents as v, for the purposes of cueflow.
func (c *Compiler) InstanceMerge(src ...interface{}) (*Value, error) {
var (
v = c.NewValue()
inst = v.CueInst()
err error
)
c.lock()
defer c.unlock()
for _, s := range src {
// If calling Fill() with a Value, we want to use the underlying
// cue.Value to fill.
if val, ok := s.(*Value); ok {
inst, err = inst.Fill(val.val)
if err != nil {
return nil, fmt.Errorf("merge failed: %w", err)
}
} else {
inst, err = inst.Fill(s)
if err != nil {
return nil, fmt.Errorf("merge failed: %w", err)
}
}
}
v = c.Wrap(inst.Value(), inst)
return v, nil
}
func (c *Compiler) DecodeJSON(path string, data []byte) (*Value, error) { func (c *Compiler) DecodeJSON(path string, data []byte) (*Value, error) {
inst, err := cuejson.Decode(c.Cue(), path, data) inst, err := cuejson.Decode(c.Cue(), path, data)
if err != nil { if err != nil {

29
dagger/result.go
View File

@ -52,32 +52,11 @@ func (r *DeploymentResult) Computed() *compiler.Value {
} }
func (r *DeploymentResult) Merge() (*compiler.Value, error) { func (r *DeploymentResult) Merge() (*compiler.Value, error) {
// FIXME: v.CueInst() must return an instance with the same return compiler.InstanceMerge(
// contents as v, for the purposes of cueflow. r.plan,
// That is not currently how *compiler.Value works, so we prepare the cue r.input,
// instance manually. r.computed,
// --> refactor the compiler.Value API to do this for us.
var (
v = compiler.NewValue()
inst = v.CueInst()
err error
) )
inst, err = inst.Fill(r.plan.Cue())
if err != nil {
return nil, fmt.Errorf("merge plan: %w", err)
}
inst, err = inst.Fill(r.input.Cue())
if err != nil {
return nil, fmt.Errorf("merge input: %w", err)
}
inst, err = inst.Fill(r.computed.Cue())
if err != nil {
return nil, fmt.Errorf("merge computed: %w", err)
}
v = compiler.Wrap(inst.Value(), inst)
return v, nil
} }
func (r *DeploymentResult) ToLLB() (llb.State, error) { func (r *DeploymentResult) ToLLB() (llb.State, error) {