mirror of
https://github.com/kellymichels/zscripts-token-savers
synced 2026-10-07 07:18:18 +00:00
Mirrors evo.scripts #66, which added -n to Get-Ec2SshOpts so a deploy step cannot block on inherited stdin, plus the follow-up that keeps that flag away from scp. OpenSSH's scp has no -n: it exits 1 with 'unknown option -- n' and prints its usage block, so every upload failed once the shared option array reached it. Get-Ec2ScpOpts is derived from Get-Ec2SshOpts with -n filtered out rather than duplicated, so the connect and keepalive timeouts cannot drift apart between the two transports. All four scp call sites here use it - three plain uploads and the recursive directory upload, which the private tree does not have. The upload failure message asserted 'Likely server disk space' without checking anything; it now points at scp's own output, where the real diagnosis already was. Verified: both files parse clean, Get-Ec2ScpOpts returns the five -o pairs with no -n, and the added lines carry no real hosts, keys, or paths. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
9.6 KiB
9.6 KiB
Changelog
Notable changes to the Evomedia.net Token Savers.
Unreleased
Fixed
scpno longer receives an ssh-only flag — the stdin-hang fix added-ntoGet-Ec2SshOpts, and the deploy path splats that same array intoscpas well asssh. OpenSSH'sscphas no-n: it exits 1 withunknown option -- nand prints its usage block, so every upload failed.Get-Ec2ScpOptsnow supplies the shared connection options with-nfiltered out, derived fromGet-Ec2SshOptsrather than duplicated so the timeouts cannot drift apart between the two transports. All fourscpcall sites use it, including the recursive directory upload. The upload failure message also asserted "Likely server disk space" without checking; it now points atscp's own output, where the real diagnosis already was.
Fixed
- Deploys can no longer hang forever on an ssh prompt — every
deploy-path
ssh/scpnow carriesBatchMode=yesplus connect and keepalive timeouts (Get-Ec2SshOptsinZHelpers.ps1). WithoutBatchMode, ssh prompts for a passphrase or password and waits indefinitely; because the deploy pipes stderr through the pipeline, the prompt never reaches the screen and the run just stops under whatever step label printed last, with no explanation. Now it fails immediately — there is no prompt on this path worth answering.ServerAlive*bounds a session that dies mid-command (dropped VPN, sleeping laptop, rebooting host) to about a minute instead of hanging. - Vendored archives survive the archive filter — files under a
vendor/directory are exempt from the "no archives in the zip" rule. A project that vendors a dependency asvendor/*.tgzneeds it in the deploy zip; dropping it makes a Dockerfile'sCOPY vendor ./vendorfail at image build, a confusing way to learn the filter ate a build input. unzipinstall is idempotent — the remote step ranapt-get update && apt-get install -y unzipon every deploy; it now checkscommand -v unzipfirst and skips the apt round-trip when the binary is already there.zdeployedge kind now ships asset subdirectories (#42) — the edge deploy uploaded top-level files only, so a project self-hosting assets in folders (fonts/,vendor/) lost them on every deploy: docker created empty root-owned mount points and nginx served 404s from them, which shows up as fonts silently falling back and vendored JS never loading. Every subdirectory exceptnginx-logs/and.git/now ships recursively, and theensure edge dirchown is recursive so scp into docker-created root-owned dirs cannot fail.zdeployno longer deletes operator-managed files on deploy (#2) — the project-directory replacement preserved only./.env, silently destroying every other server-side file (.env.db, staged signing keys, certs) on every deploy. All.env*files at the project root are now preserved by default, plus anything listed in the newdeploy.preservearray (files or directories); the vite kind, which previously preserved nothing, gets the same protection. Found the hard way: a first production deploy of an auth service wiped its staged DB credentials and RSA signing keys.
Added
- Versioned releases:
zversion,zrelease,releases/— the toolkit now carries one version in a 5-segment scheme,v{major}.{rc}.{beta}.{alpha}.{build}.zversion bump(one per PR / defect fix) andzversion bump-stage release|rc|beta|alpha(zeroes every lower segment) rewritebuild-version.json, stamp# Version:into every script header — so a lone copied script still says which release it came from — and regenerateCHECKSUMS.txtin the same step.zreleasepackages the current version asreleases/zscripts-<version>.zipwith a.sha256beside it: one hash verifies the download, the bundledCHECKSUMS.txtverifies the extracted contents, so nobody needs to clone the repo to get a verifiable copy. Released zips are immutable —zreleaserefuses to overwrite one. zchecksums+CHECKSUMS.txt— a SHA-256 manifest covering every.ps1and.cmd, so a download can be verified before anything is run.zchecksumschecks them;zchecksums -Updateregenerates after an intentional edit. The manifest issha256sumformat, sosha256sum -c CHECKSUMS.txtworks on Linux/macOS/WSL too, and the hashes match on every platform because.gitattributespins these files to CRLF everywhere. Flags changed files, missing files, and scripts present on disk but absent from the manifest. It's an integrity check, not a signature — the manifest sits in the same repo as the code, so it catches corruption and accidental drift, not a compromised repo. A Pester test fails if the manifest ever goes stale.- Test suite (Pester) — the toolkit now has automated coverage of its own
pure logic:
Get-ArchiveExcludes(including the deploy-vs-backup rule that keeps.env/uploadsout of deploys but in backups), config and project lookups,remote.composeDirfallback, EC2 target composition, and build-label formatting. Run withInvoke-Pester .\tests(Pester 5+). Verified by mutation testing — reintroducing each historical bug turns the suite red. ZCONFIGenvironment variable — overrides the path tozconfig.json, so a run can target an alternate config. Also gives the test suite a seam for injecting a fixture.zec2_rotatekeys— safely rotate/reset server-side secrets — a new tool for when a secret leaks or a deploy overwrites a production.envwith dev values.-Rotate KEYregenerates a key on the server (openssl rand -hex 32) so the new value never leaves the box;-Set KEYtakes an operator-known value (e.g.DATABASE_URL,ADMIN_EMAIL) from a masked prompt and streams it over SSH stdin — never a command argument, never echoed. Backs the server.envup to a timestamped.bakfirst, updates the key atomically (matches or appends), auto-detectsbackend/.envfromdeploy.preserve, and with-Restartrecreates the container (up -d --force-recreate, so the new values actually load — a plain restart keeps the old environment).-WhatIfpreviews the plan without touching anything.zkill all—zkillnow acceptsall, stopping the dev server of every project that has aports.dev(edge/docker stacks with no local dev server are skipped). Brings it in line withzdeploy all/zbackup all; the one-shot "stop everything I've got running locally".zdeployserver-side health verification (verifyblock) — projects not published through the edge proxy can declare"verify": { "port": ..., "path": "/health", "expect": "..." }and the deploy is checked from the server itself (curl localhost:<port><path>over SSH) instead of hitting the public IP. Fixes a false PASS where the proxy's default vhost answered for apps that never started; projects with neitherdomainnorverifyare now reported as NOT verified.zdeployoptionaldeploy.gitPull—git pull --ff-onlyin the project root before zipping.zdeployzips the working tree and doesn't otherwise pull, so a checkout left behindoriginafter a merged PR would deploy stale code while still bumping the build number — success that changes nothing. A failed pull aborts the deploy instead.- Per-project
startconfig block —zstarthonors optional pre-start steps fromzconfig.json:"gitPull": truerunsgit pull --ff-onlyin the project root before starting (never boot a stale checkout), and"env": { ... }sets environment variables for the dev-server process. Example added tozconfig.example.json. - Switch-style argument tolerance — a leading dash on a project key is
ignored everywhere (
zdeploy -myapp==zdeploy myapp), for hands that grew up on per-project switches.
Changed
zbackup/zbackup_and_syncrequire an explicit target — running them bare now shows usage instead of quietly backing up every project;alldoes what bare invocation used to (matchingzdeploy). The scheduled task created bysetup_backup_schedule.ps1passesall— re-run it if your task was registered before this change.zbackupparses moreDATABASE_URLstyles — double/single-quoted values (Prisma convention),postgres://andpostgresql+driver://schemes, and URLs without an explicit port (defaults to 5432) all work; previously these skipped the Postgres dump with "Could not parse DATABASE_URL".zkill/ port cleanup kills the whole process tree — listeners on a project's port are now terminated children-first. Auto-reloading servers (uvicorn/watchfiles, nodemon) spawn workers that inherit the listening socket; killing only the parent left orphans serving stale code.zbackupfindsDATABASE_URLinbackend\.envtoo — projects with a frontend/backend split get their Postgres dump bundled without needing a root-level.env.
1.0.0
Initial public release: zstart / zkill / zrestart (local dev servers),
zdeploy (zip → upload → compose build → live build-version verification,
with handlers for python / vite / nextjs / edge / docker project kinds),
zec2 / zec2online / zrepair (health checks and recovery), zbackup /
zbackup_ec2 / zsync (local, server-side, and offsite backups), all driven
by a single gitignored zconfig.json.