From 7a77466a666d42bf075736aed5eaf081f3169ef0 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Fri, 12 Feb 2021 23:22:41 +0000 Subject: [PATCH] DX: change "#dagger: compute: " to "#compute: " Signed-off-by: Solomon Hykes --- dagger/dagger_test.go | 4 +-- dagger/env.go | 2 +- dagger/input.go | 4 +-- dagger/pipeline.go | 4 +-- examples/dogfood/main.cue | 6 ++-- examples/react-netlify/main.cue | 2 +- examples/simple/simple.cue | 6 ++-- stdlib/alpine/alpine.cue | 2 +- stdlib/dagger/dagger.cue | 2 +- stdlib/go/go.cue | 4 +-- stdlib/netlify/netlify.cue | 2 +- stdlib/yarn/yarn.cue | 2 +- tests/compute/invalid/bool/main.cue | 2 +- tests/compute/invalid/int/main.cue | 2 +- .../compute/invalid/overload/new_def/main.cue | 16 ---------- .../invalid/overload/new_prop/main.cue | 16 ---------- tests/compute/invalid/string/main.cue | 2 +- tests/compute/invalid/struct/main.cue | 2 +- tests/compute/success/noop/main.cue | 7 +---- tests/compute/success/overload/flat/main.cue | 2 +- .../compute/success/overload/wrapped/main.cue | 2 +- tests/compute/success/simple/main.cue | 2 +- tests/copy/invalid/cache/main.cue | 4 +-- tests/copy/valid/component/main.cue | 8 ++--- tests/copy/valid/script/main.cue | 2 +- tests/dependencies/interpolation/main.cue | 4 +-- tests/dependencies/simple/main.cue | 4 +-- tests/dependencies/unmarshal/main.cue | 4 +-- tests/dockerbuild/main.cue | 16 +++++----- tests/exec/always/main.cue | 2 +- tests/exec/dir/doesnotexist/main.cue | 2 +- tests/exec/dir/exist/main.cue | 2 +- tests/exec/env/invalid/main.cue | 2 +- tests/exec/env/overlay/main.cue | 2 +- tests/exec/env/valid/main.cue | 2 +- tests/exec/error/main.cue | 2 +- tests/exec/exit_code/main.cue | 2 +- tests/exec/invalid/main.cue | 2 +- tests/exec/simple/main.cue | 2 +- .../non_concrete_not_referenced/main.cue | 2 +- .../non_concrete_referenced/main.cue | 2 +- .../cue.mod/pkg/dagger.io/def/main.cue | 28 ++++++++--------- tests/exec/undefined/with_pkg_def/main.cue | 14 ++++----- .../pkg/dagger.io/nonoptional/main.cue | 30 +++++++++---------- .../undefined/with_pkg_mandatory/main.cue | 14 ++++----- .../cue.mod/pkg/dagger.io/optional/main.cue | 28 ++++++++--------- .../exec/undefined/with_pkg_optional/main.cue | 14 ++++----- tests/export/bool/main.cue | 2 +- tests/export/concurrency/main.cue | 20 ++++++------- tests/export/float/main.cue | 2 +- tests/export/invalid/format/main.cue | 2 +- tests/export/invalid/path/main.cue | 2 +- tests/export/invalid/validation/main.cue | 2 +- tests/export/json/main.cue | 6 ++-- tests/export/number/main.cue | 2 +- tests/export/string/main.cue | 2 +- tests/export/withvalidation/main.cue | 2 +- tests/export/yaml/main.cue | 6 ++-- tests/fetch-container/exist/main.cue | 10 +++---- tests/fetch-container/invalid/main.cue | 2 +- .../nonexistent/digest/main.cue | 2 +- .../image-with-valid-digest/main.cue | 2 +- .../nonexistent/image/main.cue | 2 +- .../fetch-container/nonexistent/tag/main.cue | 2 +- tests/fetch-git/exist/main.cue | 2 +- tests/fetch-git/invalid/main.cue | 2 +- tests/fetch-git/nonexistent/bork/main.cue | 2 +- tests/fetch-git/nonexistent/ref/main.cue | 2 +- tests/fetch-git/nonexistent/remote/main.cue | 2 +- tests/input/default/main.cue | 2 +- tests/input/simple/main.cue | 2 +- tests/load/invalid/cache/main.cue | 4 +-- tests/load/valid/component/main.cue | 8 ++--- tests/load/valid/script/main.cue | 2 +- tests/mounts/valid/cache/main.cue | 2 +- tests/mounts/valid/component/main.cue | 6 ++-- tests/mounts/valid/script/main.cue | 2 +- tests/mounts/valid/tmpfs/main.cue | 2 +- tests/repro-19/main.cue | 2 +- tests/subdir/simple/main.cue | 2 +- tests/test.sh | 6 +--- 81 files changed, 176 insertions(+), 229 deletions(-) delete mode 100644 tests/compute/invalid/overload/new_def/main.cue delete mode 100644 tests/compute/invalid/overload/new_prop/main.cue diff --git a/dagger/dagger_test.go b/dagger/dagger_test.go index 3e6f6dc7..2e78eecb 100644 --- a/dagger/dagger_test.go +++ b/dagger/dagger_test.go @@ -8,13 +8,13 @@ import ( func TestLocalDirs(t *testing.T) { env := mkEnv(t, - `#dagger: compute: [ + `#compute: [ { do: "local" dir: "bar" } ]`, - `dir: #dagger: compute: [ + `dir: #compute: [ { do: "local" dir: "foo" diff --git a/dagger/env.go b/dagger/env.go index a640361b..0d27f362 100644 --- a/dagger/env.go +++ b/dagger/env.go @@ -149,7 +149,7 @@ func (env *Env) LocalDirs() map[string]string { flow := cueflow.New(&cueflow.Config{}, inst, newDummyTaskFunc(inst)) for _, t := range flow.Tasks() { v := compiler.Wrap(t.Value(), inst) - localdirs(v.Get("#dagger.compute")) + localdirs(v.Get("#compute")) } // 2. Scan the environment updater localdirs(env.Updater()) diff --git a/dagger/input.go b/dagger/input.go index daf59d50..552dc266 100644 --- a/dagger/input.go +++ b/dagger/input.go @@ -102,7 +102,7 @@ func (f dirFlag) Set(s string) error { return nil, err } return compiler.Compile("", fmt.Sprintf( - `#dagger: compute: [{do:"local",dir:"%s", include:%s}]`, + `#compute: [{do:"local",dir:"%s", include:%s}]`, s, include, )) @@ -140,7 +140,7 @@ func (f gitFlag) Set(s string) error { remote := u.String() return compiler.Compile("", fmt.Sprintf( - `#dagger: compute: [{do:"fetch-git", remote:"%s", ref:"%s"}]`, + `#compute: [{do:"fetch-git", remote:"%s", ref:"%s"}]`, remote, ref, )) diff --git a/dagger/pipeline.go b/dagger/pipeline.go index 8a305c86..7999044c 100644 --- a/dagger/pipeline.go +++ b/dagger/pipeline.go @@ -41,7 +41,7 @@ func (p *Pipeline) FS() FS { } func isComponent(v *compiler.Value) bool { - return v.Get("#dagger.compute").Exists() + return v.Get("#compute").Exists() } func ops(code ...*compiler.Value) ([]*compiler.Value, error) { @@ -50,7 +50,7 @@ func ops(code ...*compiler.Value) ([]*compiler.Value, error) { for _, x := range code { // 1. attachment array if isComponent(x) { - xops, err := x.Get("#dagger.compute").List() + xops, err := x.Get("#compute").List() if err != nil { return nil, err } diff --git a/examples/dogfood/main.cue b/examples/dogfood/main.cue index 0e3b0505..e87ee4ee 100644 --- a/examples/dogfood/main.cue +++ b/examples/dogfood/main.cue @@ -20,20 +20,20 @@ test: go.#Test & { } // Run a command with the binary we just built -help: #dagger: compute: [ +help: #compute: [ dagger.#Load & {from: build}, dagger.#Exec & {args: ["dagger", "-h"]}, ] // Build dagger using the (included) Dockerfile -buildWithDocker: #dagger: compute: [ +buildWithDocker: #compute: [ dagger.#DockerBuild & { context: repository }, ] // Run a command in the docker image we just built -helpFromDocker: #dagger: compute: [ +helpFromDocker: #compute: [ dagger.#Load & {from: buildWithDocker}, dagger.#Exec & {args: ["dagger", "-h"]}, ] diff --git a/examples/react-netlify/main.cue b/examples/react-netlify/main.cue index 1d7cd991..0fb2c3ae 100644 --- a/examples/react-netlify/main.cue +++ b/examples/react-netlify/main.cue @@ -6,7 +6,7 @@ import ( "dagger.io/yarn" ) -repository: #dagger: compute: [ +repository: #compute: [ dagger.#FetchGit & { remote: "https://github.com/kabirbaidhya/react-todo-app.git" ref: "624041b17bd62292143f99bce474a0e3c2d2dd61" diff --git a/examples/simple/simple.cue b/examples/simple/simple.cue index 755c8509..735ddefd 100644 --- a/examples/simple/simple.cue +++ b/examples/simple/simple.cue @@ -7,7 +7,7 @@ import ( let alpine = { digest: "sha256:3c7497bf0c7af93428242d6176e8f7905f2201d8fc5861f45be7a346b5f23436" package: [string]: true | false | string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "index.docker.io/alpine@\(digest)" @@ -33,7 +33,7 @@ www: { listing: { string - #dagger: compute: [ + #compute: [ dagger.#Load & { from: alpine }, @@ -52,7 +52,7 @@ www: { url: { string - #dagger: compute: [ + #compute: [ { do: "load" from: alpine diff --git a/stdlib/alpine/alpine.cue b/stdlib/alpine/alpine.cue index 83da22b1..aa872197 100644 --- a/stdlib/alpine/alpine.cue +++ b/stdlib/alpine/alpine.cue @@ -10,7 +10,7 @@ let defaultVersion = "3.13.2@sha256:a75afd8b57e7f34e4dad8d65e2c7ba2e1975c795ce1e package: [string]: true | false | string version: string | *defaultVersion - #dagger: compute: [ + #compute: [ dagger.#FetchContainer & { ref: "index.docker.io/alpine:\(version)" }, diff --git a/stdlib/dagger/dagger.cue b/stdlib/dagger/dagger.cue index 41b27241..c11a7870 100644 --- a/stdlib/dagger/dagger.cue +++ b/stdlib/dagger/dagger.cue @@ -2,7 +2,7 @@ package dagger // Any component can be referenced as a directory, since // every dagger script outputs a filesystem state (aka a directory) -#Dir: #dagger: compute: [...#Op] +#Dir: #compute: [...#Op] // One operation in a script #Op: #FetchContainer | #FetchGit | #Export | #Exec | #Local | #Copy | #Load | #Subdir diff --git a/stdlib/go/go.cue b/stdlib/go/go.cue index c9e5a029..e8acbd2d 100644 --- a/stdlib/go/go.cue +++ b/stdlib/go/go.cue @@ -17,7 +17,7 @@ import ( // Environment variables env: [string]: string - #dagger: compute: [ + #compute: [ dagger.#FetchContainer & { ref: "docker.io/golang:\(version)-alpine" }, @@ -62,7 +62,7 @@ import ( env: [string]: string - #dagger: compute: [ + #compute: [ dagger.#Copy & { from: #Go & { "version": version diff --git a/stdlib/netlify/netlify.cue b/stdlib/netlify/netlify.cue index 020ee029..83cc4730 100644 --- a/stdlib/netlify/netlify.cue +++ b/stdlib/netlify/netlify.cue @@ -36,7 +36,7 @@ import ( url: { string - #dagger: compute: [ + #compute: [ dagger.#Load & { from: alpine.#Image & { package: bash: "=~5.1" diff --git a/stdlib/yarn/yarn.cue b/stdlib/yarn/yarn.cue index f5d58975..b0ac793b 100644 --- a/stdlib/yarn/yarn.cue +++ b/stdlib/yarn/yarn.cue @@ -20,7 +20,7 @@ import ( // Set these environment variables during the build env?: [string]: string - #dagger: compute: [ + #compute: [ dagger.#Load & { from: alpine.#Image & { package: bash: "=~5.1" diff --git a/tests/compute/invalid/bool/main.cue b/tests/compute/invalid/bool/main.cue index 54990a89..9b70a3a1 100644 --- a/tests/compute/invalid/bool/main.cue +++ b/tests/compute/invalid/bool/main.cue @@ -1,3 +1,3 @@ package testing -#dagger: compute: true +#compute: true diff --git a/tests/compute/invalid/int/main.cue b/tests/compute/invalid/int/main.cue index d9f885ad..d4b11853 100644 --- a/tests/compute/invalid/int/main.cue +++ b/tests/compute/invalid/int/main.cue @@ -1,3 +1,3 @@ package testing -#dagger: compute: 123 +#compute: 123 diff --git a/tests/compute/invalid/overload/new_def/main.cue b/tests/compute/invalid/overload/new_def/main.cue deleted file mode 100644 index dfec98af..00000000 --- a/tests/compute/invalid/overload/new_def/main.cue +++ /dev/null @@ -1,16 +0,0 @@ -package testing - -bar: #dagger: { - - #new_def: "lala" - - compute: [{ - do: "fetch-container" - ref: "busybox" - }, - { - do: "exec" - args: ["true"] - dir: "/" - }] -} diff --git a/tests/compute/invalid/overload/new_prop/main.cue b/tests/compute/invalid/overload/new_prop/main.cue deleted file mode 100644 index 3bd29f9f..00000000 --- a/tests/compute/invalid/overload/new_prop/main.cue +++ /dev/null @@ -1,16 +0,0 @@ -package testing - -bar: #dagger: { - - new_prop: "lala" - - compute: [{ - do: "fetch-container" - ref: "busybox" - }, - { - do: "exec" - args: ["true"] - dir: "/" - }] -} diff --git a/tests/compute/invalid/string/main.cue b/tests/compute/invalid/string/main.cue index 5da733ed..c43ed4df 100644 --- a/tests/compute/invalid/string/main.cue +++ b/tests/compute/invalid/string/main.cue @@ -1,3 +1,3 @@ package testing -#dagger: compute: "whatever" +#compute: "whatever" diff --git a/tests/compute/invalid/struct/main.cue b/tests/compute/invalid/struct/main.cue index a1cb94f5..e5e8e7c2 100644 --- a/tests/compute/invalid/struct/main.cue +++ b/tests/compute/invalid/struct/main.cue @@ -1,3 +1,3 @@ package testing -#dagger: compute: whatever: "wrong" +#compute: whatever: "wrong" diff --git a/tests/compute/success/noop/main.cue b/tests/compute/success/noop/main.cue index b11cdceb..16e32b81 100644 --- a/tests/compute/success/noop/main.cue +++ b/tests/compute/success/noop/main.cue @@ -1,11 +1,6 @@ package testing -// no-op, should not error -realempty: { - #dagger: {} -} - // no-op, should not error empty: { - #dagger: compute: [] + #compute: [] } diff --git a/tests/compute/success/overload/flat/main.cue b/tests/compute/success/overload/flat/main.cue index 7bac1cf9..7843e723 100644 --- a/tests/compute/success/overload/flat/main.cue +++ b/tests/compute/success/overload/flat/main.cue @@ -6,7 +6,7 @@ new_prop: "lala" new_prop_too: string #new_def_too: string -#dagger: compute: [{ +#compute: [{ do: "fetch-container" ref: "busybox" }, diff --git a/tests/compute/success/overload/wrapped/main.cue b/tests/compute/success/overload/wrapped/main.cue index 4275220a..43aec189 100644 --- a/tests/compute/success/overload/wrapped/main.cue +++ b/tests/compute/success/overload/wrapped/main.cue @@ -7,7 +7,7 @@ foo: { new_prop_too: string #new_def_too: string - #dagger: compute: [{ + #compute: [{ do: "fetch-container" ref: "busybox" }, diff --git a/tests/compute/success/simple/main.cue b/tests/compute/success/simple/main.cue index 90657450..717e6d32 100644 --- a/tests/compute/success/simple/main.cue +++ b/tests/compute/success/simple/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "busybox" diff --git a/tests/copy/invalid/cache/main.cue b/tests/copy/invalid/cache/main.cue index 642581c5..9c1bb443 100644 --- a/tests/copy/invalid/cache/main.cue +++ b/tests/copy/invalid/cache/main.cue @@ -3,7 +3,7 @@ package testing test1: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "busybox" @@ -25,7 +25,7 @@ test1: { test2: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "busybox" diff --git a/tests/copy/valid/component/main.cue b/tests/copy/valid/component/main.cue index ddcd9287..0f1d147e 100644 --- a/tests/copy/valid/component/main.cue +++ b/tests/copy/valid/component/main.cue @@ -1,6 +1,6 @@ package testing -component: #dagger: compute: [{ +component: #compute: [{ do: "fetch-container" ref: "alpine" }, { @@ -14,7 +14,7 @@ component: #dagger: compute: [{ test1: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "busybox" @@ -36,14 +36,14 @@ test1: { test2: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "busybox" }, { do: "copy" - from: #dagger: compute: [{ + from: #compute: [{ do: "fetch-container" ref: "alpine" }, { diff --git a/tests/copy/valid/script/main.cue b/tests/copy/valid/script/main.cue index c78aac25..4daea4f3 100644 --- a/tests/copy/valid/script/main.cue +++ b/tests/copy/valid/script/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "busybox" diff --git a/tests/dependencies/interpolation/main.cue b/tests/dependencies/interpolation/main.cue index c2050af1..92b0ae3b 100644 --- a/tests/dependencies/interpolation/main.cue +++ b/tests/dependencies/interpolation/main.cue @@ -3,7 +3,7 @@ package testing A: { result: string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -28,7 +28,7 @@ A: { B: { result: string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/dependencies/simple/main.cue b/tests/dependencies/simple/main.cue index 31eab026..3ee533b9 100644 --- a/tests/dependencies/simple/main.cue +++ b/tests/dependencies/simple/main.cue @@ -3,7 +3,7 @@ package testing A: { result: string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -28,7 +28,7 @@ A: { B: { result: string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/dependencies/unmarshal/main.cue b/tests/dependencies/unmarshal/main.cue index 62195618..c3f65042 100644 --- a/tests/dependencies/unmarshal/main.cue +++ b/tests/dependencies/unmarshal/main.cue @@ -5,7 +5,7 @@ import "encoding/json" A: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -32,7 +32,7 @@ unmarshalled: json.Unmarshal(A) B: { result: string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/dockerbuild/main.cue b/tests/dockerbuild/main.cue index 12d4c639..31cbc3ab 100644 --- a/tests/dockerbuild/main.cue +++ b/tests/dockerbuild/main.cue @@ -5,7 +5,7 @@ import "dagger.io/dagger" // Set to `--input-dir=./tests/dockerbuild/testdata` TestData: dagger.#Dir -TestInlinedDockerfile: #dagger: compute: [ +TestInlinedDockerfile: #compute: [ dagger.#DockerBuild & { dockerfile: """ FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d @@ -14,7 +14,7 @@ TestInlinedDockerfile: #dagger: compute: [ }, ] -TestOpChaining: #dagger: compute: [ +TestOpChaining: #compute: [ dagger.#DockerBuild & { dockerfile: """ FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d @@ -26,7 +26,7 @@ TestOpChaining: #dagger: compute: [ } ] -TestBuildContext: #dagger: compute: [ +TestBuildContext: #compute: [ dagger.#DockerBuild & { context: TestData }, @@ -35,7 +35,7 @@ TestBuildContext: #dagger: compute: [ } ] -TestBuildContextAndDockerfile: #dagger: compute: [ +TestBuildContextAndDockerfile: #compute: [ dagger.#DockerBuild & { context: TestData dockerfile: """ @@ -48,7 +48,7 @@ TestBuildContextAndDockerfile: #dagger: compute: [ } ] -TestDockerfilePath: #dagger: compute: [ +TestDockerfilePath: #compute: [ dagger.#DockerBuild & { context: TestData dockerfilePath: "./dockerfilepath/Dockerfile.custom" @@ -58,7 +58,7 @@ TestDockerfilePath: #dagger: compute: [ } ] -TestBuildArgs: #dagger: compute: [ +TestBuildArgs: #compute: [ dagger.#DockerBuild & { dockerfile: """ FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d @@ -70,7 +70,7 @@ TestBuildArgs: #dagger: compute: [ ] // FIXME: this doesn't test anything beside not crashing -TestBuildLabels: #dagger: compute: [ +TestBuildLabels: #compute: [ dagger.#DockerBuild & { dockerfile: """ FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d @@ -80,7 +80,7 @@ TestBuildLabels: #dagger: compute: [ ] // FIXME: this doesn't test anything beside not crashing -TestBuildPlatform: #dagger: compute: [ +TestBuildPlatform: #compute: [ dagger.#DockerBuild & { dockerfile: """ FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d diff --git a/tests/exec/always/main.cue b/tests/exec/always/main.cue index 2966f8e3..082d56d6 100644 --- a/tests/exec/always/main.cue +++ b/tests/exec/always/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/exec/dir/doesnotexist/main.cue b/tests/exec/dir/doesnotexist/main.cue index f11b3a6b..26729545 100644 --- a/tests/exec/dir/doesnotexist/main.cue +++ b/tests/exec/dir/doesnotexist/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/exec/dir/exist/main.cue b/tests/exec/dir/exist/main.cue index d25b8109..9564d9da 100644 --- a/tests/exec/dir/exist/main.cue +++ b/tests/exec/dir/exist/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/exec/env/invalid/main.cue b/tests/exec/env/invalid/main.cue index 5975efc2..36ea906d 100644 --- a/tests/exec/env/invalid/main.cue +++ b/tests/exec/env/invalid/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/exec/env/overlay/main.cue b/tests/exec/env/overlay/main.cue index 37fc273b..4313b67e 100644 --- a/tests/exec/env/overlay/main.cue +++ b/tests/exec/env/overlay/main.cue @@ -2,7 +2,7 @@ package testing bar: string -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/exec/env/valid/main.cue b/tests/exec/env/valid/main.cue index 4171c574..f96e54c8 100644 --- a/tests/exec/env/valid/main.cue +++ b/tests/exec/env/valid/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/exec/error/main.cue b/tests/exec/error/main.cue index 563d79ba..fca3285a 100644 --- a/tests/exec/error/main.cue +++ b/tests/exec/error/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/exec/exit_code/main.cue b/tests/exec/exit_code/main.cue index 901739b0..fcffa58c 100644 --- a/tests/exec/exit_code/main.cue +++ b/tests/exec/exit_code/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/exec/invalid/main.cue b/tests/exec/invalid/main.cue index b5e3526d..67650476 100644 --- a/tests/exec/invalid/main.cue +++ b/tests/exec/invalid/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/exec/simple/main.cue b/tests/exec/simple/main.cue index eff1f140..8a0b64d5 100644 --- a/tests/exec/simple/main.cue +++ b/tests/exec/simple/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/exec/undefined/non_concrete_not_referenced/main.cue b/tests/exec/undefined/non_concrete_not_referenced/main.cue index ad6bda78..df40cdd1 100644 --- a/tests/exec/undefined/non_concrete_not_referenced/main.cue +++ b/tests/exec/undefined/non_concrete_not_referenced/main.cue @@ -3,7 +3,7 @@ package testing hello: "world" bar: string -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/exec/undefined/non_concrete_referenced/main.cue b/tests/exec/undefined/non_concrete_referenced/main.cue index 45267375..943798b1 100644 --- a/tests/exec/undefined/non_concrete_referenced/main.cue +++ b/tests/exec/undefined/non_concrete_referenced/main.cue @@ -3,7 +3,7 @@ package testing hello: "world" bar: string -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/exec/undefined/with_pkg_def/cue.mod/pkg/dagger.io/def/main.cue b/tests/exec/undefined/with_pkg_def/cue.mod/pkg/dagger.io/def/main.cue index 28a78e60..e5a90e2d 100644 --- a/tests/exec/undefined/with_pkg_def/cue.mod/pkg/dagger.io/def/main.cue +++ b/tests/exec/undefined/with_pkg_def/cue.mod/pkg/dagger.io/def/main.cue @@ -2,18 +2,16 @@ package def #dang: string -#dagger: { - compute: [ - { - do: "fetch-container" - ref: "alpine" - }, - { - do: "exec" - dir: "/" - args: ["sh", "-c", """ - echo success - """] - }, - ] -} +#compute: [ + { + do: "fetch-container" + ref: "alpine" + }, + { + do: "exec" + dir: "/" + args: ["sh", "-c", """ + echo success + """] + }, +] diff --git a/tests/exec/undefined/with_pkg_def/main.cue b/tests/exec/undefined/with_pkg_def/main.cue index 185563bb..ffcc417a 100644 --- a/tests/exec/undefined/with_pkg_def/main.cue +++ b/tests/exec/undefined/with_pkg_def/main.cue @@ -4,11 +4,9 @@ import ( "dagger.io/def" ) -#dagger: { - compute: [ - { - do: "load", - from: def - }, - ] -} +#compute: [ + { + do: "load", + from: def + }, +] diff --git a/tests/exec/undefined/with_pkg_mandatory/cue.mod/pkg/dagger.io/nonoptional/main.cue b/tests/exec/undefined/with_pkg_mandatory/cue.mod/pkg/dagger.io/nonoptional/main.cue index a10eb681..eaa3d07a 100644 --- a/tests/exec/undefined/with_pkg_mandatory/cue.mod/pkg/dagger.io/nonoptional/main.cue +++ b/tests/exec/undefined/with_pkg_mandatory/cue.mod/pkg/dagger.io/nonoptional/main.cue @@ -2,19 +2,17 @@ package nonoptional dang: string -#dagger: { - compute: [ - { - do: "fetch-container" - ref: "alpine" - }, - { - do: "exec" - dir: "/" - args: ["sh", "-c", """ - echo "This test SHOULD fail, because this SHOULD be executed" - exit 1 - """] - }, - ] -} +#compute: [ + { + do: "fetch-container" + ref: "alpine" + }, + { + do: "exec" + dir: "/" + args: ["sh", "-c", """ + echo "This test SHOULD fail, because this SHOULD be executed" + exit 1 + """] + }, +] diff --git a/tests/exec/undefined/with_pkg_mandatory/main.cue b/tests/exec/undefined/with_pkg_mandatory/main.cue index c6a26f8a..1b660e96 100644 --- a/tests/exec/undefined/with_pkg_mandatory/main.cue +++ b/tests/exec/undefined/with_pkg_mandatory/main.cue @@ -4,11 +4,9 @@ import ( "dagger.io/nonoptional" ) -#dagger: { - compute: [ - { - do: "load", - from: nonoptional - }, - ] -} +#compute: [ + { + do: "load", + from: nonoptional + }, +] diff --git a/tests/exec/undefined/with_pkg_optional/cue.mod/pkg/dagger.io/optional/main.cue b/tests/exec/undefined/with_pkg_optional/cue.mod/pkg/dagger.io/optional/main.cue index 681e7aa1..53a06b8f 100644 --- a/tests/exec/undefined/with_pkg_optional/cue.mod/pkg/dagger.io/optional/main.cue +++ b/tests/exec/undefined/with_pkg_optional/cue.mod/pkg/dagger.io/optional/main.cue @@ -2,18 +2,16 @@ package optional dang?: string -#dagger: { - compute: [ - { - do: "fetch-container" - ref: "alpine" - }, - { - do: "exec" - dir: "/" - args: ["sh", "-c", """ - echo success - """] - }, - ] -} +#compute: [ + { + do: "fetch-container" + ref: "alpine" + }, + { + do: "exec" + dir: "/" + args: ["sh", "-c", """ + echo success + """] + }, +] diff --git a/tests/exec/undefined/with_pkg_optional/main.cue b/tests/exec/undefined/with_pkg_optional/main.cue index 5995998f..186237e2 100644 --- a/tests/exec/undefined/with_pkg_optional/main.cue +++ b/tests/exec/undefined/with_pkg_optional/main.cue @@ -4,11 +4,9 @@ import ( "dagger.io/optional" ) -#dagger: { - compute: [ - { - do: "load", - from: optional - }, - ] -} +#compute: [ + { + do: "load", + from: optional + }, +] diff --git a/tests/export/bool/main.cue b/tests/export/bool/main.cue index f6ec951b..950fe188 100644 --- a/tests/export/bool/main.cue +++ b/tests/export/bool/main.cue @@ -3,7 +3,7 @@ package testing test: { bool - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/export/concurrency/main.cue b/tests/export/concurrency/main.cue index a9e7c916..d847d0a5 100644 --- a/tests/export/concurrency/main.cue +++ b/tests/export/concurrency/main.cue @@ -3,7 +3,7 @@ package testing test1: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -27,7 +27,7 @@ test1: { test2: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -51,7 +51,7 @@ test2: { test3: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -75,7 +75,7 @@ test3: { test4: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -99,7 +99,7 @@ test4: { test5: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -123,7 +123,7 @@ test5: { test6: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -147,7 +147,7 @@ test6: { test7: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -171,7 +171,7 @@ test7: { test8: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -195,7 +195,7 @@ test8: { test9: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -219,7 +219,7 @@ test9: { test10: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/export/float/main.cue b/tests/export/float/main.cue index b36be873..8ef95b29 100644 --- a/tests/export/float/main.cue +++ b/tests/export/float/main.cue @@ -3,7 +3,7 @@ package testing test: { float - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/export/invalid/format/main.cue b/tests/export/invalid/format/main.cue index a49e37dc..128c231d 100644 --- a/tests/export/invalid/format/main.cue +++ b/tests/export/invalid/format/main.cue @@ -3,7 +3,7 @@ package testing teststring: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/export/invalid/path/main.cue b/tests/export/invalid/path/main.cue index 9a606ca8..a2bc96d5 100644 --- a/tests/export/invalid/path/main.cue +++ b/tests/export/invalid/path/main.cue @@ -3,7 +3,7 @@ package testing teststring: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/export/invalid/validation/main.cue b/tests/export/invalid/validation/main.cue index 24f9a029..426cee46 100644 --- a/tests/export/invalid/validation/main.cue +++ b/tests/export/invalid/validation/main.cue @@ -4,7 +4,7 @@ test: { string =~"^NAAAA.+" - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/export/json/main.cue b/tests/export/json/main.cue index c557a665..a4f2d34d 100644 --- a/tests/export/json/main.cue +++ b/tests/export/json/main.cue @@ -3,7 +3,7 @@ package testing testScalar: { bool - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -25,7 +25,7 @@ testScalar: { ] } -testMap: #dagger: compute: [ +testMap: #compute: [ { do: "fetch-container" ref: "alpine" @@ -50,7 +50,7 @@ testMap: #dagger: compute: [ // testList: { // [...string] -// #dagger: compute: [ +// #compute: [ // { // do: "fetch-container" // ref: "alpine" diff --git a/tests/export/number/main.cue b/tests/export/number/main.cue index 4ba8dbd8..79a7a0e9 100644 --- a/tests/export/number/main.cue +++ b/tests/export/number/main.cue @@ -3,7 +3,7 @@ package testing test: { number - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/export/string/main.cue b/tests/export/string/main.cue index 8a50dbf7..024d9c31 100644 --- a/tests/export/string/main.cue +++ b/tests/export/string/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/export/withvalidation/main.cue b/tests/export/withvalidation/main.cue index 8c1f2bd8..bac0f5a1 100644 --- a/tests/export/withvalidation/main.cue +++ b/tests/export/withvalidation/main.cue @@ -4,7 +4,7 @@ test: { string =~"^some.+" - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/export/yaml/main.cue b/tests/export/yaml/main.cue index 07bdefb0..519773e3 100644 --- a/tests/export/yaml/main.cue +++ b/tests/export/yaml/main.cue @@ -3,7 +3,7 @@ package testing testScalar: { bool - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" @@ -30,7 +30,7 @@ testScalar: { // testList: { // [...string] -// #dagger: compute: [ +// #compute: [ // { // do: "fetch-container" // ref: "alpine" @@ -54,7 +54,7 @@ testScalar: { // ] // } -testMap: #dagger: compute: [ +testMap: #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/fetch-container/exist/main.cue b/tests/fetch-container/exist/main.cue index 14ba7177..3ca1665b 100644 --- a/tests/fetch-container/exist/main.cue +++ b/tests/fetch-container/exist/main.cue @@ -1,34 +1,34 @@ package testing -busybox1: #dagger: compute: [ +busybox1: #compute: [ { do: "fetch-container" ref: "busybox" }, ] -busybox2: #dagger: compute: [ +busybox2: #compute: [ { do: "fetch-container" ref: "busybox:latest" }, ] -busybox3: #dagger: compute: [ +busybox3: #compute: [ { do: "fetch-container" ref: "busybox:1.33-musl" }, ] -busybox4: #dagger: compute: [ +busybox4: #compute: [ { do: "fetch-container" ref: "busybox@sha256:e2af53705b841ace3ab3a44998663d4251d33ee8a9acaf71b66df4ae01c3bbe7" }, ] -busybox5: #dagger: compute: [ +busybox5: #compute: [ { do: "fetch-container" ref: "busybox:1.33-musl@sha256:e2af53705b841ace3ab3a44998663d4251d33ee8a9acaf71b66df4ae01c3bbe7" diff --git a/tests/fetch-container/invalid/main.cue b/tests/fetch-container/invalid/main.cue index b248e1f7..0fa2b1ea 100644 --- a/tests/fetch-container/invalid/main.cue +++ b/tests/fetch-container/invalid/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" }, diff --git a/tests/fetch-container/nonexistent/digest/main.cue b/tests/fetch-container/nonexistent/digest/main.cue index 5ea3c46d..908a184a 100644 --- a/tests/fetch-container/nonexistent/digest/main.cue +++ b/tests/fetch-container/nonexistent/digest/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine@sha256:c6c7524e2111f22a9f7577211232d89a9e68cf5b9ed4a41ba77957c9771380a5" diff --git a/tests/fetch-container/nonexistent/image-with-valid-digest/main.cue b/tests/fetch-container/nonexistent/image-with-valid-digest/main.cue index c0c1b8bb..9ac390f9 100644 --- a/tests/fetch-container/nonexistent/image-with-valid-digest/main.cue +++ b/tests/fetch-container/nonexistent/image-with-valid-digest/main.cue @@ -2,7 +2,7 @@ package testing // XXX WATCHOUT // Once buildkit has pulled that digest, it will stay cached and happily succeed WHATEVER the image name then is -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "busyboxaaa@sha256:e2af53705b841ace3ab3a44998663d4251d33ee8a9acaf71b66df4ae01c3bbe7" diff --git a/tests/fetch-container/nonexistent/image/main.cue b/tests/fetch-container/nonexistent/image/main.cue index 6aff0857..8beed121 100644 --- a/tests/fetch-container/nonexistent/image/main.cue +++ b/tests/fetch-container/nonexistent/image/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "doesnotexist" diff --git a/tests/fetch-container/nonexistent/tag/main.cue b/tests/fetch-container/nonexistent/tag/main.cue index 4db028a8..56bc4c21 100644 --- a/tests/fetch-container/nonexistent/tag/main.cue +++ b/tests/fetch-container/nonexistent/tag/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "alpine:doesnotexist" diff --git a/tests/fetch-git/exist/main.cue b/tests/fetch-git/exist/main.cue index b8022d5e..da57e81b 100644 --- a/tests/fetch-git/exist/main.cue +++ b/tests/fetch-git/exist/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-git" remote: "https://github.com/blocklayerhq/acme-clothing.git" diff --git a/tests/fetch-git/invalid/main.cue b/tests/fetch-git/invalid/main.cue index 60f9ec17..1353d913 100644 --- a/tests/fetch-git/invalid/main.cue +++ b/tests/fetch-git/invalid/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-git" }, diff --git a/tests/fetch-git/nonexistent/bork/main.cue b/tests/fetch-git/nonexistent/bork/main.cue index a9ddbb6b..c7fc3e90 100644 --- a/tests/fetch-git/nonexistent/bork/main.cue +++ b/tests/fetch-git/nonexistent/bork/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-git" remote: "pork://pork" diff --git a/tests/fetch-git/nonexistent/ref/main.cue b/tests/fetch-git/nonexistent/ref/main.cue index 834bc0d3..d2ec9db5 100644 --- a/tests/fetch-git/nonexistent/ref/main.cue +++ b/tests/fetch-git/nonexistent/ref/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-git" remote: "https://github.com/blocklayerhq/acme-clothing.git" diff --git a/tests/fetch-git/nonexistent/remote/main.cue b/tests/fetch-git/nonexistent/remote/main.cue index b78cf90b..6a8790bf 100644 --- a/tests/fetch-git/nonexistent/remote/main.cue +++ b/tests/fetch-git/nonexistent/remote/main.cue @@ -1,6 +1,6 @@ package testing -#dagger: compute: [ +#compute: [ { do: "fetch-git" remote: "https://github.com/blocklayerhq/lalalala.git" diff --git a/tests/input/default/main.cue b/tests/input/default/main.cue index a9f82425..7e57757a 100644 --- a/tests/input/default/main.cue +++ b/tests/input/default/main.cue @@ -5,7 +5,7 @@ X1=in: string | *"default input" test: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/input/simple/main.cue b/tests/input/simple/main.cue index 5364d6d9..3eee3b25 100644 --- a/tests/input/simple/main.cue +++ b/tests/input/simple/main.cue @@ -5,7 +5,7 @@ X1=in: string test: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/load/invalid/cache/main.cue b/tests/load/invalid/cache/main.cue index d267a518..17ac844b 100644 --- a/tests/load/invalid/cache/main.cue +++ b/tests/load/invalid/cache/main.cue @@ -3,7 +3,7 @@ package testing test1: { string - #dagger: compute: [ + #compute: [ { do: "load" from: [{do: "fetch-container", ref: "alpine"}] @@ -19,7 +19,7 @@ test1: { test2: { string - #dagger: compute: [ + #compute: [ { do: "load" from: [{do: "fetch-container", ref: "busybox"}] diff --git a/tests/load/valid/component/main.cue b/tests/load/valid/component/main.cue index 172c9208..cf381580 100644 --- a/tests/load/valid/component/main.cue +++ b/tests/load/valid/component/main.cue @@ -1,6 +1,6 @@ package testing -component: #dagger: compute: [{ +component: #compute: [{ do: "fetch-container" ref: "alpine" }, { @@ -14,7 +14,7 @@ component: #dagger: compute: [{ test1: { string - #dagger: compute: [ + #compute: [ { do: "load" from: component @@ -30,10 +30,10 @@ test1: { test2: { string - #dagger: compute: [ + #compute: [ { do: "load" - from: #dagger: compute: [{ + from: #compute: [{ do: "fetch-container" ref: "alpine" }, { diff --git a/tests/load/valid/script/main.cue b/tests/load/valid/script/main.cue index aa1a36e6..3c690305 100644 --- a/tests/load/valid/script/main.cue +++ b/tests/load/valid/script/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #dagger: compute: [ + #compute: [ { do: "load" from: [{do: "fetch-container", ref: "alpine"}] diff --git a/tests/mounts/valid/cache/main.cue b/tests/mounts/valid/cache/main.cue index 8ec463d3..1eff063d 100644 --- a/tests/mounts/valid/cache/main.cue +++ b/tests/mounts/valid/cache/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #dagger: compute: [ + #compute: [ { do: "load" from: [{do: "fetch-container", ref: "alpine"}] diff --git a/tests/mounts/valid/component/main.cue b/tests/mounts/valid/component/main.cue index d592b42b..a4dcf859 100644 --- a/tests/mounts/valid/component/main.cue +++ b/tests/mounts/valid/component/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #dagger: compute: [ + #compute: [ { do: "load" from: [{do: "fetch-container", ref: "alpine"}] @@ -13,8 +13,8 @@ test: { args: ["sh", "-c", """ cat /mnt/test/lol > /out """] - mount: "/mnt/test": { - from: #dagger: compute: [ + mount: "/mnt/test": from: { + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/mounts/valid/script/main.cue b/tests/mounts/valid/script/main.cue index 781e5c52..1bc06c52 100644 --- a/tests/mounts/valid/script/main.cue +++ b/tests/mounts/valid/script/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #dagger: compute: [ + #compute: [ { do: "load" from: [{do: "fetch-container", ref: "alpine"}] diff --git a/tests/mounts/valid/tmpfs/main.cue b/tests/mounts/valid/tmpfs/main.cue index 636a68cc..21af5c98 100644 --- a/tests/mounts/valid/tmpfs/main.cue +++ b/tests/mounts/valid/tmpfs/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #dagger: compute: [ + #compute: [ { do: "load" from: [{do: "fetch-container", ref: "alpine"}] diff --git a/tests/repro-19/main.cue b/tests/repro-19/main.cue index 3016d7d9..65694195 100644 --- a/tests/repro-19/main.cue +++ b/tests/repro-19/main.cue @@ -1,6 +1,6 @@ package test -#dagger: compute: [ +#compute: [ { do: "fetch-container" ref: "busybox" diff --git a/tests/subdir/simple/main.cue b/tests/subdir/simple/main.cue index 59ed8417..adca198a 100644 --- a/tests/subdir/simple/main.cue +++ b/tests/subdir/simple/main.cue @@ -3,7 +3,7 @@ package main hello: { string - #dagger: compute: [ + #compute: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/test.sh b/tests/test.sh index 30ac0984..f6bf3b26 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -43,13 +43,9 @@ test::compute(){ "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/compute/invalid/int test::one "Compute: invalid struct should fail" --exit=1 --stdout= \ "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/compute/invalid/struct - disable test::one "Compute: overloading #ComponentScript with new prop should fail (FIXME: unauthorized fields are not checked)" --exit=1 \ - "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/compute/invalid/overload/new_prop - test::one "Compute: overloading #ComponentScript with new def should succeed" --exit=0 \ - "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/compute/invalid/overload/new_def # Compute: success - test::one "Compute: noop should succeed" --exit=0 --stdout='{"empty":{},"realempty":{}}' \ + test::one "Compute: noop should succeed" --exit=0 --stdout='{"empty":{}}' \ "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/compute/success/noop test::one "Compute: simple should succeed" --exit=0 --stdout="{}" \ "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/compute/success/simple