From 7eb10f96fb54e6f1633d80296cc3eb3c77a62950 Mon Sep 17 00:00:00 2001
From: Richard Jones <richard@dagger.io>
Date: Thu, 27 Jan 2022 20:09:12 -0700
Subject: [PATCH] engine.#Copy matches docker.#Copy

Signed-off-by: Richard Jones <richard@dagger.io>
---
 pkg/dagger.io/dagger/engine/fs.cue     | 10 ++++++++--
 pkg/dagger.io/dagger/utils.cue         | 10 ++++------
 plan/task/copy.go                      |  8 ++++----
 tests/tasks/copy/copy_exec.cue         | 11 +++++------
 tests/tasks/copy/copy_exec_invalid.cue | 10 ++++------
 tests/tasks/copy/copy_file.cue         | 10 ++++------
 6 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/pkg/dagger.io/dagger/engine/fs.cue b/pkg/dagger.io/dagger/engine/fs.cue
index c984b5bc..51fd8927 100644
--- a/pkg/dagger.io/dagger/engine/fs.cue
+++ b/pkg/dagger.io/dagger/engine/fs.cue
@@ -69,9 +69,15 @@ package engine
 // Copy files from one FS tree to another
 #Copy: {
 	$dagger: task: _name: "Copy"
-
+	// Input of the operation
 	input: #FS
-	#CopyInfo
+	// Contents to copy
+	contents: #FS
+	// Source path (optional)
+	source: string | *"/"
+	// Destination path (optional)
+	dest: string | *"/"
+	// Output of the operation
 	output: #FS
 }
 
diff --git a/pkg/dagger.io/dagger/utils.cue b/pkg/dagger.io/dagger/utils.cue
index 43e64f67..b623476c 100644
--- a/pkg/dagger.io/dagger/utils.cue
+++ b/pkg/dagger.io/dagger/utils.cue
@@ -25,12 +25,10 @@ import (
 
 	// Copy action
 	_copy: engine.#Copy & {
-		"input": engine.#Scratch
-		source: {
-			root:   input
-			"path": path
-		}
-		dest: "/"
+		"input":  engine.#Scratch
+		contents: input
+		source:   path
+		dest:     "/"
 	}
 
 	// Subdirectory tree
diff --git a/plan/task/copy.go b/plan/task/copy.go
index 81182c01..dc6b8995 100644
--- a/plan/task/copy.go
+++ b/plan/task/copy.go
@@ -29,17 +29,17 @@ func (t *copyTask) Run(ctx context.Context, pctx *plancontext.Context, s solver.
 		return nil, err
 	}
 
-	sourceRoot, err := pctx.FS.FromValue(v.Lookup("source.root"))
+	contents, err := pctx.FS.FromValue(v.Lookup("contents"))
 	if err != nil {
 		return nil, err
 	}
 
-	sourceState, err := sourceRoot.State()
+	contentsState, err := contents.State()
 	if err != nil {
 		return nil, err
 	}
 
-	sourcePath, err := v.Lookup("source.path").String()
+	sourcePath, err := v.Lookup("source").String()
 	if err != nil {
 		return nil, err
 	}
@@ -51,7 +51,7 @@ func (t *copyTask) Run(ctx context.Context, pctx *plancontext.Context, s solver.
 
 	outputState := inputState.File(
 		llb.Copy(
-			sourceState,
+			contentsState,
 			sourcePath,
 			destPath,
 			// FIXME: allow more configurable llb options
diff --git a/tests/tasks/copy/copy_exec.cue b/tests/tasks/copy/copy_exec.cue
index 18639639..97cc1bf6 100644
--- a/tests/tasks/copy/copy_exec.cue
+++ b/tests/tasks/copy/copy_exec.cue
@@ -29,13 +29,12 @@ engine.#Plan & {
 		}
 
 		copy: engine.#Copy & {
-			input: image.output
-			source: {
-				root: exec.output
-				path: "/output.txt"
-			}
-			dest: "/output.txt"
+			input:    image.output
+			contents: exec.output
+			source:   "/output.txt"
+			dest:     "/output.txt"
 		}
+
 		verify_copy: engine.#ReadFile & {
 			input: copy.output
 			path:  "/output.txt"
diff --git a/tests/tasks/copy/copy_exec_invalid.cue b/tests/tasks/copy/copy_exec_invalid.cue
index ef669620..f5754dc5 100644
--- a/tests/tasks/copy/copy_exec_invalid.cue
+++ b/tests/tasks/copy/copy_exec_invalid.cue
@@ -29,12 +29,10 @@ engine.#Plan & {
 		}
 
 		copy: engine.#Copy & {
-			input: image.output
-			source: {
-				root: exec.output
-				path: "/output.txt"
-			}
-			dest: "/output.txt"
+			input:    image.output
+			contents: exec.output
+			source:   "/output.txt"
+			dest:     "/output.txt"
 		}
 		verify_copy: engine.#ReadFile & {
 			input: copy.output
diff --git a/tests/tasks/copy/copy_file.cue b/tests/tasks/copy/copy_file.cue
index ac95ea19..6a08c10b 100644
--- a/tests/tasks/copy/copy_file.cue
+++ b/tests/tasks/copy/copy_file.cue
@@ -23,12 +23,10 @@ engine.#Plan & {
 		}
 
 		copy: engine.#Copy & {
-			input: busybox1_34_1.output
-			source: {
-				root: alpine3_15_0.output
-				path: "/etc/alpine-release"
-			}
-			dest: "/alpine3_15_0_release"
+			input:    busybox1_34_1.output
+			contents: alpine3_15_0.output
+			source:   "/etc/alpine-release"
+			dest:     "/alpine3_15_0_release"
 		}
 
 		verify_copy: engine.#ReadFile & {