refactored to handle errors better
Signed-off-by: Richard Jones <richard@dagger.io>
This commit is contained in:
parent
ceb1827526
commit
e65b3cfa4a
@ -19,8 +19,23 @@ type serviceTask struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c serviceTask) Run(ctx context.Context, pctx *plancontext.Context, s solver.Solver, v *compiler.Value) (*compiler.Value, error) {
|
func (c serviceTask) Run(ctx context.Context, pctx *plancontext.Context, s solver.Solver, v *compiler.Value) (*compiler.Value, error) {
|
||||||
unix, _ := v.LookupPath(cue.ParsePath("unix")).String()
|
var unix, npipe string
|
||||||
npipe, _ := v.LookupPath(cue.ParsePath("npipe")).String()
|
var stringErr error
|
||||||
|
|
||||||
|
unixV := v.Lookup("unix")
|
||||||
|
npipeV := v.Lookup("npipe")
|
||||||
|
|
||||||
|
if unixV.Exists() && unixV.IsConcrete() {
|
||||||
|
unix, stringErr = unixV.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
if npipeV.Exists() && npipeV.IsConcrete() {
|
||||||
|
npipe, stringErr = npipeV.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
if stringErr != nil {
|
||||||
|
return nil, stringErr
|
||||||
|
}
|
||||||
|
|
||||||
if unix == "" && npipe == "" {
|
if unix == "" && npipe == "" {
|
||||||
return nil, errors.New("invalid service")
|
return nil, errors.New("invalid service")
|
||||||
|
Reference in New Issue
Block a user