The `storage` plugin mounted and unmounted one attachment at a time, so matching an app's mounts to a declared set meant reading `storage:list`, computing the difference in both directions and issuing one `storage:mount` or `storage:unmount` per addition and removal, with a failure partway through leaving the app holding a mixture of the two sets. A `--replace` flag on `storage:mount` now writes the declared set in a single call, taking `name:container-dir` pairs whose optional third field carries the same mount options the legacy colon form accepts. Every pair is parsed and validated before anything is written, so a rejected pair leaves the stored mounts untouched. The remaining mount-time flags scope the whole call the way `--process-type` already scoped a single mount, which means an omitted `--process-type` replaces the `_default_` scope and leaves mounts scoped to a named process type in place. An empty pair list is rejected rather than treated as a request to unmount everything, so a generated list that expands to nothing cannot silently drop an app's storage. `storage:unmount --all` handles that case instead, taking an optional `--process-type` filter and treating a scope that matches nothing as a no-op so it stays idempotent. `storage:unmount` also accepts more than one mount at a time, naming each by entry name or by the colon form, and resolves every argument against the app's attachments before removing any of them. The help listing now carries one entry per subcommand with its flags inline rather than a row per variant, and the command listing at the top of the storage documentation matches it line for line. Folding those rows together also surfaced `--global` on `storage:report` and `storage:migrate`, neither of which both listings had mentioned. Finally, `--volume-chown` is now validated on mount, where a typo previously exited zero and wrote a value that only the report ever read.
340 lines
11 KiB
Bash
340 lines
11 KiB
Bash
#!/usr/bin/env bats
|
|
|
|
load test_helper
|
|
|
|
setup() {
|
|
global_setup
|
|
create_app
|
|
rm -rf "$DOKKU_LIB_ROOT/data/storage/rdmtestapp*"
|
|
}
|
|
|
|
teardown() {
|
|
destroy_app
|
|
global_teardown
|
|
}
|
|
|
|
@test "(storage:mount) --replace replaces the whole mount set" {
|
|
run /bin/bash -c "dokku storage:create rdmtest-data"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:create rdmtest-cache"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:create rdmtest-logs"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:mount $TEST_APP rdmtest-data --container-dir /app/storage"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:mount --replace $TEST_APP rdmtest-cache:/cache rdmtest-logs:/logs"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '.[].entry_name' | sort | xargs"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "rdmtest-cache rdmtest-logs"
|
|
|
|
run /bin/bash -c "dokku storage:mount --replace $TEST_APP rdmtest-cache:/cache rdmtest-logs:/logs"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '. | length'"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "2"
|
|
|
|
run /bin/bash -c "dokku storage:unmount --all $TEST_APP"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-data --force"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-cache --force"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-logs --force"
|
|
assert_success
|
|
}
|
|
|
|
@test "(storage:mount) --replace leaves other process types untouched" {
|
|
run /bin/bash -c "dokku storage:create rdmtest-data"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:create rdmtest-cache"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:mount $TEST_APP rdmtest-cache --container-dir /cache --process-type web"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:mount --replace $TEST_APP rdmtest-data:/app/storage"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '.[].entry_name' | sort | xargs"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "rdmtest-cache rdmtest-data"
|
|
|
|
run /bin/bash -c "dokku storage:report $TEST_APP --format json | jq -r '.\"attachment.1.process-type\"'"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "web"
|
|
|
|
run /bin/bash -c "dokku storage:report $TEST_APP --format json | jq -r '.\"attachment.2.process-type\"'"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "_default_"
|
|
|
|
run /bin/bash -c "dokku storage:unmount --all $TEST_APP"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-data --force"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-cache --force"
|
|
assert_success
|
|
}
|
|
|
|
@test "(storage:mount) --replace applies scope flags to every spec" {
|
|
run /bin/bash -c "dokku storage:create rdmtest-data"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:create rdmtest-cache"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:mount --replace $TEST_APP rdmtest-data:/app/storage:Z rdmtest-cache:/cache:ro,noexec --phase deploy --process-type web --volume-subpath uploads --volume-chown herokuish"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:report $TEST_APP --format json | jq -r '.\"attachment.1.phases\"'"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "deploy"
|
|
|
|
run /bin/bash -c "dokku storage:report $TEST_APP --format json | jq -r '.\"attachment.1.subpath\"'"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "uploads"
|
|
|
|
run /bin/bash -c "dokku storage:report $TEST_APP --format json | jq -r '.\"attachment.1.volume-chown\"'"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "herokuish"
|
|
|
|
run /bin/bash -c "dokku storage:report $TEST_APP --format json | jq -r '.\"attachment.1.volume-options\"'"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "Z"
|
|
|
|
run /bin/bash -c "dokku storage:report $TEST_APP --format json | jq -r '.\"attachment.2.readonly\"'"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "true"
|
|
|
|
run /bin/bash -c "dokku storage:report $TEST_APP --format json | jq -r '.\"attachment.2.volume-options\"'"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "noexec"
|
|
|
|
run /bin/bash -c "dokku storage:unmount --all $TEST_APP"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-data --force"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-cache --force"
|
|
assert_success
|
|
}
|
|
|
|
@test "(storage:mount) --replace leaves the existing set untouched when a spec is invalid" {
|
|
run /bin/bash -c "dokku storage:create rdmtest-data"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:create rdmtest-cache"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:mount $TEST_APP rdmtest-data --container-dir /app/storage"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:mount --replace $TEST_APP rdmtest-cache:/cache rdmtest-missing:/missing"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_failure
|
|
assert_output_contains "does not exist" -1
|
|
|
|
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '.[].entry_name' | xargs"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "rdmtest-data"
|
|
|
|
run /bin/bash -c "dokku storage:mount --replace $TEST_APP rdmtest-data:/app/storage rdmtest-cache:/app/storage"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_failure
|
|
assert_output_contains "specified more than once" -1
|
|
|
|
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '.[].entry_name' | xargs"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "rdmtest-data"
|
|
|
|
run /bin/bash -c "dokku storage:unmount --all $TEST_APP"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-data --force"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-cache --force"
|
|
assert_success
|
|
}
|
|
|
|
@test "(storage:mount) --replace rejects an empty spec list" {
|
|
run /bin/bash -c "dokku storage:mount --replace $TEST_APP"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_failure
|
|
assert_output_contains "storage:unmount --all" -1
|
|
}
|
|
|
|
@test "(storage:unmount) removes multiple mounts in one call" {
|
|
run /bin/bash -c "dokku storage:create rdmtest-data"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:create rdmtest-cache"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:create rdmtest-logs"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:mount --replace $TEST_APP rdmtest-data:/app/storage rdmtest-cache:/cache rdmtest-logs:/logs"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:unmount $TEST_APP rdmtest-data rdmtest-logs"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '.[].entry_name' | xargs"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "rdmtest-cache"
|
|
|
|
run /bin/bash -c "dokku storage:unmount $TEST_APP rdmtest-cache rdmtest-missing"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_failure
|
|
|
|
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '.[].entry_name' | xargs"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "rdmtest-cache"
|
|
|
|
run /bin/bash -c "dokku storage:unmount --all $TEST_APP"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-data --force"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-cache --force"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-logs --force"
|
|
assert_success
|
|
}
|
|
|
|
@test "(storage:unmount) --all removes every mount and is idempotent" {
|
|
run /bin/bash -c "dokku storage:create rdmtest-data"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:create rdmtest-cache"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:mount --replace $TEST_APP rdmtest-data:/app/storage rdmtest-cache:/cache"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:unmount --all $TEST_APP"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '. | length'"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "0"
|
|
|
|
run /bin/bash -c "dokku storage:unmount --all $TEST_APP"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:unmount --all $TEST_APP rdmtest-data"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_failure
|
|
assert_output_contains "cannot be specified with --all" -1
|
|
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-data --force"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-cache --force"
|
|
assert_success
|
|
}
|
|
|
|
@test "(storage:unmount) --all --process-type removes only that scope" {
|
|
run /bin/bash -c "dokku storage:create rdmtest-data"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:create rdmtest-cache"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:mount $TEST_APP rdmtest-data --container-dir /app/storage"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:mount $TEST_APP rdmtest-cache --container-dir /cache --process-type web"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:unmount --all $TEST_APP --process-type web"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '.[].entry_name' | xargs"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "rdmtest-data"
|
|
|
|
run /bin/bash -c "dokku storage:unmount --all $TEST_APP --process-type worker"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
|
|
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '. | length'"
|
|
echo "output: $output"
|
|
echo "status: $status"
|
|
assert_success
|
|
assert_output "1"
|
|
|
|
run /bin/bash -c "dokku storage:unmount --all $TEST_APP"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-data --force"
|
|
assert_success
|
|
run /bin/bash -c "dokku storage:destroy rdmtest-cache --force"
|
|
assert_success
|
|
}
|