Remove path based task lookup
Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
This commit is contained in:
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"cuelang.org/go/cue"
|
||||
@@ -21,10 +20,6 @@ var (
|
||||
cue.Str("$dagger"),
|
||||
cue.Str("task"),
|
||||
cue.Hid("_name", pkg.DaggerPackage))
|
||||
lookups = []LookupFunc{
|
||||
defaultLookup,
|
||||
pathLookup,
|
||||
}
|
||||
)
|
||||
|
||||
// State is the state of the task.
|
||||
@@ -38,7 +33,6 @@ const (
|
||||
)
|
||||
|
||||
type NewFunc func() Task
|
||||
type LookupFunc func(*compiler.Value) (Task, error)
|
||||
|
||||
type Task interface {
|
||||
Run(ctx context.Context, pctx *plancontext.Context, s solver.Solver, v *compiler.Value) (*compiler.Value, error)
|
||||
@@ -66,26 +60,13 @@ func New(typ string) Task {
|
||||
}
|
||||
|
||||
func Lookup(v *compiler.Value) (Task, error) {
|
||||
for _, lookup := range lookups {
|
||||
t, err := lookup(v)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if t != nil {
|
||||
return t, nil
|
||||
}
|
||||
}
|
||||
return nil, ErrNotTask
|
||||
}
|
||||
|
||||
func defaultLookup(v *compiler.Value) (Task, error) {
|
||||
if v.Kind() != cue.StructKind {
|
||||
return nil, nil
|
||||
return nil, ErrNotTask
|
||||
}
|
||||
|
||||
typ := v.LookupPath(typePath)
|
||||
if !typ.Exists() {
|
||||
return nil, nil
|
||||
return nil, ErrNotTask
|
||||
}
|
||||
|
||||
typeString, err := typ.String()
|
||||
@@ -100,46 +81,3 @@ func defaultLookup(v *compiler.Value) (Task, error) {
|
||||
|
||||
return t, nil
|
||||
}
|
||||
|
||||
func pathLookup(v *compiler.Value) (Task, error) {
|
||||
selectors := v.Path().Selectors()
|
||||
|
||||
// The `actions` field won't have any path based tasks since it's in user land
|
||||
if len(selectors) == 0 || selectors[0].String() == "actions" {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
// Try an exact match first
|
||||
if t := New(v.Path().String()); t != nil {
|
||||
return t, nil
|
||||
}
|
||||
|
||||
// FIXME: is there a way to avoid having to loop here?
|
||||
var t Task
|
||||
tasks.Range(func(key, value interface{}) bool {
|
||||
if matchPathMask(selectors, key.(string)) {
|
||||
fn := value.(NewFunc)
|
||||
t = fn()
|
||||
return false
|
||||
}
|
||||
return true
|
||||
})
|
||||
return t, nil
|
||||
}
|
||||
|
||||
func matchPathMask(sels []cue.Selector, mask string) bool {
|
||||
parts := strings.Split(mask, ".")
|
||||
if len(sels) != len(parts) {
|
||||
return false
|
||||
}
|
||||
for i, sel := range sels {
|
||||
// use a '*' in a path mask part to match any selector
|
||||
if parts[i] == "*" {
|
||||
continue
|
||||
}
|
||||
if sel.String() != parts[i] {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
Reference in New Issue
Block a user