From c16455249e5e5c7d9d18aa1344b71dab13fb37a8 Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Fri, 2 Apr 2021 15:00:30 -0700 Subject: [PATCH] cue files: #compute -> #up Signed-off-by: Andrea Luzzardi --- stdlib/alpine/alpine.cue | 2 +- stdlib/aws/aws.cue | 2 +- stdlib/aws/cloudformation/cloudformation.cue | 2 +- stdlib/aws/eks/eks.cue | 2 +- stdlib/dagger/dagger.cue | 2 +- stdlib/docker/docker.cue | 6 +++--- stdlib/file/file.cue | 8 ++++---- stdlib/git/git.cue | 2 +- stdlib/go/go.cue | 4 ++-- stdlib/kubernetes/helm/helm.cue | 2 +- stdlib/kubernetes/kubernetes.cue | 4 ++-- stdlib/llb/llb.cue | 3 --- stdlib/netlify/netlify.cue | 2 +- stdlib/yarn/yarn.cue | 2 +- tests/cli/simple/main.cue | 2 +- .../dependencies/interpolation/main.cue | 4 ++-- tests/compute/dependencies/simple/main.cue | 4 ++-- tests/compute/dependencies/unmarshal/main.cue | 4 ++-- tests/compute/ignore/main.cue | 2 +- tests/compute/input/default/main.cue | 2 +- tests/compute/input/simple/main.cue | 2 +- tests/compute/invalid/bool/main.cue | 2 +- tests/compute/invalid/int/main.cue | 2 +- tests/compute/invalid/string/main.cue | 2 +- tests/compute/invalid/struct/main.cue | 2 +- tests/compute/success/noop/main.cue | 2 +- tests/compute/success/overload/flat/main.cue | 2 +- .../compute/success/overload/wrapped/main.cue | 2 +- tests/compute/success/simple/main.cue | 2 +- tests/llb/copy/invalid/cache/main.cue | 4 ++-- tests/llb/copy/valid/component/main.cue | 8 ++++---- tests/llb/copy/valid/script/main.cue | 2 +- tests/llb/dockerbuild/main.cue | 16 +++++++-------- tests/llb/exec/always/main.cue | 2 +- tests/llb/exec/dir/doesnotexist/main.cue | 2 +- tests/llb/exec/dir/exist/main.cue | 2 +- tests/llb/exec/env/invalid/main.cue | 2 +- tests/llb/exec/env/overlay/main.cue | 2 +- tests/llb/exec/env/valid/main.cue | 2 +- tests/llb/exec/error/main.cue | 2 +- tests/llb/exec/exit_code/main.cue | 2 +- tests/llb/exec/invalid/main.cue | 2 +- tests/llb/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 | 2 +- .../llb/exec/undefined/with_pkg_def/main.cue | 2 +- .../pkg/dagger.io/nonoptional/main.cue | 2 +- .../undefined/with_pkg_mandatory/main.cue | 2 +- .../cue.mod/pkg/dagger.io/optional/main.cue | 2 +- .../exec/undefined/with_pkg_optional/main.cue | 2 +- tests/llb/export/bool/main.cue | 2 +- tests/llb/export/concurrency/main.cue | 20 +++++++++---------- tests/llb/export/float/main.cue | 2 +- tests/llb/export/invalid/format/main.cue | 2 +- tests/llb/export/invalid/path/main.cue | 2 +- tests/llb/export/invalid/validation/main.cue | 2 +- tests/llb/export/json/main.cue | 6 +++--- tests/llb/export/number/main.cue | 2 +- tests/llb/export/string/main.cue | 2 +- tests/llb/export/withvalidation/main.cue | 2 +- tests/llb/export/yaml/main.cue | 6 +++--- tests/llb/fetch-container/exist/main.cue | 10 +++++----- tests/llb/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/llb/fetch-git/exist/main.cue | 2 +- tests/llb/fetch-git/invalid/main.cue | 2 +- tests/llb/fetch-git/nonexistent/bork/main.cue | 2 +- tests/llb/fetch-git/nonexistent/ref/main.cue | 2 +- .../llb/fetch-git/nonexistent/remote/main.cue | 2 +- tests/llb/load/invalid/cache/main.cue | 4 ++-- tests/llb/load/valid/component/main.cue | 8 ++++---- tests/llb/load/valid/script/main.cue | 2 +- tests/llb/mounts/valid/cache/main.cue | 2 +- tests/llb/mounts/valid/component/main.cue | 4 ++-- tests/llb/mounts/valid/script/main.cue | 2 +- tests/llb/mounts/valid/tmpfs/main.cue | 2 +- tests/llb/push-container/main.cue | 8 ++++---- tests/llb/subdir/simple/main.cue | 2 +- tests/stdlib/alpine/alpine.cue | 4 ++-- tests/stdlib/file/file.cue | 6 +++--- tests/stdlib/go/go.cue | 2 +- tests/stdlib/netlify/netlify.cue | 6 +++--- tests/stdlib/yarn/yarn.cue | 2 +- 87 files changed, 137 insertions(+), 140 deletions(-) diff --git a/stdlib/alpine/alpine.cue b/stdlib/alpine/alpine.cue index f30d4b13..e9489898 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 - #compute: [ + #up: [ llb.#FetchContainer & { ref: "index.docker.io/alpine:\(version)" }, diff --git a/stdlib/aws/aws.cue b/stdlib/aws/aws.cue index 4f6bbf6c..829eceeb 100644 --- a/stdlib/aws/aws.cue +++ b/stdlib/aws/aws.cue @@ -18,7 +18,7 @@ import ( // Re-usable aws-cli component #CLI: { - #compute: [ + #up: [ llb.#Load & { from: alpine.#Image & { package: bash: "=5.1.0-r0" diff --git a/stdlib/aws/cloudformation/cloudformation.cue b/stdlib/aws/cloudformation/cloudformation.cue index 43d3e52f..e5dc1fc1 100644 --- a/stdlib/aws/cloudformation/cloudformation.cue +++ b/stdlib/aws/cloudformation/cloudformation.cue @@ -46,7 +46,7 @@ import ( outputs: [string]: string - outputs: #compute: [ + outputs: #up: [ llb.#Load & { from: aws.#CLI }, diff --git a/stdlib/aws/eks/eks.cue b/stdlib/aws/eks/eks.cue index 7325cb7f..64c8a476 100644 --- a/stdlib/aws/eks/eks.cue +++ b/stdlib/aws/eks/eks.cue @@ -21,7 +21,7 @@ import ( kubeconfig: { dagger.#Secret - #compute: [ + #up: [ llb.#Load & { from: aws.#CLI }, diff --git a/stdlib/dagger/dagger.cue b/stdlib/dagger/dagger.cue index 6135047f..320fdbf7 100644 --- a/stdlib/dagger/dagger.cue +++ b/stdlib/dagger/dagger.cue @@ -7,7 +7,7 @@ import ( // An artifact such as source code checkout, container image, binary archive... // May be passed as user input, or computed by a buildkit pipeline #Artifact: { - #up: llb.#Pipeline + #up: [...llb.#Op] _ ... } diff --git a/stdlib/docker/docker.cue b/stdlib/docker/docker.cue index fee51bf6..58f22cd9 100644 --- a/stdlib/docker/docker.cue +++ b/stdlib/docker/docker.cue @@ -11,7 +11,7 @@ import ( #Build: { source: dagger.#Artifact - image: #compute: [ + image: #up: [ llb.#DockerBuild & {context: source}, ] } @@ -22,14 +22,14 @@ import ( // image may be a remote image ref, or a computed artifact { image: #Ref - out: #compute: [ + out: #up: [ llb.#FetchContainer & {ref: image}, llb.#Exec & {"args": args}, ] } | { image: _ - out: #compute: [ + out: #up: [ llb.#Load & {from: image}, llb.#Exec & {"args": args}, ] diff --git a/stdlib/file/file.cue b/stdlib/file/file.cue index 597238f9..efa00027 100644 --- a/stdlib/file/file.cue +++ b/stdlib/file/file.cue @@ -11,7 +11,7 @@ import ( permissions: int | *0o644 contents: string | bytes - #compute: [ + #up: [ llb.#WriteFile & {dest: filename, content: contents, mode: permissions}, ] } @@ -24,7 +24,7 @@ import ( orig: (#read & {path: filename, "from": from}).data - #compute: [ + #up: [ llb.#WriteFile & {dest: filename, content: "\(orig)\(contents)", mode: permissions}, ] } @@ -40,7 +40,7 @@ import ( from: dagger.#Artifact data: { string - #compute: [ + #up: [ llb.#Load & {"from": from}, llb.#Export & {source: path}, ] @@ -62,7 +62,7 @@ _#glob: { data: { string _tmppath: "/tmp/ls.out" - #compute: [ + #up: [ llb.#Load & {"from": from}, llb.#Exec & { args: ["sh", "-c", "ls \(glob) > \(_tmppath)"] diff --git a/stdlib/git/git.cue b/stdlib/git/git.cue index a91343ce..b7c716d9 100644 --- a/stdlib/git/git.cue +++ b/stdlib/git/git.cue @@ -10,7 +10,7 @@ import ( remote: string ref: string - #compute: [ + #up: [ llb.#FetchGit & { "remote": remote "ref": ref diff --git a/stdlib/go/go.cue b/stdlib/go/go.cue index 8192b6be..1a912d47 100644 --- a/stdlib/go/go.cue +++ b/stdlib/go/go.cue @@ -18,7 +18,7 @@ import ( // Environment variables env: [string]: string - #compute: [ + #up: [ llb.#FetchContainer & { ref: "docker.io/golang:\(version)-alpine" }, @@ -63,7 +63,7 @@ import ( env: [string]: string - #compute: [ + #up: [ llb.#Copy & { from: #Go & { "version": version diff --git a/stdlib/kubernetes/helm/helm.cue b/stdlib/kubernetes/helm/helm.cue index 54e0805e..0586f2aa 100644 --- a/stdlib/kubernetes/helm/helm.cue +++ b/stdlib/kubernetes/helm/helm.cue @@ -50,7 +50,7 @@ import ( // Kubectl version kubectlVersion: *"v1.19.9" | string - #compute: [ + #up: [ llb.#Load & { from: kubernetes.#Kubectl & { version: kubectlVersion diff --git a/stdlib/kubernetes/kubernetes.cue b/stdlib/kubernetes/kubernetes.cue index 23e6959d..bf5edee2 100644 --- a/stdlib/kubernetes/kubernetes.cue +++ b/stdlib/kubernetes/kubernetes.cue @@ -17,7 +17,7 @@ import ( } """# - #compute: [ + #up: [ llb.#Load & { from: alpine.#Image & { package: bash: "=5.1.0-r0" @@ -62,7 +62,7 @@ import ( kubectl --namespace "$KUBE_NAMESPACE" apply -R -f /source """# - #compute: [ + #up: [ llb.#Load & { from: #Kubectl & {"version": version} }, diff --git a/stdlib/llb/llb.cue b/stdlib/llb/llb.cue index c7830da3..ea077a3c 100644 --- a/stdlib/llb/llb.cue +++ b/stdlib/llb/llb.cue @@ -15,9 +15,6 @@ package llb #Mkdir | #DockerBuild -// Pipeline is a series of operations -#Pipeline: [...llb.#Op] - // Export a value from fs state to cue #Export: { do: "export" diff --git a/stdlib/netlify/netlify.cue b/stdlib/netlify/netlify.cue index 6d1c45a0..6a105d39 100644 --- a/stdlib/netlify/netlify.cue +++ b/stdlib/netlify/netlify.cue @@ -42,7 +42,7 @@ import ( // Logs URL for this deployment logsUrl: string - #compute: [ + #up: [ llb.#Load & { from: alpine.#Image & { package: bash: "=~5.1" diff --git a/stdlib/yarn/yarn.cue b/stdlib/yarn/yarn.cue index 329a3b7b..dc84724f 100644 --- a/stdlib/yarn/yarn.cue +++ b/stdlib/yarn/yarn.cue @@ -21,7 +21,7 @@ import ( // Set these environment variables during the build env?: [string]: string - #compute: [ + #up: [ llb.#Load & { from: alpine.#Image & { package: bash: "=~5.1" diff --git a/tests/cli/simple/main.cue b/tests/cli/simple/main.cue index fa4c4d32..f4ca27b7 100644 --- a/tests/cli/simple/main.cue +++ b/tests/cli/simple/main.cue @@ -5,7 +5,7 @@ import "dagger.io/llb" foo: "value" bar: "another value" -#compute: [ +#up: [ llb.#FetchContainer & {ref: "busybox"}, llb.#Exec & {args: ["true"]}, ] diff --git a/tests/compute/dependencies/interpolation/main.cue b/tests/compute/dependencies/interpolation/main.cue index 92b0ae3b..9a27b6db 100644 --- a/tests/compute/dependencies/interpolation/main.cue +++ b/tests/compute/dependencies/interpolation/main.cue @@ -3,7 +3,7 @@ package testing A: { result: string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -28,7 +28,7 @@ A: { B: { result: string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/compute/dependencies/simple/main.cue b/tests/compute/dependencies/simple/main.cue index 3ee533b9..445192a6 100644 --- a/tests/compute/dependencies/simple/main.cue +++ b/tests/compute/dependencies/simple/main.cue @@ -3,7 +3,7 @@ package testing A: { result: string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -28,7 +28,7 @@ A: { B: { result: string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/compute/dependencies/unmarshal/main.cue b/tests/compute/dependencies/unmarshal/main.cue index c3f65042..698d159a 100644 --- a/tests/compute/dependencies/unmarshal/main.cue +++ b/tests/compute/dependencies/unmarshal/main.cue @@ -5,7 +5,7 @@ import "encoding/json" A: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -32,7 +32,7 @@ unmarshalled: json.Unmarshal(A) B: { result: string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/compute/ignore/main.cue b/tests/compute/ignore/main.cue index 6f071151..1f625458 100644 --- a/tests/compute/ignore/main.cue +++ b/tests/compute/ignore/main.cue @@ -18,7 +18,7 @@ _expected: """ TestIgnore: { string - #compute: [ + #up: [ llb.#Load & {from: alpine.#Image}, llb.#Exec & { args: ["sh", "-c", "ls /src/* > /out.txt"] diff --git a/tests/compute/input/default/main.cue b/tests/compute/input/default/main.cue index 7e57757a..29cc48df 100644 --- a/tests/compute/input/default/main.cue +++ b/tests/compute/input/default/main.cue @@ -5,7 +5,7 @@ X1=in: string | *"default input" test: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/compute/input/simple/main.cue b/tests/compute/input/simple/main.cue index 3eee3b25..5e71cc43 100644 --- a/tests/compute/input/simple/main.cue +++ b/tests/compute/input/simple/main.cue @@ -5,7 +5,7 @@ X1=in: string test: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/compute/invalid/bool/main.cue b/tests/compute/invalid/bool/main.cue index 9b70a3a1..a6a4e782 100644 --- a/tests/compute/invalid/bool/main.cue +++ b/tests/compute/invalid/bool/main.cue @@ -1,3 +1,3 @@ package testing -#compute: true +#up: true diff --git a/tests/compute/invalid/int/main.cue b/tests/compute/invalid/int/main.cue index d4b11853..4539e0ae 100644 --- a/tests/compute/invalid/int/main.cue +++ b/tests/compute/invalid/int/main.cue @@ -1,3 +1,3 @@ package testing -#compute: 123 +#up: 123 diff --git a/tests/compute/invalid/string/main.cue b/tests/compute/invalid/string/main.cue index c43ed4df..5590b999 100644 --- a/tests/compute/invalid/string/main.cue +++ b/tests/compute/invalid/string/main.cue @@ -1,3 +1,3 @@ package testing -#compute: "whatever" +#up: "whatever" diff --git a/tests/compute/invalid/struct/main.cue b/tests/compute/invalid/struct/main.cue index e5e8e7c2..7d900376 100644 --- a/tests/compute/invalid/struct/main.cue +++ b/tests/compute/invalid/struct/main.cue @@ -1,3 +1,3 @@ package testing -#compute: whatever: "wrong" +#up: whatever: "wrong" diff --git a/tests/compute/success/noop/main.cue b/tests/compute/success/noop/main.cue index 16e32b81..9c5590fa 100644 --- a/tests/compute/success/noop/main.cue +++ b/tests/compute/success/noop/main.cue @@ -2,5 +2,5 @@ package testing // no-op, should not error empty: { - #compute: [] + #up: [] } diff --git a/tests/compute/success/overload/flat/main.cue b/tests/compute/success/overload/flat/main.cue index 7843e723..03cb52ed 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 -#compute: [{ +#up: [{ do: "fetch-container" ref: "busybox" }, diff --git a/tests/compute/success/overload/wrapped/main.cue b/tests/compute/success/overload/wrapped/main.cue index 43aec189..3fe6e1dc 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 - #compute: [{ + #up: [{ do: "fetch-container" ref: "busybox" }, diff --git a/tests/compute/success/simple/main.cue b/tests/compute/success/simple/main.cue index 717e6d32..09956ed1 100644 --- a/tests/compute/success/simple/main.cue +++ b/tests/compute/success/simple/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" ref: "busybox" diff --git a/tests/llb/copy/invalid/cache/main.cue b/tests/llb/copy/invalid/cache/main.cue index 9c1bb443..9f15e987 100644 --- a/tests/llb/copy/invalid/cache/main.cue +++ b/tests/llb/copy/invalid/cache/main.cue @@ -3,7 +3,7 @@ package testing test1: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "busybox" @@ -25,7 +25,7 @@ test1: { test2: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "busybox" diff --git a/tests/llb/copy/valid/component/main.cue b/tests/llb/copy/valid/component/main.cue index 0f1d147e..99e0139f 100644 --- a/tests/llb/copy/valid/component/main.cue +++ b/tests/llb/copy/valid/component/main.cue @@ -1,6 +1,6 @@ package testing -component: #compute: [{ +component: #up: [{ do: "fetch-container" ref: "alpine" }, { @@ -14,7 +14,7 @@ component: #compute: [{ test1: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "busybox" @@ -36,14 +36,14 @@ test1: { test2: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "busybox" }, { do: "copy" - from: #compute: [{ + from: #up: [{ do: "fetch-container" ref: "alpine" }, { diff --git a/tests/llb/copy/valid/script/main.cue b/tests/llb/copy/valid/script/main.cue index 4daea4f3..0f6bb202 100644 --- a/tests/llb/copy/valid/script/main.cue +++ b/tests/llb/copy/valid/script/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "busybox" diff --git a/tests/llb/dockerbuild/main.cue b/tests/llb/dockerbuild/main.cue index 6c33dd32..3bfbee11 100644 --- a/tests/llb/dockerbuild/main.cue +++ b/tests/llb/dockerbuild/main.cue @@ -8,7 +8,7 @@ import ( // Set to `--input-dir=./tests/dockerbuild/testdata` TestData: dagger.#Artifact -TestInlinedDockerfile: #compute: [ +TestInlinedDockerfile: #up: [ llb.#DockerBuild & { dockerfile: """ FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d @@ -17,7 +17,7 @@ TestInlinedDockerfile: #compute: [ }, ] -TestOpChaining: #compute: [ +TestOpChaining: #up: [ llb.#DockerBuild & { dockerfile: """ FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d @@ -29,7 +29,7 @@ TestOpChaining: #compute: [ }, ] -TestBuildContext: #compute: [ +TestBuildContext: #up: [ llb.#DockerBuild & { context: TestData }, @@ -38,7 +38,7 @@ TestBuildContext: #compute: [ }, ] -TestBuildContextAndDockerfile: #compute: [ +TestBuildContextAndDockerfile: #up: [ llb.#DockerBuild & { context: TestData dockerfile: """ @@ -51,7 +51,7 @@ TestBuildContextAndDockerfile: #compute: [ }, ] -TestDockerfilePath: #compute: [ +TestDockerfilePath: #up: [ llb.#DockerBuild & { context: TestData dockerfilePath: "./dockerfilepath/Dockerfile.custom" @@ -61,7 +61,7 @@ TestDockerfilePath: #compute: [ }, ] -TestBuildArgs: #compute: [ +TestBuildArgs: #up: [ llb.#DockerBuild & { dockerfile: """ FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d @@ -73,7 +73,7 @@ TestBuildArgs: #compute: [ ] // FIXME: this doesn't test anything beside not crashing -TestBuildLabels: #compute: [ +TestBuildLabels: #up: [ llb.#DockerBuild & { dockerfile: """ FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d @@ -83,7 +83,7 @@ TestBuildLabels: #compute: [ ] // FIXME: this doesn't test anything beside not crashing -TestBuildPlatform: #compute: [ +TestBuildPlatform: #up: [ llb.#DockerBuild & { dockerfile: """ FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d diff --git a/tests/llb/exec/always/main.cue b/tests/llb/exec/always/main.cue index 082d56d6..208717ef 100644 --- a/tests/llb/exec/always/main.cue +++ b/tests/llb/exec/always/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/dir/doesnotexist/main.cue b/tests/llb/exec/dir/doesnotexist/main.cue index 26729545..d8198555 100644 --- a/tests/llb/exec/dir/doesnotexist/main.cue +++ b/tests/llb/exec/dir/doesnotexist/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/dir/exist/main.cue b/tests/llb/exec/dir/exist/main.cue index 9564d9da..2049c10f 100644 --- a/tests/llb/exec/dir/exist/main.cue +++ b/tests/llb/exec/dir/exist/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/env/invalid/main.cue b/tests/llb/exec/env/invalid/main.cue index 36ea906d..1e1950f1 100644 --- a/tests/llb/exec/env/invalid/main.cue +++ b/tests/llb/exec/env/invalid/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/env/overlay/main.cue b/tests/llb/exec/env/overlay/main.cue index 4313b67e..d3c8c3c4 100644 --- a/tests/llb/exec/env/overlay/main.cue +++ b/tests/llb/exec/env/overlay/main.cue @@ -2,7 +2,7 @@ package testing bar: string -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/env/valid/main.cue b/tests/llb/exec/env/valid/main.cue index f96e54c8..6b0cd61e 100644 --- a/tests/llb/exec/env/valid/main.cue +++ b/tests/llb/exec/env/valid/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/error/main.cue b/tests/llb/exec/error/main.cue index fca3285a..72cf9469 100644 --- a/tests/llb/exec/error/main.cue +++ b/tests/llb/exec/error/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/exit_code/main.cue b/tests/llb/exec/exit_code/main.cue index fcffa58c..385392eb 100644 --- a/tests/llb/exec/exit_code/main.cue +++ b/tests/llb/exec/exit_code/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/invalid/main.cue b/tests/llb/exec/invalid/main.cue index 67650476..577e3544 100644 --- a/tests/llb/exec/invalid/main.cue +++ b/tests/llb/exec/invalid/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/simple/main.cue b/tests/llb/exec/simple/main.cue index 8a0b64d5..5166e3d2 100644 --- a/tests/llb/exec/simple/main.cue +++ b/tests/llb/exec/simple/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/undefined/non_concrete_not_referenced/main.cue b/tests/llb/exec/undefined/non_concrete_not_referenced/main.cue index df40cdd1..d0aa3d65 100644 --- a/tests/llb/exec/undefined/non_concrete_not_referenced/main.cue +++ b/tests/llb/exec/undefined/non_concrete_not_referenced/main.cue @@ -3,7 +3,7 @@ package testing hello: "world" bar: string -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/undefined/non_concrete_referenced/main.cue b/tests/llb/exec/undefined/non_concrete_referenced/main.cue index 943798b1..93c40120 100644 --- a/tests/llb/exec/undefined/non_concrete_referenced/main.cue +++ b/tests/llb/exec/undefined/non_concrete_referenced/main.cue @@ -3,7 +3,7 @@ package testing hello: "world" bar: string -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/undefined/with_pkg_def/cue.mod/pkg/dagger.io/def/main.cue b/tests/llb/exec/undefined/with_pkg_def/cue.mod/pkg/dagger.io/def/main.cue index e5a90e2d..2f3a74a8 100644 --- a/tests/llb/exec/undefined/with_pkg_def/cue.mod/pkg/dagger.io/def/main.cue +++ b/tests/llb/exec/undefined/with_pkg_def/cue.mod/pkg/dagger.io/def/main.cue @@ -2,7 +2,7 @@ package def #dang: string -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/undefined/with_pkg_def/main.cue b/tests/llb/exec/undefined/with_pkg_def/main.cue index ffcc417a..dfb1d73e 100644 --- a/tests/llb/exec/undefined/with_pkg_def/main.cue +++ b/tests/llb/exec/undefined/with_pkg_def/main.cue @@ -4,7 +4,7 @@ import ( "dagger.io/def" ) -#compute: [ +#up: [ { do: "load", from: def diff --git a/tests/llb/exec/undefined/with_pkg_mandatory/cue.mod/pkg/dagger.io/nonoptional/main.cue b/tests/llb/exec/undefined/with_pkg_mandatory/cue.mod/pkg/dagger.io/nonoptional/main.cue index eaa3d07a..13c1711b 100644 --- a/tests/llb/exec/undefined/with_pkg_mandatory/cue.mod/pkg/dagger.io/nonoptional/main.cue +++ b/tests/llb/exec/undefined/with_pkg_mandatory/cue.mod/pkg/dagger.io/nonoptional/main.cue @@ -2,7 +2,7 @@ package nonoptional dang: string -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/undefined/with_pkg_mandatory/main.cue b/tests/llb/exec/undefined/with_pkg_mandatory/main.cue index 1b660e96..c6c6e400 100644 --- a/tests/llb/exec/undefined/with_pkg_mandatory/main.cue +++ b/tests/llb/exec/undefined/with_pkg_mandatory/main.cue @@ -4,7 +4,7 @@ import ( "dagger.io/nonoptional" ) -#compute: [ +#up: [ { do: "load", from: nonoptional diff --git a/tests/llb/exec/undefined/with_pkg_optional/cue.mod/pkg/dagger.io/optional/main.cue b/tests/llb/exec/undefined/with_pkg_optional/cue.mod/pkg/dagger.io/optional/main.cue index 53a06b8f..c171f2e6 100644 --- a/tests/llb/exec/undefined/with_pkg_optional/cue.mod/pkg/dagger.io/optional/main.cue +++ b/tests/llb/exec/undefined/with_pkg_optional/cue.mod/pkg/dagger.io/optional/main.cue @@ -2,7 +2,7 @@ package optional dang?: string -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/exec/undefined/with_pkg_optional/main.cue b/tests/llb/exec/undefined/with_pkg_optional/main.cue index 186237e2..349fdeb5 100644 --- a/tests/llb/exec/undefined/with_pkg_optional/main.cue +++ b/tests/llb/exec/undefined/with_pkg_optional/main.cue @@ -4,7 +4,7 @@ import ( "dagger.io/optional" ) -#compute: [ +#up: [ { do: "load", from: optional diff --git a/tests/llb/export/bool/main.cue b/tests/llb/export/bool/main.cue index 950fe188..f30e94bf 100644 --- a/tests/llb/export/bool/main.cue +++ b/tests/llb/export/bool/main.cue @@ -3,7 +3,7 @@ package testing test: { bool - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/export/concurrency/main.cue b/tests/llb/export/concurrency/main.cue index d847d0a5..a581cdc5 100644 --- a/tests/llb/export/concurrency/main.cue +++ b/tests/llb/export/concurrency/main.cue @@ -3,7 +3,7 @@ package testing test1: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -27,7 +27,7 @@ test1: { test2: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -51,7 +51,7 @@ test2: { test3: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -75,7 +75,7 @@ test3: { test4: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -99,7 +99,7 @@ test4: { test5: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -123,7 +123,7 @@ test5: { test6: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -147,7 +147,7 @@ test6: { test7: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -171,7 +171,7 @@ test7: { test8: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -195,7 +195,7 @@ test8: { test9: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -219,7 +219,7 @@ test9: { test10: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/export/float/main.cue b/tests/llb/export/float/main.cue index 8ef95b29..b3bc2825 100644 --- a/tests/llb/export/float/main.cue +++ b/tests/llb/export/float/main.cue @@ -3,7 +3,7 @@ package testing test: { float - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/export/invalid/format/main.cue b/tests/llb/export/invalid/format/main.cue index 128c231d..abbc2259 100644 --- a/tests/llb/export/invalid/format/main.cue +++ b/tests/llb/export/invalid/format/main.cue @@ -3,7 +3,7 @@ package testing teststring: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/export/invalid/path/main.cue b/tests/llb/export/invalid/path/main.cue index a2bc96d5..25934352 100644 --- a/tests/llb/export/invalid/path/main.cue +++ b/tests/llb/export/invalid/path/main.cue @@ -3,7 +3,7 @@ package testing teststring: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/export/invalid/validation/main.cue b/tests/llb/export/invalid/validation/main.cue index 426cee46..8de9c3f1 100644 --- a/tests/llb/export/invalid/validation/main.cue +++ b/tests/llb/export/invalid/validation/main.cue @@ -4,7 +4,7 @@ test: { string =~"^NAAAA.+" - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/export/json/main.cue b/tests/llb/export/json/main.cue index a4f2d34d..5bedf20e 100644 --- a/tests/llb/export/json/main.cue +++ b/tests/llb/export/json/main.cue @@ -3,7 +3,7 @@ package testing testScalar: { bool - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -25,7 +25,7 @@ testScalar: { ] } -testMap: #compute: [ +testMap: #up: [ { do: "fetch-container" ref: "alpine" @@ -50,7 +50,7 @@ testMap: #compute: [ // testList: { // [...string] -// #compute: [ +// #up: [ // { // do: "fetch-container" // ref: "alpine" diff --git a/tests/llb/export/number/main.cue b/tests/llb/export/number/main.cue index 79a7a0e9..11fd0c65 100644 --- a/tests/llb/export/number/main.cue +++ b/tests/llb/export/number/main.cue @@ -3,7 +3,7 @@ package testing test: { number - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/export/string/main.cue b/tests/llb/export/string/main.cue index 024d9c31..65917c83 100644 --- a/tests/llb/export/string/main.cue +++ b/tests/llb/export/string/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/export/withvalidation/main.cue b/tests/llb/export/withvalidation/main.cue index bac0f5a1..e6ddd93f 100644 --- a/tests/llb/export/withvalidation/main.cue +++ b/tests/llb/export/withvalidation/main.cue @@ -4,7 +4,7 @@ test: { string =~"^some.+" - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/export/yaml/main.cue b/tests/llb/export/yaml/main.cue index 519773e3..d6a7de34 100644 --- a/tests/llb/export/yaml/main.cue +++ b/tests/llb/export/yaml/main.cue @@ -3,7 +3,7 @@ package testing testScalar: { bool - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" @@ -30,7 +30,7 @@ testScalar: { // testList: { // [...string] -// #compute: [ +// #up: [ // { // do: "fetch-container" // ref: "alpine" @@ -54,7 +54,7 @@ testScalar: { // ] // } -testMap: #compute: [ +testMap: #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/fetch-container/exist/main.cue b/tests/llb/fetch-container/exist/main.cue index 3ca1665b..c6b44ad4 100644 --- a/tests/llb/fetch-container/exist/main.cue +++ b/tests/llb/fetch-container/exist/main.cue @@ -1,34 +1,34 @@ package testing -busybox1: #compute: [ +busybox1: #up: [ { do: "fetch-container" ref: "busybox" }, ] -busybox2: #compute: [ +busybox2: #up: [ { do: "fetch-container" ref: "busybox:latest" }, ] -busybox3: #compute: [ +busybox3: #up: [ { do: "fetch-container" ref: "busybox:1.33-musl" }, ] -busybox4: #compute: [ +busybox4: #up: [ { do: "fetch-container" ref: "busybox@sha256:e2af53705b841ace3ab3a44998663d4251d33ee8a9acaf71b66df4ae01c3bbe7" }, ] -busybox5: #compute: [ +busybox5: #up: [ { do: "fetch-container" ref: "busybox:1.33-musl@sha256:e2af53705b841ace3ab3a44998663d4251d33ee8a9acaf71b66df4ae01c3bbe7" diff --git a/tests/llb/fetch-container/invalid/main.cue b/tests/llb/fetch-container/invalid/main.cue index 0fa2b1ea..9a41348e 100644 --- a/tests/llb/fetch-container/invalid/main.cue +++ b/tests/llb/fetch-container/invalid/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" }, diff --git a/tests/llb/fetch-container/nonexistent/digest/main.cue b/tests/llb/fetch-container/nonexistent/digest/main.cue index 908a184a..6974d5da 100644 --- a/tests/llb/fetch-container/nonexistent/digest/main.cue +++ b/tests/llb/fetch-container/nonexistent/digest/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine@sha256:c6c7524e2111f22a9f7577211232d89a9e68cf5b9ed4a41ba77957c9771380a5" diff --git a/tests/llb/fetch-container/nonexistent/image-with-valid-digest/main.cue b/tests/llb/fetch-container/nonexistent/image-with-valid-digest/main.cue index 9ac390f9..a69d6fdc 100644 --- a/tests/llb/fetch-container/nonexistent/image-with-valid-digest/main.cue +++ b/tests/llb/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 -#compute: [ +#up: [ { do: "fetch-container" ref: "busyboxaaa@sha256:e2af53705b841ace3ab3a44998663d4251d33ee8a9acaf71b66df4ae01c3bbe7" diff --git a/tests/llb/fetch-container/nonexistent/image/main.cue b/tests/llb/fetch-container/nonexistent/image/main.cue index 8beed121..c85f89ce 100644 --- a/tests/llb/fetch-container/nonexistent/image/main.cue +++ b/tests/llb/fetch-container/nonexistent/image/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" ref: "doesnotexist" diff --git a/tests/llb/fetch-container/nonexistent/tag/main.cue b/tests/llb/fetch-container/nonexistent/tag/main.cue index 56bc4c21..a22f1b17 100644 --- a/tests/llb/fetch-container/nonexistent/tag/main.cue +++ b/tests/llb/fetch-container/nonexistent/tag/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-container" ref: "alpine:doesnotexist" diff --git a/tests/llb/fetch-git/exist/main.cue b/tests/llb/fetch-git/exist/main.cue index da57e81b..86fb6506 100644 --- a/tests/llb/fetch-git/exist/main.cue +++ b/tests/llb/fetch-git/exist/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-git" remote: "https://github.com/blocklayerhq/acme-clothing.git" diff --git a/tests/llb/fetch-git/invalid/main.cue b/tests/llb/fetch-git/invalid/main.cue index 1353d913..4157da11 100644 --- a/tests/llb/fetch-git/invalid/main.cue +++ b/tests/llb/fetch-git/invalid/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-git" }, diff --git a/tests/llb/fetch-git/nonexistent/bork/main.cue b/tests/llb/fetch-git/nonexistent/bork/main.cue index c7fc3e90..d59b3090 100644 --- a/tests/llb/fetch-git/nonexistent/bork/main.cue +++ b/tests/llb/fetch-git/nonexistent/bork/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-git" remote: "pork://pork" diff --git a/tests/llb/fetch-git/nonexistent/ref/main.cue b/tests/llb/fetch-git/nonexistent/ref/main.cue index d2ec9db5..9b3a9cfd 100644 --- a/tests/llb/fetch-git/nonexistent/ref/main.cue +++ b/tests/llb/fetch-git/nonexistent/ref/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-git" remote: "https://github.com/blocklayerhq/acme-clothing.git" diff --git a/tests/llb/fetch-git/nonexistent/remote/main.cue b/tests/llb/fetch-git/nonexistent/remote/main.cue index 6a8790bf..87d32a10 100644 --- a/tests/llb/fetch-git/nonexistent/remote/main.cue +++ b/tests/llb/fetch-git/nonexistent/remote/main.cue @@ -1,6 +1,6 @@ package testing -#compute: [ +#up: [ { do: "fetch-git" remote: "https://github.com/blocklayerhq/lalalala.git" diff --git a/tests/llb/load/invalid/cache/main.cue b/tests/llb/load/invalid/cache/main.cue index 17ac844b..f13957d7 100644 --- a/tests/llb/load/invalid/cache/main.cue +++ b/tests/llb/load/invalid/cache/main.cue @@ -3,7 +3,7 @@ package testing test1: { string - #compute: [ + #up: [ { do: "load" from: [{do: "fetch-container", ref: "alpine"}] @@ -19,7 +19,7 @@ test1: { test2: { string - #compute: [ + #up: [ { do: "load" from: [{do: "fetch-container", ref: "busybox"}] diff --git a/tests/llb/load/valid/component/main.cue b/tests/llb/load/valid/component/main.cue index cf381580..a9fa7341 100644 --- a/tests/llb/load/valid/component/main.cue +++ b/tests/llb/load/valid/component/main.cue @@ -1,6 +1,6 @@ package testing -component: #compute: [{ +component: #up: [{ do: "fetch-container" ref: "alpine" }, { @@ -14,7 +14,7 @@ component: #compute: [{ test1: { string - #compute: [ + #up: [ { do: "load" from: component @@ -30,10 +30,10 @@ test1: { test2: { string - #compute: [ + #up: [ { do: "load" - from: #compute: [{ + from: #up: [{ do: "fetch-container" ref: "alpine" }, { diff --git a/tests/llb/load/valid/script/main.cue b/tests/llb/load/valid/script/main.cue index 3c690305..d009ab66 100644 --- a/tests/llb/load/valid/script/main.cue +++ b/tests/llb/load/valid/script/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #compute: [ + #up: [ { do: "load" from: [{do: "fetch-container", ref: "alpine"}] diff --git a/tests/llb/mounts/valid/cache/main.cue b/tests/llb/mounts/valid/cache/main.cue index 1eff063d..7a66a40a 100644 --- a/tests/llb/mounts/valid/cache/main.cue +++ b/tests/llb/mounts/valid/cache/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #compute: [ + #up: [ { do: "load" from: [{do: "fetch-container", ref: "alpine"}] diff --git a/tests/llb/mounts/valid/component/main.cue b/tests/llb/mounts/valid/component/main.cue index 7ffa83c4..d6290440 100644 --- a/tests/llb/mounts/valid/component/main.cue +++ b/tests/llb/mounts/valid/component/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #compute: [ + #up: [ { do: "load" from: [{do: "fetch-container", ref: "alpine"}] @@ -13,7 +13,7 @@ test: { args: ["sh", "-c", """ cat /mnt/test/lol > /out """] - mount: "/mnt/test": from: #compute: [ + mount: "/mnt/test": from: #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/llb/mounts/valid/script/main.cue b/tests/llb/mounts/valid/script/main.cue index 1bc06c52..00567b0f 100644 --- a/tests/llb/mounts/valid/script/main.cue +++ b/tests/llb/mounts/valid/script/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #compute: [ + #up: [ { do: "load" from: [{do: "fetch-container", ref: "alpine"}] diff --git a/tests/llb/mounts/valid/tmpfs/main.cue b/tests/llb/mounts/valid/tmpfs/main.cue index 164a1a7c..75258d18 100644 --- a/tests/llb/mounts/valid/tmpfs/main.cue +++ b/tests/llb/mounts/valid/tmpfs/main.cue @@ -3,7 +3,7 @@ package testing test: { string - #compute: [ + #up: [ { do: "load" from: [{do: "fetch-container", ref: "alpine"}] diff --git a/tests/llb/push-container/main.cue b/tests/llb/push-container/main.cue index 04676aad..d258fbfa 100644 --- a/tests/llb/push-container/main.cue +++ b/tests/llb/push-container/main.cue @@ -9,7 +9,7 @@ TestPushContainer: { // Generate a random number random: { string - #compute: [ + #up: [ llb.#Load & {from: alpine.#Image}, llb.#Exec & { args: ["sh", "-c", "echo -n $RANDOM > /rand"] @@ -23,7 +23,7 @@ TestPushContainer: { // Push an image with a random tag push: { ref: "daggerio/ci-test:\(random)" - #compute: [ + #up: [ llb.#WriteFile & { content: random dest: "/rand" @@ -35,14 +35,14 @@ TestPushContainer: { } // Pull the image back - pull: #compute: [ + pull: #up: [ llb.#FetchContainer & { ref: push.ref }, ] // Check the content - check: #compute: [ + check: #up: [ llb.#Load & {from: alpine.#Image}, llb.#Exec & { args: [ diff --git a/tests/llb/subdir/simple/main.cue b/tests/llb/subdir/simple/main.cue index adca198a..1598e7af 100644 --- a/tests/llb/subdir/simple/main.cue +++ b/tests/llb/subdir/simple/main.cue @@ -3,7 +3,7 @@ package main hello: { string - #compute: [ + #up: [ { do: "fetch-container" ref: "alpine" diff --git a/tests/stdlib/alpine/alpine.cue b/tests/stdlib/alpine/alpine.cue index ba6d86b0..855db7de 100644 --- a/tests/stdlib/alpine/alpine.cue +++ b/tests/stdlib/alpine/alpine.cue @@ -11,7 +11,7 @@ TestImageVersion: { version: "3.10.6" } - test: #compute: [ + test: #up: [ llb.#Load & {from: image}, llb.#Exec & { args: [ @@ -31,7 +31,7 @@ TestPackageInstall: { package: curl: "=~7.74.0" } - test: #compute: [ + test: #up: [ llb.#Load & {from: image}, llb.#Exec & { args: ["jq", "--version"] diff --git a/tests/stdlib/file/file.cue b/tests/stdlib/file/file.cue index 6cdeef89..5cd9180b 100644 --- a/tests/stdlib/file/file.cue +++ b/tests/stdlib/file/file.cue @@ -14,7 +14,7 @@ TestCreate: { contents: _content } - test: #compute: [ + test: #up: [ llb.#Load & {from: alpine.#Image}, llb.#Exec & { args: [ @@ -37,7 +37,7 @@ TestRead: { filename: "/etc/alpine-release" from: alpine.#Image & {version: "3.10.6"} } - test: #compute: [ + test: #up: [ llb.#Load & {from: alpine.#Image}, llb.#Exec & { args: [ @@ -63,7 +63,7 @@ TestRead2: { from: write } - test: #compute: [ + test: #up: [ llb.#Load & {from: alpine.#Image}, llb.#Exec & { args: [ diff --git a/tests/stdlib/go/go.cue b/tests/stdlib/go/go.cue index e7acc1a1..5a6519d3 100644 --- a/tests/stdlib/go/go.cue +++ b/tests/stdlib/go/go.cue @@ -15,7 +15,7 @@ TestGoBuild: { output: "/bin/testbin" } - test: #compute: [ + test: #up: [ llb.#Load & {from: alpine.#Image}, llb.#Exec & { args: [ diff --git a/tests/stdlib/netlify/netlify.cue b/tests/stdlib/netlify/netlify.cue index 60cdef78..752926f9 100644 --- a/tests/stdlib/netlify/netlify.cue +++ b/tests/stdlib/netlify/netlify.cue @@ -10,7 +10,7 @@ TestNetlify: { // Generate a random number random: { string - #compute: [ + #up: [ llb.#Load & {from: alpine.#Image}, llb.#Exec & { args: ["sh", "-c", "echo -n $RANDOM > /rand"] @@ -22,7 +22,7 @@ TestNetlify: { } // Generate a website containing the random number - html: #compute: [ + html: #up: [ llb.#WriteFile & { content: random dest: "index.html" @@ -36,7 +36,7 @@ TestNetlify: { } // Check if the deployed site has the random marker - check: #compute: [ + check: #up: [ llb.#Load & { from: alpine.#Image & { package: bash: "=~5.1" diff --git a/tests/stdlib/yarn/yarn.cue b/tests/stdlib/yarn/yarn.cue index 5a7b9f04..a92bc548 100644 --- a/tests/stdlib/yarn/yarn.cue +++ b/tests/stdlib/yarn/yarn.cue @@ -14,7 +14,7 @@ TestYarn: { source: TestData } - test: #compute: [ + test: #up: [ llb.#Load & {from: alpine.#Image & { package: bash: "=5.1.0-r0" }},