implemented services unix and npipe complete with test
Signed-off-by: Richard Jones <richard@dagger.io>
This commit is contained in:
parent
ba984c4d03
commit
2569e76eeb
45
plan/task/service.go
Normal file
45
plan/task/service.go
Normal file
@ -0,0 +1,45 @@
|
||||
package task
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
|
||||
"cuelang.org/go/cue"
|
||||
"github.com/rs/zerolog/log"
|
||||
"go.dagger.io/dagger/compiler"
|
||||
"go.dagger.io/dagger/plancontext"
|
||||
"go.dagger.io/dagger/solver"
|
||||
)
|
||||
|
||||
func init() {
|
||||
Register("Service", func() Task { return &serviceTask{} })
|
||||
}
|
||||
|
||||
type serviceTask struct {
|
||||
}
|
||||
|
||||
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()
|
||||
npipe, _ := v.LookupPath(cue.ParsePath("npipe")).String()
|
||||
|
||||
if unix == "" && npipe == "" {
|
||||
return nil, errors.New("invalid service")
|
||||
}
|
||||
|
||||
lg := log.Ctx(ctx).Debug()
|
||||
|
||||
if unix != "" {
|
||||
lg.Str("unix", unix)
|
||||
} else if npipe != "" {
|
||||
lg.Str("npipe", npipe)
|
||||
}
|
||||
|
||||
lg.Msg("loading service")
|
||||
|
||||
service := pctx.Services.New(unix, npipe)
|
||||
out := compiler.NewValue()
|
||||
if err := out.FillPath(cue.ParsePath("service"), service.MarshalCUE()); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
@ -38,4 +38,14 @@ package engine
|
||||
envvar: string
|
||||
}
|
||||
}
|
||||
|
||||
services: [string]: {
|
||||
service: #Service
|
||||
_type: "Service"
|
||||
{
|
||||
unix: string
|
||||
} | {
|
||||
npipe: string
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -7,6 +7,12 @@ setup() {
|
||||
@test "plan: hello" {
|
||||
# Europa loader handles the cwd differently, therefore we need to CD into the tree at or below the parent of cue.mod
|
||||
cd "$TESTDIR"
|
||||
run "$DAGGER" --europa up ./plan/hello-europa
|
||||
assert_success
|
||||
"$DAGGER" --europa up ./plan/hello-europa
|
||||
}
|
||||
|
||||
@test "plan: unix socket" {
|
||||
cd "$TESTDIR"
|
||||
"$DAGGER" --europa up ./plan/hello-europa
|
||||
run curl http://localhost:8080
|
||||
assert_output --partial "<title>Hello World</title>"
|
||||
}
|
16
tests/plan/context/services/unix/main.cue
Normal file
16
tests/plan/context/services/unix/main.cue
Normal file
@ -0,0 +1,16 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"alpha.dagger.io/dagger/engine"
|
||||
"alpha.dagger.io/docker"
|
||||
)
|
||||
|
||||
engine.#Plan & {
|
||||
context: services: dockerSocket: unix: "/var/run/docker.sock"
|
||||
actions: nginx: docker.#Run & {
|
||||
ref: "nginxdemos/nginx-hello"
|
||||
name: "nginx-hello"
|
||||
ports: ["8080:8080"]
|
||||
socket: context.services.dockerSocket.service
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user