Merge pull request #1263 from jlongtine/engine-copy

engine.#Copy
This commit is contained in:
Joel Longtine 2021-12-20 13:09:32 -07:00 committed by GitHub
commit 4a42513ca2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 232 additions and 1 deletions

83
plan/task/copy.go Normal file
View File

@ -0,0 +1,83 @@
package task
import (
"context"
"github.com/moby/buildkit/client/llb"
"go.dagger.io/dagger/compiler"
"go.dagger.io/dagger/plancontext"
"go.dagger.io/dagger/solver"
)
func init() {
Register("Copy", func() Task { return &copyTask{} })
}
type copyTask struct {
}
func (t *copyTask) Run(ctx context.Context, pctx *plancontext.Context, s solver.Solver, v *compiler.Value) (*compiler.Value, error) {
var err error
input, err := pctx.FS.FromValue(v.Lookup("input"))
if err != nil {
return nil, err
}
inputState, err := input.Result().ToState()
if err != nil {
return nil, err
}
sourceRoot, err := pctx.FS.FromValue(v.Lookup("source.root"))
if err != nil {
return nil, err
}
sourceState, err := sourceRoot.Result().ToState()
if err != nil {
return nil, err
}
sourcePath, err := v.Lookup("source.path").String()
if err != nil {
return nil, err
}
destPath, err := v.Lookup("dest").String()
if err != nil {
return nil, err
}
outputState := inputState.File(
llb.Copy(
sourceState,
sourcePath,
destPath,
// FIXME: allow more configurable llb options
// For now we define the following convenience presets:
&llb.CopyInfo{
CopyDirContentsOnly: true,
CreateDestPath: true,
AllowWildcard: true,
},
),
withCustomName(v, "Copy %s %s", sourcePath, destPath),
)
result, err := s.Solve(ctx, outputState, pctx.Platform.Get())
if err != nil {
return nil, err
}
fs := pctx.FS.New(result)
return compiler.NewValue().FillFields(map[string]interface{}{
"output": fs.MarshalCUE(),
})
}

View File

@ -59,7 +59,6 @@ package engine
// Copy files from one FS tree to another
#Copy: {
@dagger(notimplemented)
$dagger: task: _name: "Copy"
input: #FS

View File

@ -46,3 +46,12 @@ setup() {
"$DAGGER" --europa up ./user.cue
"$DAGGER" --europa up ./workdir.cue
}
@test "task: #Copy" {
cd "$TESTDIR"/tasks/copy
"$DAGGER" --europa up ./copy_exec.cue
"$DAGGER" --europa up ./copy_file.cue
run "$DAGGER" --europa up ./copy_exec_invalid.cue
assert_failure
}

View File

@ -0,0 +1,47 @@
package main
import (
"alpha.dagger.io/europa/dagger/engine"
)
engine.#Plan & {
actions: {
image: engine.#Pull & {
source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
}
exec: engine.#Exec & {
input: image.output
args: [
"sh", "-c",
#"""
echo -n hello world > /output.txt
"""#,
]
}
verify_file: engine.#ReadFile & {
input: exec.output
path: "/output.txt"
} & {
// assert result
contents: "hello world"
}
copy: engine.#Copy & {
input: image.output
source: {
root: exec.output
path: "/output.txt"
}
dest: "/output.txt"
}
verify_copy: engine.#ReadFile & {
input: copy.output
path: "/output.txt"
} & {
// assert result
contents: "hello world"
}
}
}

View File

@ -0,0 +1,47 @@
package main
import (
"alpha.dagger.io/europa/dagger/engine"
)
engine.#Plan & {
actions: {
image: engine.#Pull & {
source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
}
exec: engine.#Exec & {
input: image.output
args: [
"sh", "-c",
#"""
echo -n hello world from dagger > /output.txt
"""#,
]
}
verify_file: engine.#ReadFile & {
input: exec.output
path: "/output.txt"
} & {
// assert result
contents: "hello world from dagger"
}
copy: engine.#Copy & {
input: image.output
source: {
root: exec.output
path: "/output.txt"
}
dest: "/output.txt"
}
verify_copy: engine.#ReadFile & {
input: copy.output
path: "/output.txt"
} & {
// assert result
contents: "hello world"
}
}
}

View File

@ -0,0 +1,42 @@
package main
import (
"alpha.dagger.io/europa/dagger/engine"
)
engine.#Plan & {
actions: {
alpine3_15_0: engine.#Pull & {
source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
}
busybox1_34_1: engine.#Pull & {
source: "busybox:1.34.1-glibc@sha256:ec98391b8f0911db08be2ee6c46813eeac17b9625b402ea1ce45dcfcd05d78d6"
}
verify_alpine_3_15_0: engine.#ReadFile & {
input: alpine3_15_0.output
path: "/etc/alpine-release"
} & {
// assert result
contents: "3.15.0\n"
}
copy: engine.#Copy & {
input: busybox1_34_1.output
source: {
root: alpine3_15_0.output
path: "/etc/alpine-release"
}
dest: "/alpine3_15_0_release"
}
verify_copy: engine.#ReadFile & {
input: copy.output
path: "/alpine3_15_0_release"
} & {
// assert result
contents: "3.15.0\n"
}
}
}

View File

@ -0,0 +1 @@
module: ""

View File

@ -0,0 +1,3 @@
# generated by dagger
alpha.dagger.io
dagger.lock