Merge dagger.io/dagger/engine into dagger.io/dagger

Signed-off-by: Solomon Hykes <solomon@dagger.io>

tests/tasks/dockerfile/build_args.cue

@@ -1,13 +1,13 @@
 package testing
 
 import (
-	"dagger.io/dagger/engine"
+	"dagger.io/dagger"
 )
 
-engine.#Plan & {
+dagger.#Plan & {
 	inputs: directories: testdata: path: "./testdata"
 
-	actions: build: engine.#Dockerfile & {
+	actions: build: dagger.#Dockerfile & {
 		source: inputs.directories.testdata.contents
 		dockerfile: contents: """
 			FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d

tests/tasks/dockerfile/build_auth.cue

@@ -2,10 +2,9 @@ package testing
 
 import (
 	"dagger.io/dagger"
-	"dagger.io/dagger/engine"
 )
 
-engine.#Plan & {
+dagger.#Plan & {
 	inputs: {
 		directories: testdata: path: "./testdata"
 		secrets: sops: command: {
@@ -20,7 +19,7 @@ engine.#Plan & {
 			input:  inputs.secrets.sops.contents
 		}
 
-		build: engine.#Dockerfile & {
+		build: dagger.#Dockerfile & {
 			source: inputs.directories.testdata.contents
 			auth: "daggerio/ci-test:private-pull": {
 				username: "daggertest"

tests/tasks/dockerfile/dockerfile.cue

@@ -1,18 +1,18 @@
 package testing
 
 import (
-	"dagger.io/dagger/engine"
+	"dagger.io/dagger"
 )
 
-engine.#Plan & {
+dagger.#Plan & {
 	inputs: directories: testdata: path: "./testdata"
 
 	actions: {
-		build: engine.#Dockerfile & {
+		build: dagger.#Dockerfile & {
 			source: inputs.directories.testdata.contents
 		}
 
-		verify: engine.#Exec & {
+		verify: dagger.#Exec & {
 			input: build.output
 			args: ["sh", "-c", "test $(cat /dir/foo) = foobar"]
 		}

tests/tasks/dockerfile/dockerfile_path.cue

@@ -1,19 +1,19 @@
 package testing
 
 import (
-	"dagger.io/dagger/engine"
+	"dagger.io/dagger"
 )
 
-engine.#Plan & {
+dagger.#Plan & {
 	inputs: directories: testdata: path: "./testdata"
 
 	actions: {
-		build: engine.#Dockerfile & {
+		build: dagger.#Dockerfile & {
 			source: inputs.directories.testdata.contents
 			dockerfile: path: "./dockerfilepath/Dockerfile.custom"
 		}
 
-		verify: engine.#Exec & {
+		verify: dagger.#Exec & {
 			input: build.output
 			args: ["sh", "-c", "test $(cat /test) = dockerfilePath"]
 		}

tests/tasks/dockerfile/image_config.cue

@@ -1,15 +1,15 @@
 package testing
 
 import (
-	"dagger.io/dagger/engine"
+	"dagger.io/dagger"
 )
 
-engine.#Plan & {
+dagger.#Plan & {
 	inputs: directories: testdata: path: "./testdata"
 
 	actions: {
 		// FIXME: this doesn't test anything beside not crashing
-		build: engine.#Dockerfile & {
+		build: dagger.#Dockerfile & {
 			source: inputs.directories.testdata.contents
 			dockerfile: contents: """
 				FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d

tests/tasks/dockerfile/inlined_dockerfile.cue

@@ -1,14 +1,14 @@
 package testing
 
 import (
-	"dagger.io/dagger/engine"
+	"dagger.io/dagger"
 )
 
-engine.#Plan & {
+dagger.#Plan & {
 	inputs: directories: testdata: path: "./testdata"
 
 	actions: {
-		build: engine.#Dockerfile & {
+		build: dagger.#Dockerfile & {
 			source: inputs.directories.testdata.contents
 			dockerfile: contents: """
 				FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
@@ -16,7 +16,7 @@ engine.#Plan & {
 				"""
 		}
 
-		verify: engine.#Exec & {
+		verify: dagger.#Exec & {
 			input: build.output
 			args: ["sh", "-c", "test $(cat /output) = foobar"]
 		}

tests/tasks/dockerfile/inlined_dockerfile_heredoc.cue

@@ -1,14 +1,14 @@
 package testing
 
 import (
-	"dagger.io/dagger/engine"
+	"dagger.io/dagger"
 )
 
-engine.#Plan & {
+dagger.#Plan & {
 	inputs: directories: testdata: path: "./testdata"
 
 	actions: {
-		build: engine.#Dockerfile & {
+		build: dagger.#Dockerfile & {
 			source: inputs.directories.testdata.contents
 			dockerfile: contents: """
 				# syntax = docker/dockerfile:1.3
@@ -17,7 +17,7 @@ engine.#Plan & {
 				"""
 		}
 
-		verify: engine.#Exec & {
+		verify: dagger.#Exec & {
 			input: build.output
 			args: ["sh", "-c", "test $(cat /output) = foobar"]
 		}

tests/tasks/dockerfile/labels.cue

@@ -1,15 +1,15 @@
 package testing
 
 import (
-	"dagger.io/dagger/engine"
+	"dagger.io/dagger"
 )
 
-engine.#Plan & {
+dagger.#Plan & {
 	inputs: directories: testdata: path: "./testdata"
 
 	actions: {
 		// FIXME: this doesn't test anything beside not crashing
-		build: engine.#Dockerfile & {
+		build: dagger.#Dockerfile & {
 			source: inputs.directories.testdata.contents
 			dockerfile: contents: """
 				FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d

tests/tasks/dockerfile/platform.cue

@@ -1,15 +1,15 @@
 package testing
 
 import (
-	"dagger.io/dagger/engine"
+	"dagger.io/dagger"
 )
 
-engine.#Plan & {
+dagger.#Plan & {
 	inputs: directories: testdata: path: "./testdata"
 
 	actions: {
 		// FIXME: this doesn't test anything beside not crashing
-		build: engine.#Dockerfile & {
+		build: dagger.#Dockerfile & {
 			source: inputs.directories.testdata.contents
 			dockerfile: contents: """
 				FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d