tests: migrate ops test to bats

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>

tests/helpers.bash

@@ -10,3 +10,8 @@ common_setup() {
     DAGGER_STORE="$(mktemp -d -t dagger-store-XXXXXX)"
     export DAGGER_STORE
 }
+
+skip_unless_secrets_available() {
+  local inputFile="$1"
+  sops exec-file "$inputFile" echo  > /dev/null 2>&1 || skip "$inputFile cannot be decrypted"
+}

tests/ops.bats

@@ -0,0 +1,215 @@
+setup() {
+    load 'helpers'
+
+    common_setup
+}
+
+@test "op.#Load" {
+    run "$DAGGER" compute "$TESTDIR"/ops/load/valid/component
+    assert_success
+    assert_line '{"component":{},"test1":"lol","test2":"lol"}'
+
+    "$DAGGER" compute "$TESTDIR"/ops/load/valid/script
+
+    run "$DAGGER" compute "$TESTDIR"/ops/load/invalid/cache
+    assert_failure
+}
+
+@test "op.#Mount" {
+    # tmpfs
+    "$DAGGER" compute "$TESTDIR"/ops/mounts/valid/tmpfs
+
+    # cache
+    "$DAGGER" compute "$TESTDIR"/ops/mounts/valid/cache
+
+    # component
+    run "$DAGGER" compute "$TESTDIR"/ops/mounts/valid/component
+    assert_success
+    assert_line '{"test":"hello world"}'
+
+    # FIXME https://github.com/blocklayerhq/dagger/issues/46
+    # "$DAGGER" compute "$TESTDIR"/ops/mounts/valid/script
+}
+
+@test "op.#Copy" {
+    run "$DAGGER" compute "$TESTDIR"/ops/copy/valid/component
+    assert_success
+    assert_line '{"component":{},"test1":"lol","test2":"lol"}'
+
+    "$DAGGER" compute "$TESTDIR"/ops/copy/valid/script
+
+    # FIXME https://github.com/blocklayerhq/dagger/issues/44
+    # run "$DAGGER" compute "$TESTDIR"/ops/copy/invalid/cache
+    # assert_failure
+}
+
+@test "op.#Local" {
+    skip "There are no local tests right now (the feature is possibly not functioning at all: see https://github.com/blocklayerhq/dagger/issues/41)"
+}
+
+@test "op.#FetchContainer" {
+    # non existent container image"
+    run "$DAGGER" compute "$TESTDIR"/ops/fetch-container/nonexistent/image
+    assert_failure
+
+    # non existent container tag
+    run "$DAGGER" compute "$TESTDIR"/ops/fetch-container/nonexistent/tag
+    assert_failure
+
+    # non existent container digest
+    run "$DAGGER" compute "$TESTDIR"/ops/fetch-container/nonexistent/digest
+    assert_failure
+
+    # valid containers
+    run "$DAGGER" compute "$TESTDIR"/ops/fetch-container/exist
+    assert_success
+
+    # missing ref
+    # FIXME: distinguish missing inputs from incorrect config
+    # run "$DAGGER" compute "$TESTDIR"/ops/fetch-container/invalid
+    # assert_failure
+
+    # non existent container image with valid digest
+    # FIXME https://github.com/blocklayerhq/dagger/issues/32
+    # run "$DAGGER" compute "$TESTDIR"/ops/fetch-container/nonexistent/image-with-valid-digest
+    # assert_failure
+}
+
+@test "op.#PushContainer" {
+    skip_unless_secrets_available "$TESTDIR"/ops/push-container/inputs.yaml
+
+    "$DAGGER" compute --input-yaml "$TESTDIR"/ops/push-container/inputs.yaml "$TESTDIR"/ops/push-container
+}
+
+@test "op.#FetchGit" {
+    run "$DAGGER" compute "$TESTDIR"/ops/fetch-git/exist
+    assert_success
+
+    run "$DAGGER" compute "$TESTDIR"/ops/fetch-git/nonexistent/remote
+    assert_failure
+
+    run "$DAGGER" compute "$TESTDIR"/ops/fetch-git/nonexistent/ref
+    assert_failure
+
+    run "$DAGGER" compute "$TESTDIR"/ops/fetch-git/nonexistent/bork
+    assert_failure
+
+    # FIXME: distinguish missing inputs from incorrect config
+    # run "$DAGGER" compute "$TESTDIR"/ops/fetch-git/invalid
+    # assert_failure
+}
+
+@test "op.#Exec" {
+    run "$DAGGER" compute "$TESTDIR"/ops/exec/invalid
+    assert_failure
+
+    run "$DAGGER" compute "$TESTDIR"/ops/exec/error
+    assert_failure
+
+    run "$DAGGER" compute "$TESTDIR"/ops/exec/simple
+    assert_success
+
+    # XXX should run twice and test that the string "always output" is visible with DOCKER_OUTPUT=1
+    # Alternatively, use export, but this would test multiple things then...
+    run "$DAGGER" compute "$TESTDIR"/ops/exec/always
+    assert_success
+
+    run "$DAGGER" compute "$TESTDIR"/ops/exec/env/invalid
+    assert_failure
+
+    run "$DAGGER" compute  "$TESTDIR"/ops/exec/env/valid
+    assert_success
+
+    run "$DAGGER" compute --input-string 'bar=overlay environment' "$TESTDIR"/ops/exec/env/overlay
+    assert_success
+
+    run "$DAGGER" compute  "$TESTDIR"/ops/exec/dir/doesnotexist
+    assert_success
+
+    run "$DAGGER" compute  "$TESTDIR"/ops/exec/dir/exist
+    assert_success
+
+
+    run "$DAGGER" compute "$TESTDIR"/ops/exec/undefined/non_concrete_referenced
+    assert_success
+    assert_line '{"hello":"world"}'
+
+    # NOTE: the exec is meant to fail - and we test that as a way to confirm it has been executed
+    run "$DAGGER" compute "$TESTDIR"/ops/exec/undefined/non_concrete_not_referenced
+    assert_failure
+
+    # package with optional def, not referenced, should be executed
+    run "$DAGGER" compute "$TESTDIR"/ops/exec/undefined/with_pkg_def
+    assert_success
+
+    # script with optional prop, not referenced, should be executed
+    run "$DAGGER" compute "$TESTDIR"/ops/exec/undefined/with_pkg_optional
+    assert_success
+
+    # FIXME https://github.com/blocklayerhq/dagger/issues/74
+    # run "$DAGGER" compute "$TESTDIR"/ops/exec/exit_code
+    # assert_failure # --exit=123
+
+    # script with non-optional prop, not referenced, should be executed
+    # FIXME https://github.com/blocklayerhq/dagger/issues/70
+    # run "$DAGGER" compute "$TESTDIR"/ops/exec/undefined/with_pkg_mandatory
+    # assert_failure
+}
+
+@test "op.#Export" {
+    run "$DAGGER" compute "$TESTDIR"/ops/export/json
+    assert_success
+    assert_line '{"testMap":{"something":"something"},"testScalar":true}'
+
+    run "$DAGGER" compute "$TESTDIR"/ops/export/string
+    assert_success
+    assert_line '{"test":"something"}'
+
+    run "$DAGGER" compute "$TESTDIR"/ops/export/withvalidation
+    assert_success
+    assert_line '{"test":"something"}'
+
+    run "$DAGGER" compute "$TESTDIR"/ops/export/concurrency
+    assert_success
+
+    # does not pass additional validation
+    run "$DAGGER" compute "$TESTDIR"/ops/export/invalid/validation
+    assert_failure
+
+    # invalid format
+    run "$DAGGER" compute "$TESTDIR"/ops/export/invalid/format
+    assert_failure
+
+    # invalid path
+    run "$DAGGER" compute "$TESTDIR"/ops/export/invalid/path
+    assert_failure
+
+
+    run "$DAGGER" compute "$TESTDIR"/ops/export/float
+    assert_success
+    assert_line '{"test":-123.5}'
+
+    run "$DAGGER" compute "$TESTDIR"/ops/export/yaml
+    assert_success
+    assert_line '{"testMap":{"something":"something"},"testScalar":true}'
+
+    run "$DAGGER" compute "$TESTDIR"/ops/export/bool
+    assert_success
+    assert_line '{"test":true}'
+
+    # FIXME: https://github.com/blocklayerhq/dagger/issues/96
+    # run "$DAGGER" compute "$TESTDIR"/ops/export/number
+    # assert_success
+    # assert_line '{"test":-123.5}'
+}
+
+@test "op.#Subdir" {
+    run "$DAGGER" compute "$TESTDIR"/ops/subdir/simple
+    assert_success
+    assert_line '{"hello":"world"}'
+}
+
+@test "op.#DockerBuild" {
+    run "$DAGGER" compute --input-dir TestData="$TESTDIR"/ops/dockerbuild/testdata "$TESTDIR"/ops/dockerbuild
+    assert_success
+}

tests/test-llb.sh

@@ -1,187 +0,0 @@
-#!/usr/bin/env bash
-set -o errexit -o errtrace -o functrace -o nounset -o pipefail
-
-# Test Directory
-d=$(cd "$(dirname "${BASH_SOURCE[0]:-$PWD}")" 2>/dev/null 1>&2 && pwd)
-
-test::llb(){
-  local dagger="$1"
-
-  test::llb::load "$dagger"
-  test::llb::mount "$dagger"
-  test::llb::copy "$dagger"
-  test::llb::local "$dagger"
-  test::llb::fetchcontainer "$dagger"
-  test::llb::pushcontainer "$dagger"
-  test::llb::fetchgit "$dagger"
-  test::llb::exec "$dagger"
-  test::llb::export "$dagger"
-  test::llb::subdir "$dagger"
-  test::llb::dockerbuild "$dagger"
-}
-
-test::llb::load(){
-  test::one "Load: valid components" --exit=0 --stdout='{"component":{},"test1":"lol","test2":"lol"}' \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/load/valid/component
-  test::one "Load: valid script" --exit=0 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/load/valid/script
-
-  test::one "Load: invalid caching (FIXME https://github.com/blocklayerhq/dagger/issues/44)" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/load/invalid/cache
-}
-
-test::llb::mount(){
-  test::one "Mount: tmpfs" --exit=0 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/mounts/valid/tmpfs
-
-  test::one "Mount: cache" --exit=0 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/mounts/valid/cache
-
-  test::one "Mount: component" --exit=0  --stdout='{"test":"hello world"}' \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/mounts/valid/component
-
-  disable test::one "Mount: script (FIXME https://github.com/blocklayerhq/dagger/issues/46)" --exit=0 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/mounts/valid/script
-}
-
-test::llb::copy(){
-  test::one "Copy: valid components" --exit=0 --stdout='{"component":{},"test1":"lol","test2":"lol"}' \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/copy/valid/component
-  test::one "Copy: valid script" --exit=0 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/copy/valid/script
-
-  disable test::one "Copy: invalid caching (FIXME https://github.com/blocklayerhq/dagger/issues/44)" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/copy/invalid/cache
-}
-
-test::llb::local(){
-  disable "" "There are no local tests right now (the feature is possibly not functioning at all: see https://github.com/blocklayerhq/dagger/issues/41)"
-}
-
-test::llb::fetchcontainer(){
-  local dagger="$1"
-
-  # Fetch container
-  disable test::one "FetchContainer: missing ref (FIXME: distinguish missing inputs from incorrect config)" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/fetch-container/invalid
-  test::one "FetchContainer: non existent container image" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/fetch-container/nonexistent/image
-  test::one "FetchContainer: non existent container tag" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/fetch-container/nonexistent/tag
-  test::one "FetchContainer: non existent container digest" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/fetch-container/nonexistent/digest
-
-  test::one "FetchContainer: valid containers"       --exit=0 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/fetch-container/exist
-
-  disable test::one "FetchContainer: non existent container image with valid digest (FIXME https://github.com/blocklayerhq/dagger/issues/32)" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/fetch-container/nonexistent/image-with-valid-digest
-}
-
-test::llb::pushcontainer(){
-  local dagger="$1"
-
-  test::secret "$d"/llb/push-container/inputs.yaml "PushContainer: simple"       --exit=0 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/push-container
-}
-
-test::llb::fetchgit(){
-  local dagger="$1"
-
-  # Fetch git
-  test::one "FetchGit: valid" --exit=0 --stdout="{}" \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/fetch-git/exist
-  disable test::one "FetchGit: invalid (FIXME: distinguish missing inputs from incorrect config) " --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/fetch-git/invalid
-  test::one "FetchGit: non existent remote" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/fetch-git/nonexistent/remote
-  test::one "FetchGit: non existent ref" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/fetch-git/nonexistent/ref
-  test::one "FetchGit: non existent bork" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/fetch-git/nonexistent/bork
-}
-
-test::llb::exec(){
-  # Exec
-  test::one "Exec: invalid" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/exec/invalid
-  test::one "Exec: error" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/exec/error
-  test::one "Exec: simple" --exit=0 --stdout={} \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/exec/simple
-  # XXX should run twice and test that the string "always output" is visible with DOCKER_OUTPUT=1
-  # Alternatively, use export, but this would test multiple things then...
-  test::one "Exec: always" --exit=0 --stdout={} \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/exec/always
-  test::one "Exec: env invalid" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/exec/env/invalid
-  test::one "Exec: env valid" --exit=0 --stdout={} \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute  "$d"/llb/exec/env/valid
-  test::one "Exec: env with overlay" --exit=0 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute --input-string 'bar=overlay environment' "$d"/llb/exec/env/overlay
-
-  test::one "Exec: non existent dir" --exit=0 --stdout={} \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute  "$d"/llb/exec/dir/doesnotexist
-  test::one "Exec: valid dir" --exit=0 --stdout={} \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute  "$d"/llb/exec/dir/exist
-
-  disable test::one "Exec: exit code propagation (FIXME https://github.com/blocklayerhq/dagger/issues/74)" --exit=123 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/exec/exit_code
-
-  test::one "Exec: script with referenced non-concrete property should not be executed, and should succeed overall" --exit=0 --stdout='{"hello":"world"}'  \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/exec/undefined/non_concrete_referenced
-  # NOTE: the exec is meant to fail - and we test that as a way to confirm it has been executed
-  test::one "Exec: script with unreferenced undefined properties should be executed" --exit=1 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/exec/undefined/non_concrete_not_referenced
-  test::one "Exec: package with optional def, not referenced, should be executed" --exit=0 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/exec/undefined/with_pkg_def
-  test::one "Exec: script with optional prop, not referenced, should be executed" --exit=0 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/exec/undefined/with_pkg_optional
-  disable test::one "Exec: script with non-optional prop, not referenced, should be executed (FIXME https://github.com/blocklayerhq/dagger/issues/70)" --exit=1 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/exec/undefined/with_pkg_mandatory
-}
-
-test::llb::export(){
-  test::one "Export: json" --exit=0 --stdout='{"testMap":{"something":"something"},"testScalar":true}' \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/export/json
-
-  test::one "Export: string" --exit=0 --stdout='{"test":"something"}' \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/export/string
-
-  test::one "Export: string with additional constraint success" --exit=0 --stdout='{"test":"something"}' \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/export/withvalidation
-
-  test::one "Export: many concurrent" --exit=0 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/export/concurrency
-
-  test::one "Export: does not pass additional validation" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/export/invalid/validation
-
-  test::one "Export: invalid format" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/export/invalid/format
-
-  test::one "Export: invalid path" --exit=1 --stdout= \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/export/invalid/path
-
-  test::one "Export: number" --exit=0 --stdout='{"test":-123.5}' \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/export/float
-
-  disable test::one "Export: number (FIXME: https://github.com/blocklayerhq/dagger/issues/96)" --exit=0 --stdout='{"test":-123.5}' \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/export/number
-
-  test::one "Export: yaml" --exit=0 --stdout='{"testMap":{"something":"something"},"testScalar":true}' \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/export/yaml
-
-  test::one "Export: bool" --exit=0 --stdout='{"test":true}' \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/export/bool
-}
-
-test::llb::subdir() {
-  test::one "Subdir: simple usage" --exit=0 --stdout='{"hello":"world"}' \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/llb/subdir/simple
-}
-
-test::llb::dockerbuild() {
-  test::one "Docker Build" --exit=0 \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute --input-dir TestData="$d"/llb/dockerbuild/testdata "$d"/llb/dockerbuild
-}

tests/test.sh

@@ -18,8 +18,6 @@ d=$(cd "$(dirname "${BASH_SOURCE[0]:-$PWD}")" 2>/dev/null 1>&2 && pwd)
 # shellcheck source=/dev/null
 . "$d/test-compute.sh"
 # shellcheck source=/dev/null
-. "$d/test-llb.sh"
-# shellcheck source=/dev/null
 . "$d/test-stdlib.sh"
 # shellcheck source=/dev/null
 . "$d/test-examples.sh"
@@ -28,7 +26,6 @@ test::all(){
   local dagger="$1"
 
   test::suite "compute" && test::compute "$dagger"
-  test::suite "llb" && test::llb "$dagger"
   test::suite "stdlib" && test::stdlib "$dagger"
   test::suite "examples" && test::examples "$dagger"
 }