aboutsummaryrefslogtreecommitdiff
path: root/scripts/sanity-test.sh
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2026-04-27 18:33:03 -0500
committerCraig Jennings <c@cjennings.net>2026-04-27 18:33:03 -0500
commit422d1098cd89beaeed81cc40488252233e2ca0ad (patch)
tree7ea92619f7a76bc797851776cf1901d91b1e458f /scripts/sanity-test.sh
parentea494c7d0fc41bb1cab888f92408fab29c190e75 (diff)
downloadarchangel-422d1098cd89beaeed81cc40488252233e2ca0ad.tar.gz
archangel-422d1098cd89beaeed81cc40488252233e2ca0ad.zip
feat: consolidate zfssnapshot and zfsrollback into one subcommand-driven script
Problem: zfssnapshot and zfsrollback were two separate scripts with overlapping pre-flight checks (zfs / fzf / root) and parallel UX patterns (description sanitization in one, fzf selection in the other). Users had to remember which script was for which operation, and a "list" view meant typing the raw `zfs list -t snapshot` command. There was no path to destroy individual snapshots short of `zfs destroy` directly, which is dangerous without a confirmation flow. Solution: rewrite zfssnapshot as a single multi-subcommand script (list, create, rollback, delete). Drop installer/zfsrollback. The new script uses a source-guard at the bottom (`if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then main "$@"; fi`) so bats can source it without triggering the install-time pre-flight checks, matching the pattern in installer/archangel. Pure helpers (sanitize_description, validate_description, format_snapshot_name) get extracted as named functions so they're testable in isolation. The destructive flows (rollback, delete) keep the explicit "yes" confirmation prompt, the genesis-snapshot warning, and the recursive-rollback-destroys-newer-snapshots warning. Delete uses fzf --multi so the user can pick several snapshot names at once. Updated build.sh to copy only the consolidated script. Dropped the zfsrollback profiledef permission line. Updated Makefile, README, scripts/sanity-test.sh, and testing-strategy.org to reflect the single-script layout. Bats: 147 → 168 (+21). Coverage spans sanitize_description (normal / boundary / error), validate_description (alphanumerics, hyphens, underscores accepted; spaces, slashes, shell metacharacters, empty rejected), format_snapshot_name (timestamp + description composition), and main subcommand dispatch (list / create / rollback / delete / help / unknown). Lint clean. The zfs-, fzf-, and arch-chroot-shelling subcommand bodies stay VM-tested per testing-strategy.org.
Diffstat (limited to 'scripts/sanity-test.sh')
-rwxr-xr-xscripts/sanity-test.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/sanity-test.sh b/scripts/sanity-test.sh
index 95e537a..30afe2a 100755
--- a/scripts/sanity-test.sh
+++ b/scripts/sanity-test.sh
@@ -236,15 +236,11 @@ run_sanity_tests() {
"test -x /usr/local/bin/archangel && echo 'exists'" \
"exists"
- run_test "zfsrollback script present" \
- "test -x /usr/local/bin/zfsrollback && echo 'exists'" \
- "exists"
-
run_test "zfssnapshot script present" \
"test -x /usr/local/bin/zfssnapshot && echo 'exists'" \
"exists"
- # Test 5: fzf installed (required by zfsrollback)
+ # Test 5: fzf installed (required by zfssnapshot rollback/delete)
run_test "fzf installed" \
"command -v fzf && echo 'found'" \
"found"