From 68f18887dad3fb42c36029cc5ff1c06067d6b722 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Thu, 23 Sep 2021 12:07:09 -0600 Subject: [PATCH] changed workspace to project for tests Signed-off-by: Richard Jones --- docs/learn/tests/doc.bats | 136 +++++++++++++++++----------------- docs/learn/tests/helpers.bash | 20 ++--- stdlib/helpers.bash | 20 ++--- stdlib/universe.bats | 22 +++--- tests/cli.bats | 18 ++--- tests/core.bats | 6 +- tests/helpers.bash | 10 +-- 7 files changed, 116 insertions(+), 116 deletions(-) diff --git a/docs/learn/tests/doc.bats b/docs/learn/tests/doc.bats index 2ab82ed8..1cebc557 100644 --- a/docs/learn/tests/doc.bats +++ b/docs/learn/tests/doc.bats @@ -15,13 +15,13 @@ setup() { "$DAGGER_SANDBOX"/import-tutorial-key.sh # Collect url - dagger -w "$DAGGER_SANDBOX" up - url=$(dagger -w "$DAGGER_SANDBOX" query -f text url) + dagger --project "$DAGGER_SANDBOX" up + url=$(dagger --project "$DAGGER_SANDBOX" query -f text url) # More commands - dagger -w "$DAGGER_SANDBOX" list + dagger --project "$DAGGER_SANDBOX" list ls -l "$DAGGER_SANDBOX"/s3 - dagger -w "$DAGGER_SANDBOX" input list + dagger --project "$DAGGER_SANDBOX" input list # Check output run curl "$url" @@ -33,25 +33,25 @@ setup() { # Follow tutorial mkdir -p "$DAGGER_SANDBOX"/multibucket - cp "$DAGGER_WORKSPACE"/multibucket/source.cue "$DAGGER_SANDBOX"/multibucket - cp "$DAGGER_WORKSPACE"/multibucket/yarn.cue "$DAGGER_SANDBOX"/multibucket - cp "$DAGGER_WORKSPACE"/multibucket/netlify.cue "$DAGGER_SANDBOX"/multibucket + cp "$DAGGER_PROJECT"/multibucket/source.cue "$DAGGER_SANDBOX"/multibucket + cp "$DAGGER_PROJECT"/multibucket/yarn.cue "$DAGGER_SANDBOX"/multibucket + cp "$DAGGER_PROJECT"/multibucket/netlify.cue "$DAGGER_SANDBOX"/multibucket - dagger -w "$DAGGER_SANDBOX" doc alpha.dagger.io/netlify - dagger -w "$DAGGER_SANDBOX" doc alpha.dagger.io/js/yarn + dagger --project "$DAGGER_SANDBOX" doc alpha.dagger.io/netlify + dagger --project "$DAGGER_SANDBOX" doc alpha.dagger.io/js/yarn # Initialize new env - dagger -w "$DAGGER_SANDBOX" new 'multibucket' -p "$DAGGER_SANDBOX"/multibucket + dagger --project "$DAGGER_SANDBOX" new 'multibucket' -p "$DAGGER_SANDBOX"/multibucket # Copy corresponding env - cp -r "$DAGGER_WORKSPACE"/.dagger/env/multibucket "$DAGGER_SANDBOX"/.dagger/env/ + cp -r "$DAGGER_PROJECT"/.dagger/env/multibucket "$DAGGER_SANDBOX"/.dagger/env/ # Add missing src input - dagger -w "$DAGGER_SANDBOX" -e multibucket input dir src "$DAGGER_SANDBOX" + dagger --project "$DAGGER_SANDBOX" -e multibucket input dir src "$DAGGER_SANDBOX" # Run test - dagger -w "$DAGGER_SANDBOX" -e multibucket up - url=$(dagger -w "$DAGGER_SANDBOX" -e multibucket query -f text site.netlify.deployUrl) + dagger --project "$DAGGER_SANDBOX" -e multibucket up + url=$(dagger --project "$DAGGER_SANDBOX" -e multibucket query -f text site.netlify.deployUrl) # Check output run curl "$url" @@ -63,19 +63,19 @@ setup() { # Follow tutorial mkdir -p "$DAGGER_SANDBOX"/gcpcloudrun - cp "$DAGGER_WORKSPACE"/gcpcloudrun/source.cue "$DAGGER_SANDBOX"/gcpcloudrun + cp "$DAGGER_PROJECT"/gcpcloudrun/source.cue "$DAGGER_SANDBOX"/gcpcloudrun # Initialize new env - dagger -w "$DAGGER_SANDBOX" new 'gcpcloudrun' -p "$DAGGER_SANDBOX"/gcpcloudrun + dagger --project "$DAGGER_SANDBOX" new 'gcpcloudrun' -p "$DAGGER_SANDBOX"/gcpcloudrun # Copy corresponding env - cp -r "$DAGGER_WORKSPACE"/.dagger/env/gcpcloudrun "$DAGGER_SANDBOX"/.dagger/env/ + cp -r "$DAGGER_PROJECT"/.dagger/env/gcpcloudrun "$DAGGER_SANDBOX"/.dagger/env/ # Add missing src input - dagger -w "$DAGGER_SANDBOX" -e gcpcloudrun input dir src "$DAGGER_SANDBOX" + dagger --project "$DAGGER_SANDBOX" -e gcpcloudrun input dir src "$DAGGER_SANDBOX" # Run test - run dagger -w "$DAGGER_SANDBOX" -e gcpcloudrun up + run dagger --project "$DAGGER_SANDBOX" -e gcpcloudrun up assert_success } @@ -88,10 +88,10 @@ setup() { # copy_to_sandbox kube-kind-basic kube-kind # # Add kubeconfig - # dagger -w "$DAGGER_SANDBOX" -e kube-kind-basic input text kubeconfig -f "$HOME"/.kube/config + # dagger --project "$DAGGER_SANDBOX" -e kube-kind-basic input text kubeconfig -f "$HOME"/.kube/config # # Up deployment - # dagger -w "$DAGGER_SANDBOX" -e kube-kind-basic up + # dagger --project "$DAGGER_SANDBOX" -e kube-kind-basic up # # Check deployment # kubectl describe deployment todoapp | grep 'True' @@ -105,10 +105,10 @@ setup() { # copy_to_sandbox kube-kind-deployment kube-kind # # Add kubeconfig - # dagger -w "$DAGGER_SANDBOX" -e kube-kind-deployment input text kubeconfig -f "$HOME"/.kube/config + # dagger --project "$DAGGER_SANDBOX" -e kube-kind-deployment input text kubeconfig -f "$HOME"/.kube/config # # Up deployment - # dagger -w "$DAGGER_SANDBOX" -e kube-kind-deployment up + # dagger --project "$DAGGER_SANDBOX" -e kube-kind-deployment up # # Check deployment # kubectl describe deployment todoapp | grep 'True' @@ -122,10 +122,10 @@ setup() { # copy_to_sandbox kube-kind-cue-manifest kube-kind # # Add kubeconfig - # dagger -w "$DAGGER_SANDBOX" -e kube-kind-cue-manifest input text kubeconfig -f "$HOME"/.kube/config + # dagger --project "$DAGGER_SANDBOX" -e kube-kind-cue-manifest input text kubeconfig -f "$HOME"/.kube/config # # Up deployment - # dagger -w "$DAGGER_SANDBOX" -e kube-kind-cue-manifest up + # dagger --project "$DAGGER_SANDBOX" -e kube-kind-cue-manifest up # # Check deployment # kubectl describe deployment todoapp | grep 'True' @@ -142,20 +142,20 @@ setup() { # copy_to_sandbox kube-aws-basic kube-aws # # Up deployment - # dagger -w "$DAGGER_SANDBOX" -e kube-aws-basic up + # dagger --project "$DAGGER_SANDBOX" -e kube-aws-basic up # #################### DEPLOYMENT #################### # # Copy deployment to sandbox # copy_to_sandbox kube-aws-deployment kube-aws # # Up deployment - # dagger -w "$DAGGER_SANDBOX" -e kube-aws-deployment up + # dagger --project "$DAGGER_SANDBOX" -e kube-aws-deployment up # #################### CUE MANIFEST #################### # # Copy deployment to sandbox # copy_to_sandbox kube-aws-cue-manifest kube-aws # # Up deployment - # dagger -w "$DAGGER_SANDBOX" -e kube-aws-cue-manifest up + # dagger --project "$DAGGER_SANDBOX" -e kube-aws-cue-manifest up } @test "doc-1007-kube-gcp" { @@ -165,20 +165,20 @@ setup() { # copy_to_sandbox kube-gcp-basic kube-gcp # # Up deployment - # dagger -w "$DAGGER_SANDBOX" -e kube-gcp-basic up + # dagger --project "$DAGGER_SANDBOX" -e kube-gcp-basic up # #################### DEPLOYMENT #################### # # Copy deployment to sandbox # copy_to_sandbox kube-gcp-deployment kube-gcp # # Up deployment - # dagger -w "$DAGGER_SANDBOX" -e kube-gcp-deployment up + # dagger --project "$DAGGER_SANDBOX" -e kube-gcp-deployment up # #################### CUE MANIFEST #################### # # Copy deployment to sandbox # copy_to_sandbox kube-gcp-cue-manifest kube-gcp # # Up deployment - # dagger -w "$DAGGER_SANDBOX" -e kube-gcp-cue-manifest up + # dagger --project "$DAGGER_SANDBOX" -e kube-gcp-cue-manifest up } @test "doc-1008-aws-cloudformation" { @@ -188,96 +188,96 @@ setup() { ### Create a basic plan ## Construct mkdir -p "$DAGGER_SANDBOX"/cloudformation - cp "$DAGGER_WORKSPACE"/cloudformation/template.cue "$DAGGER_SANDBOX"/cloudformation + cp "$DAGGER_PROJECT"/cloudformation/template.cue "$DAGGER_SANDBOX"/cloudformation # Cloudformation relay - dagger -w "$DAGGER_SANDBOX" doc alpha.dagger.io/aws/cloudformation - cp "$DAGGER_WORKSPACE"/cloudformation/source-begin.cue "$DAGGER_SANDBOX"/cloudformation/source.cue + dagger --project "$DAGGER_SANDBOX" doc alpha.dagger.io/aws/cloudformation + cp "$DAGGER_PROJECT"/cloudformation/source-begin.cue "$DAGGER_SANDBOX"/cloudformation/source.cue # Initialize new env - dagger -w "$DAGGER_SANDBOX" new 'cloudformation' -p "$DAGGER_SANDBOX"/cloudformation + dagger --project "$DAGGER_SANDBOX" new 'cloudformation' -p "$DAGGER_SANDBOX"/cloudformation # Finish template setup - cp "$DAGGER_WORKSPACE"/cloudformation/source-end.cue "$DAGGER_SANDBOX"/cloudformation/source.cue + cp "$DAGGER_PROJECT"/cloudformation/source-end.cue "$DAGGER_SANDBOX"/cloudformation/source.cue # Copy corresponding env - cp -r "$DAGGER_WORKSPACE"/.dagger/env/cloudformation "$DAGGER_SANDBOX"/.dagger/env/ + cp -r "$DAGGER_PROJECT"/.dagger/env/cloudformation "$DAGGER_SANDBOX"/.dagger/env/ # Run test - dagger -w "$DAGGER_SANDBOX" -e cloudformation up - stackName=$(dagger -w "$DAGGER_SANDBOX" -e cloudformation query cfnStackName -f text) + dagger --project "$DAGGER_SANDBOX" -e cloudformation up + stackName=$(dagger --project "$DAGGER_SANDBOX" -e cloudformation query cfnStackName -f text) ## Cleanup # Place back empty source - cp "$DAGGER_WORKSPACE"/cloudformation/source-begin.cue "$DAGGER_SANDBOX"/cloudformation/source.cue - cp "$DAGGER_WORKSPACE"/cloudformation/deletion.cue "$DAGGER_SANDBOX"/cloudformation/deletion.cue + cp "$DAGGER_PROJECT"/cloudformation/source-begin.cue "$DAGGER_SANDBOX"/cloudformation/source.cue + cp "$DAGGER_PROJECT"/cloudformation/deletion.cue "$DAGGER_SANDBOX"/cloudformation/deletion.cue # Prepare and run cloudformation cleanup - dagger -w "$DAGGER_SANDBOX" -e cloudformation input text stackRemoval.stackName "$stackName" - dagger -w "$DAGGER_SANDBOX" -e cloudformation up + dagger --project "$DAGGER_SANDBOX" -e cloudformation input text stackRemoval.stackName "$stackName" + dagger --project "$DAGGER_SANDBOX" -e cloudformation up ### Template part ## Create convert.cue - cp "$DAGGER_WORKSPACE"/cloudformation/template/convert.cue "$DAGGER_SANDBOX"/cloudformation/convert.cue + cp "$DAGGER_PROJECT"/cloudformation/template/convert.cue "$DAGGER_SANDBOX"/cloudformation/convert.cue rm "$DAGGER_SANDBOX"/cloudformation/source.cue "$DAGGER_SANDBOX"/cloudformation/deletion.cue ## Retrieve Unmarshalled JSON - dagger -w "$DAGGER_SANDBOX" query -e cloudformation s3Template + dagger --project "$DAGGER_SANDBOX" query -e cloudformation s3Template ## Remove convert.cue rm "$DAGGER_SANDBOX"/cloudformation/convert.cue ## Store the output - cp "$DAGGER_WORKSPACE"/cloudformation/template/template-begin.cue "$DAGGER_SANDBOX"/cloudformation/template.cue + cp "$DAGGER_PROJECT"/cloudformation/template/template-begin.cue "$DAGGER_SANDBOX"/cloudformation/template.cue # Inspect conf - dagger -w "$DAGGER_SANDBOX" query -e cloudformation template -f text + dagger --project "$DAGGER_SANDBOX" query -e cloudformation template -f text - cp "$DAGGER_WORKSPACE"/cloudformation/template/deployment.cue "$DAGGER_SANDBOX"/cloudformation/deployment.cue - cp "$DAGGER_WORKSPACE"/cloudformation/template/template-end.cue "$DAGGER_SANDBOX"/cloudformation/template.cue - cp "$DAGGER_WORKSPACE"/cloudformation/source-end.cue "$DAGGER_SANDBOX"/cloudformation/source.cue + cp "$DAGGER_PROJECT"/cloudformation/template/deployment.cue "$DAGGER_SANDBOX"/cloudformation/deployment.cue + cp "$DAGGER_PROJECT"/cloudformation/template/template-end.cue "$DAGGER_SANDBOX"/cloudformation/template.cue + cp "$DAGGER_PROJECT"/cloudformation/source-end.cue "$DAGGER_SANDBOX"/cloudformation/source.cue # Deploy again - dagger -w "$DAGGER_SANDBOX" -e cloudformation query template -f text - dagger -w "$DAGGER_SANDBOX" -e cloudformation up - dagger -w "$DAGGER_SANDBOX" -e cloudformation output list + dagger --project "$DAGGER_SANDBOX" -e cloudformation query template -f text + dagger --project "$DAGGER_SANDBOX" -e cloudformation up + dagger --project "$DAGGER_SANDBOX" -e cloudformation output list ## Cleanup again - stackName=$(dagger -w "$DAGGER_SANDBOX" -e cloudformation query cfnStackName -f text) + stackName=$(dagger --project "$DAGGER_SANDBOX" -e cloudformation query cfnStackName -f text) rm -rf "$DAGGER_SANDBOX"/cloudformation/* # Place back empty source - cp "$DAGGER_WORKSPACE"/cloudformation/source-begin.cue "$DAGGER_SANDBOX"/cloudformation/source.cue - cp "$DAGGER_WORKSPACE"/cloudformation/deletion.cue "$DAGGER_SANDBOX"/cloudformation/deletion.cue + cp "$DAGGER_PROJECT"/cloudformation/source-begin.cue "$DAGGER_SANDBOX"/cloudformation/source.cue + cp "$DAGGER_PROJECT"/cloudformation/deletion.cue "$DAGGER_SANDBOX"/cloudformation/deletion.cue # Prepare and run cloudformation cleanup - dagger -w "$DAGGER_SANDBOX" -e cloudformation input text stackRemoval.stackName "$stackName" - dagger -w "$DAGGER_SANDBOX" -e cloudformation up + dagger --project "$DAGGER_SANDBOX" -e cloudformation input text stackRemoval.stackName "$stackName" + dagger --project "$DAGGER_SANDBOX" -e cloudformation up } @test "doc-1010-dev-cue-package" { - # Initializing workspace - mkdir -p "$DAGGER_SANDBOX"/workspace + # Initializing project + mkdir -p "$DAGGER_SANDBOX"/project # Writing package # dagger init # The sandbox is already init mkdir -p "$DAGGER_SANDBOX"/cue.mod/pkg/github.com/tjovicic/gcpcloudrun - cp "$DAGGER_WORKSPACE"/dev-cue-package/source.cue "$DAGGER_SANDBOX"/cue.mod/pkg/github.com/tjovicic/gcpcloudrun/source.cue - cp "$DAGGER_WORKSPACE"/dev-cue-package/script.sh "$DAGGER_SANDBOX"/workspace/script.sh + cp "$DAGGER_PROJECT"/dev-cue-package/source.cue "$DAGGER_SANDBOX"/cue.mod/pkg/github.com/tjovicic/gcpcloudrun/source.cue + cp "$DAGGER_PROJECT"/dev-cue-package/script.sh "$DAGGER_SANDBOX"/project/script.sh # We remove the last line of the script, as bats cannot expand dagger # to dagger() bats helper func inside bash files - sed '$d' <"$DAGGER_SANDBOX"/workspace/script.sh >"$DAGGER_SANDBOX"/tmpFile - mv "$DAGGER_SANDBOX"/tmpFile "$DAGGER_SANDBOX"/workspace/script.sh + sed '$d' <"$DAGGER_SANDBOX"/project/script.sh >"$DAGGER_SANDBOX"/tmpFile + mv "$DAGGER_SANDBOX"/tmpFile "$DAGGER_SANDBOX"/project/script.sh - chmod +x "$DAGGER_SANDBOX"/workspace/script.sh - "$DAGGER_SANDBOX"/workspace/script.sh + chmod +x "$DAGGER_SANDBOX"/project/script.sh + "$DAGGER_SANDBOX"/project/script.sh # Sync file from documentation rsync -a test "$DAGGER_SANDBOX" # Command removed from script.sh above - dagger -w "$DAGGER_SANDBOX" new staging -p "$DAGGER_SANDBOX"/test - run dagger up -w "$DAGGER_SANDBOX" -e staging + dagger --project "$DAGGER_SANDBOX" new staging -p "$DAGGER_SANDBOX"/test + run dagger up --project "$DAGGER_SANDBOX" -e staging assert_output --partial "input=run.gcpConfig.serviceKey" # Clean script.sh output diff --git a/docs/learn/tests/helpers.bash b/docs/learn/tests/helpers.bash index a59efdc7..ae6a6d98 100644 --- a/docs/learn/tests/helpers.bash +++ b/docs/learn/tests/helpers.bash @@ -10,19 +10,19 @@ common_setup() { # otherwise infinite recursion when DAGGER_BINARY is not set. export DAGGER="${DAGGER_BINARY:-$(bash -c 'command -v dagger')}" - # Set the workspace to the universe directory (so tests can run from anywhere) + # Set the project to the universe directory (so tests can run from anywhere) UNIVERSE="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )" - DAGGER_WORKSPACE="$UNIVERSE" - export DAGGER_WORKSPACE + DAGGER_PROJECT="$UNIVERSE" + export DAGGER_PROJECT # Force pretty printing for error reporting DAGGER_LOG_FORMAT="pretty" export DAGGER_LOG_FORMAT - # Sandbox workspace. - DAGGER_SANDBOX="$(mktemp -d -t dagger-workspace-XXXXXX)" + # Sandbox project. + DAGGER_SANDBOX="$(mktemp -d -t dagger-project-XXXXXX)" export DAGGER_SANDBOX - dagger init -w "$DAGGER_SANDBOX" + dagger init --project "$DAGGER_SANDBOX" # allows the use of `sops` SOPS_AGE_KEY_FILE=~/.config/dagger/keys.txt @@ -43,28 +43,28 @@ setup_example_sandbox() { } -# copy an environment from the current workspace to the sandbox. +# copy an environment from the current project to the sandbox. # # this is needed if the test requires altering inputs without dirtying the # current environment. # Usage: # copy_to_sandbox myenv # dagger input secret -w "$DAGGER_SANDBOX" -e myenv "temporary change" -# dagger up -w "$DAGGER_SANDBOX" -e myenv +# dagger up --project "$DAGGER_SANDBOX" -e myenv # # To use testdata directory in tests, add the package name as second flag # Usage: # copy_to_sandbox myenv mypackage copy_to_sandbox() { local name="$1" - local source="$DAGGER_WORKSPACE"/.dagger/env/"$name" + local source="$DAGGER_PROJECT"/.dagger/env/"$name" local target="$DAGGER_SANDBOX"/.dagger/env/"$name" cp -a "$source" "$target" if [ -d "$2" ]; then local package="$2" - local source_package="$DAGGER_WORKSPACE"/"$package" + local source_package="$DAGGER_PROJECT"/"$package" local target_package="$DAGGER_SANDBOX"/ cp -a "$source_package" "$target_package" diff --git a/stdlib/helpers.bash b/stdlib/helpers.bash index bf9b7325..fc081be5 100644 --- a/stdlib/helpers.bash +++ b/stdlib/helpers.bash @@ -7,19 +7,19 @@ common_setup() { # otherwise infinite recursion when DAGGER_BINARY is not set. export DAGGER="${DAGGER_BINARY:-$(bash -c 'command -v dagger')}" - # Set the workspace to the universe directory (so tests can run from anywhere) + # Set the project to the universe directory (so tests can run from anywhere) UNIVERSE="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )" - DAGGER_WORKSPACE="$UNIVERSE" - export DAGGER_WORKSPACE + DAGGER_PROJECT="$UNIVERSE" + export DAGGER_PROJECT # Force pretty printing for error reporting DAGGER_LOG_FORMAT="pretty" export DAGGER_LOG_FORMAT - # Sandbox workspace. - DAGGER_SANDBOX="$(mktemp -d -t dagger-workspace-XXXXXX)" + # Sandbox project. + DAGGER_SANDBOX="$(mktemp -d -t dagger-project-XXXXXX)" export DAGGER_SANDBOX - dagger init -w "$DAGGER_SANDBOX" + dagger init --project "$DAGGER_SANDBOX" # allows the use of `sops` SOPS_AGE_KEY_FILE=~/.config/dagger/keys.txt @@ -31,28 +31,28 @@ dagger() { "${DAGGER}" "$@" } -# copy an environment from the current workspace to the sandbox. +# copy an environment from the current project to the sandbox. # # this is needed if the test requires altering inputs without dirtying the # current environment. # Usage: # copy_to_sandbox myenv # dagger input secret -w "$DAGGER_SANDBOX" -e myenv "temporary change" -# dagger up -w "$DAGGER_SANDBOX" -e myenv +# dagger up --project "$DAGGER_SANDBOX" -e myenv # # To use testdata directory in tests, add the package name as second flag # Usage: # copy_to_sandbox myenv mypackage copy_to_sandbox() { local name="$1" - local source="$DAGGER_WORKSPACE"/.dagger/env/"$name" + local source="$DAGGER_PROJECT"/.dagger/env/"$name" local target="$DAGGER_SANDBOX"/.dagger/env/"$name" cp -a "$source" "$target" if [ -d "$2" ]; then local package="$2" - local source_package="$DAGGER_WORKSPACE"/"$package" + local source_package="$DAGGER_PROJECT"/"$package" local target_package="$DAGGER_SANDBOX"/ cp -a "$source_package" "$target_package" diff --git a/stdlib/universe.bats b/stdlib/universe.bats index cb85c73f..e9e1699b 100644 --- a/stdlib/universe.bats +++ b/stdlib/universe.bats @@ -133,12 +133,12 @@ setup() { copy_to_sandbox kubernetes-deployment kubernetes # Set kubeconfig - dagger -w "$DAGGER_SANDBOX" -e kubernetes-deployment input text TestKubeconfig -f "$HOME"/.kube/config + dagger --project "$DAGGER_SANDBOX" -e kubernetes-deployment input text TestKubeconfig -f "$HOME"/.kube/config - dagger -w "$DAGGER_SANDBOX" -e kubernetes-deployment up + dagger --project "$DAGGER_SANDBOX" -e kubernetes-deployment up # Unset kubeconfig - dagger -w "$DAGGER_SANDBOX" -e kubernetes-deployment input unset TestKubeconfig + dagger --project "$DAGGER_SANDBOX" -e kubernetes-deployment input unset TestKubeconfig } @test "kubernetes: kustomize" { @@ -152,12 +152,12 @@ setup() { copy_to_sandbox kubernetes-helm kubernetes # Set kubeconfig - dagger -w "$DAGGER_SANDBOX" -e kubernetes-helm input text TestKubeconfig -f "$HOME"/.kube/config + dagger --project "$DAGGER_SANDBOX" -e kubernetes-helm input text TestKubeconfig -f "$HOME"/.kube/config - dagger -w "$DAGGER_SANDBOX" -e kubernetes-helm up + dagger --project "$DAGGER_SANDBOX" -e kubernetes-helm up # Unset kubeconfig - dagger -w "$DAGGER_SANDBOX" -e kubernetes-helm input unset TestKubeconfig + dagger --project "$DAGGER_SANDBOX" -e kubernetes-helm input unset TestKubeconfig } @test "google cloud: gcr" { @@ -195,23 +195,23 @@ setup() { copy_to_sandbox terraform terraform # Add the var and try again - run dagger -w "$DAGGER_SANDBOX" -e terraform input text TestTerraform.apply.tfvars.input "42" - run dagger -w "$DAGGER_SANDBOX" -e terraform up + run dagger --project "$DAGGER_SANDBOX" -e terraform input text TestTerraform.apply.tfvars.input "42" + run dagger --project "$DAGGER_SANDBOX" -e terraform up assert_success # ensure the tfvar was passed correctly - run dagger -w "$DAGGER_SANDBOX" query -e terraform TestTerraform.apply.output.input.value -f text + run dagger --project "$DAGGER_SANDBOX" query -e terraform TestTerraform.apply.output.input.value -f text assert_success assert_output "42" # ensure the random value is always the same # this proves we're effectively using the s3 backend - run dagger -w "$DAGGER_SANDBOX" query -e terraform TestTerraform.apply.output.random.value -f json + run dagger --project "$DAGGER_SANDBOX" query -e terraform TestTerraform.apply.output.random.value -f json assert_success assert_output "36" # Unset input - run dagger -w "$DAGGER_SANDBOX" -e terraform input unset TestTerraform.apply.tfvars.input + run dagger --project "$DAGGER_SANDBOX" -e terraform input unset TestTerraform.apply.tfvars.input assert_success } diff --git a/tests/cli.bats b/tests/cli.bats index 7878f3db..5b7f123b 100644 --- a/tests/cli.bats +++ b/tests/cli.bats @@ -42,7 +42,7 @@ setup() { @test "dagger new: modules" { "$DAGGER" init - cp -a "$TESTDIR"/cli/input/simple/* "$DAGGER_WORKSPACE" + cp -a "$TESTDIR"/cli/input/simple/* "$DAGGER_PROJECT" "$DAGGER" new "a" "$DAGGER" new "b" @@ -61,7 +61,7 @@ setup() { assert_success assert_output "b" - # run ls -la "$DAGGER_WORKSPACE" + # run ls -la "$DAGGER_PROJECT" # assert_failure } @@ -70,7 +70,7 @@ setup() { @test "dagger new: packages" { "$DAGGER" init - cp -a "$TESTDIR"/cli/packages/* "$DAGGER_WORKSPACE" + cp -a "$TESTDIR"/cli/packages/* "$DAGGER_PROJECT" "$DAGGER" new "a" --package alpha.dagger.io/test/a "$DAGGER" new "b" --package alpha.dagger.io/test/b @@ -293,13 +293,13 @@ setup() { dagger_new_with_plan input "$TESTDIR"/cli/input/artifact - # input dir outside the workspace + # input dir outside the project run "$DAGGER" input -e "input" dir "source" /tmp assert_failure - # input dir inside the workspace - cp -R "$TESTDIR"/cli/input/artifact/testdata/ "$DAGGER_WORKSPACE"/testdata - "$DAGGER" input -e "input" dir "source" "$DAGGER_WORKSPACE"/testdata + # input dir inside the project + cp -R "$TESTDIR"/cli/input/artifact/testdata/ "$DAGGER_PROJECT"/testdata + "$DAGGER" input -e "input" dir "source" "$DAGGER_PROJECT"/testdata "$DAGGER" up -e "input" run "$DAGGER" -l error query -e "input" assert_success @@ -331,8 +331,8 @@ setup() { run [ -d "$TESTDIR"/cli/input/ignore/testdata/.dagger ] assert_success - cp -R "$TESTDIR"/cli/input/ignore/testdata/ "$DAGGER_WORKSPACE"/testdata - "$DAGGER" input -e "input" dir "source" "$DAGGER_WORKSPACE"/testdata + cp -R "$TESTDIR"/cli/input/ignore/testdata/ "$DAGGER_PROJECT"/testdata + "$DAGGER" input -e "input" dir "source" "$DAGGER_PROJECT"/testdata "$DAGGER" up -e "input" assert_success } diff --git a/tests/core.bats b/tests/core.bats index 6a46f595..64ba7ad4 100644 --- a/tests/core.bats +++ b/tests/core.bats @@ -11,7 +11,7 @@ setup() { # new-style tests: use 'dagger up' # # For new tests, please adopt new-style. -# NOTE: you will need to 'unset DAGGER_WORKSPACE' +# NOTE: you will need to 'unset DAGGER_PROJECT' # at the beginning of each new-style test. @test "core: inputs & outputs" { @@ -26,7 +26,7 @@ setup() { assert_output --partial 'dir' # Set dir input - dagger -e test-core input dir dir "$DAGGER_WORKSPACE" + dagger -e test-core input dir dir "$DAGGER_PROJECT" # Set text input dagger -e test-core input text name Bob @@ -160,5 +160,5 @@ setup() { } @test "compute: exclude" { - "$DAGGER" up -w "$TESTDIR"/compute/exclude + "$DAGGER" up --project "$TESTDIR"/compute/exclude } diff --git a/tests/helpers.bash b/tests/helpers.bash index c522faf3..8e3eb2c9 100644 --- a/tests/helpers.bash +++ b/tests/helpers.bash @@ -10,8 +10,8 @@ common_setup() { DAGGER_LOG_FORMAT="pretty" export DAGGER_LOG_FORMAT - DAGGER_WORKSPACE="$(mktemp -d -t dagger-workspace-XXXXXX)" - export DAGGER_WORKSPACE + DAGGER_PROJECT="$(mktemp -d -t dagger-project-XXXXXX)" + export DAGGER_PROJECT SOPS_AGE_KEY_FILE=~/.config/dagger/keys.txt export SOPS_AGE_KEY_FILE @@ -21,7 +21,7 @@ dagger_new_with_plan() { local name="$1" local sourcePlan="$2" - cp -a "$sourcePlan"/* "$DAGGER_WORKSPACE" + cp -a "$sourcePlan"/* "$DAGGER_PROJECT" "$DAGGER" new "$name" } @@ -29,8 +29,8 @@ dagger_new_with_plan() { dagger_new_with_env() { local sourcePlan="$1" - "$DAGGER" init -w "$DAGGER_WORKSPACE" - rsync -av "$sourcePlan"/ "$DAGGER_WORKSPACE" + "$DAGGER" init --project "$DAGGER_PROJECT" + rsync -av "$sourcePlan"/ "$DAGGER_PROJECT" } # dagger helper to execute the right binary