mirror of
https://github.com/Twigpine/zero.git
synced 2026-11-11 23:40:28 -10:00
* feat(update): add zero upgrade command to apply self-updates Extends the existing `zero update --check` (which only reported an available release) with an actual install step: - `zero update --apply` / `zero upgrade` download, sha256-verify, and install the latest release. - npm installs delegate to `npm install -g @gitlawb/zero@latest`. - Standalone installs download the release archive, verify its checksum, extract it (zip-slip guarded), and atomically replace the running binary plus any pre-existing optional sandbox helpers. On Windows, the running exe is renamed aside (NTFS allows this even while it's executing) since it can't be overwritten directly; the leftover ".old" file is cleaned up on a later invocation. Closes #459. * fix(update): correct macOS expectations in apply test The optional-helper assertion in TestApplyStandaloneUpdateReplacesBinary assumed every non-Windows platform has a linux-style "zero-seccomp" helper to refresh, but applyStandaloneUpdate correctly ships no optional helpers on macOS (matching scripts/postinstall.mjs). This made the test fail on macOS CI. Only assert the helper refresh on linux/windows. * fix(update): address CodeRabbit review findings on zero upgrade - Reject --target when combined with --apply/upgrade: applying installs onto the current machine, so a mismatched --target could replace the running binary with an incompatible-arch build. - Bound archive/checksum downloads with a dedicated timeout separate from the release-metadata check timeout, so a stalled connection can't hang zero upgrade forever. - Surface a failed rollback in the Windows replaceBinary path instead of swallowing it, so a botched install is reported rather than silently leaving the binary missing. - Run CleanupStaleBinary regardless of whether an update is available, so a leftover Windows ".old" file isn't stuck waiting for a future upgrade that may never come. - Report optional sandbox-helper refresh failures as warnings on ApplyResult (surfaced in text and JSON output) instead of discarding them silently. * fix(oauth): retry secret-lock on Windows delete-pending race to unblock CI TestLoadOrCreateSecretConcurrentConverges was failing this PR's Windows smoke job with "create token secret lock: ...Access is denied." — a pre-existing flake in internal/oauth, not in the upgrade code. On Windows a concurrent holder's os.Remove leaves the .lock in a delete-pending state, so an O_EXCL create races it with ERROR_ACCESS_DENIED (os.ErrPermission) rather than ErrExist; createSecretFile only treated ErrExist as contention and hard-failed otherwise. Treat os.ErrPermission as retryable too, mirroring acquireFileLock in lock.go. This is the same root-cause fix as #445 (diagnosis by @gnanam1990); folded in here to make this PR's CI green. Verified on Windows: the concurrent-converge test passes 30/30. --------- Co-authored-by: Vasanthdev2004 <[email protected]>
213 lines
6.4 KiB
Go
213 lines
6.4 KiB
Go
package cli
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/Gitlawb/zero/internal/update"
|
|
)
|
|
|
|
type updateOptions struct {
|
|
check bool
|
|
apply bool
|
|
json bool
|
|
repository string
|
|
endpoint string
|
|
timeout time.Duration
|
|
target string
|
|
}
|
|
|
|
func runUpdate(args []string, stdout io.Writer, stderr io.Writer, deps appDeps) int {
|
|
return runUpdateCommand(args, stdout, stderr, deps, false)
|
|
}
|
|
|
|
func runUpgrade(args []string, stdout io.Writer, stderr io.Writer, deps appDeps) int {
|
|
return runUpdateCommand(args, stdout, stderr, deps, true)
|
|
}
|
|
|
|
// runUpdateCommand backs both `zero update` and `zero upgrade`. defaultApply
|
|
// makes `--apply` the implicit behavior for `zero upgrade` when neither
|
|
// `--check` nor `--apply` is passed explicitly; `zero update` keeps requiring
|
|
// one of the two so existing scripts around `zero update --check` don't change.
|
|
func runUpdateCommand(args []string, stdout io.Writer, stderr io.Writer, deps appDeps, defaultApply bool) int {
|
|
options, help, err := parseUpdateArgs(args)
|
|
if err != nil {
|
|
return writeUsageError(stderr, err.Error())
|
|
}
|
|
if help {
|
|
if err := writeUpdateHelp(stdout); err != nil {
|
|
return exitCrash
|
|
}
|
|
return exitSuccess
|
|
}
|
|
if options.check && options.apply {
|
|
return writeUsageError(stderr, "Pass only one of --check or --apply.")
|
|
}
|
|
if !options.check && !options.apply {
|
|
if !defaultApply {
|
|
return writeUsageError(stderr, "Pass --check to check for updates or --apply to install one (or use `zero upgrade`).")
|
|
}
|
|
options.apply = true
|
|
}
|
|
if options.apply && options.target != "" {
|
|
return writeUsageError(stderr, "--target cannot be combined with --apply; it only verifies release assets for --check.")
|
|
}
|
|
updateOptions := update.Options{
|
|
CurrentVersion: version,
|
|
Repository: options.repository,
|
|
Endpoint: options.endpoint,
|
|
Timeout: options.timeout,
|
|
}
|
|
if options.target != "" {
|
|
target, err := update.ResolveTarget(options.target)
|
|
if err != nil {
|
|
return writeUsageError(stderr, err.Error())
|
|
}
|
|
updateOptions.GOOS = target.GOOS
|
|
updateOptions.GOARCH = target.GOARCH
|
|
}
|
|
if options.apply {
|
|
result, err := deps.applyUpdate(context.Background(), updateOptions)
|
|
if err != nil {
|
|
return writeAppError(stderr, "Could not install update: "+err.Error(), exitCrash)
|
|
}
|
|
if options.json {
|
|
if err := writePrettyJSON(stdout, result); err != nil {
|
|
return exitCrash
|
|
}
|
|
return exitSuccess
|
|
}
|
|
if _, err := fmt.Fprintln(stdout, update.FormatApply(result)); err != nil {
|
|
return exitCrash
|
|
}
|
|
return exitSuccess
|
|
}
|
|
result, err := deps.checkUpdate(context.Background(), updateOptions)
|
|
if err != nil {
|
|
return writeAppError(stderr, "Could not check for updates: "+err.Error(), exitCrash)
|
|
}
|
|
if options.json {
|
|
if err := writePrettyJSON(stdout, result); err != nil {
|
|
return exitCrash
|
|
}
|
|
return exitSuccess
|
|
}
|
|
if _, err := fmt.Fprintln(stdout, update.Format(result)); err != nil {
|
|
return exitCrash
|
|
}
|
|
return exitSuccess
|
|
}
|
|
|
|
func parseUpdateArgs(args []string) (updateOptions, bool, error) {
|
|
options := updateOptions{}
|
|
for index := 0; index < len(args); index++ {
|
|
arg := args[index]
|
|
switch {
|
|
case arg == "-h" || arg == "--help" || arg == "help":
|
|
return options, true, nil
|
|
case arg == "--check":
|
|
options.check = true
|
|
case arg == "--apply":
|
|
options.apply = true
|
|
case arg == "--json":
|
|
options.json = true
|
|
case arg == "--repo":
|
|
value, next, err := nextFlagValue(args, index, arg)
|
|
if err != nil {
|
|
return options, false, err
|
|
}
|
|
options.repository = strings.TrimSpace(value)
|
|
index = next
|
|
case strings.HasPrefix(arg, "--repo="):
|
|
options.repository = strings.TrimSpace(strings.TrimPrefix(arg, "--repo="))
|
|
case arg == "--endpoint":
|
|
value, next, err := nextFlagValue(args, index, arg)
|
|
if err != nil {
|
|
return options, false, err
|
|
}
|
|
options.endpoint = strings.TrimSpace(value)
|
|
index = next
|
|
case strings.HasPrefix(arg, "--endpoint="):
|
|
options.endpoint = strings.TrimSpace(strings.TrimPrefix(arg, "--endpoint="))
|
|
case arg == "--timeout":
|
|
value, next, err := nextFlagValue(args, index, arg)
|
|
if err != nil {
|
|
return options, false, err
|
|
}
|
|
timeout, err := parseUpdateTimeout(value)
|
|
if err != nil {
|
|
return options, false, err
|
|
}
|
|
options.timeout = timeout
|
|
index = next
|
|
case strings.HasPrefix(arg, "--timeout="):
|
|
timeout, err := parseUpdateTimeout(strings.TrimPrefix(arg, "--timeout="))
|
|
if err != nil {
|
|
return options, false, err
|
|
}
|
|
options.timeout = timeout
|
|
case arg == "--target":
|
|
value, next, err := nextFlagValue(args, index, arg)
|
|
if err != nil {
|
|
return options, false, err
|
|
}
|
|
target, err := parseUpdateTarget(value)
|
|
if err != nil {
|
|
return options, false, err
|
|
}
|
|
options.target = target
|
|
index = next
|
|
case strings.HasPrefix(arg, "--target="):
|
|
target, err := parseUpdateTarget(strings.TrimPrefix(arg, "--target="))
|
|
if err != nil {
|
|
return options, false, err
|
|
}
|
|
options.target = target
|
|
default:
|
|
return options, false, execUsageError{fmt.Sprintf("unknown update flag %q", arg)}
|
|
}
|
|
}
|
|
return options, false, nil
|
|
}
|
|
|
|
func parseUpdateTimeout(value string) (time.Duration, error) {
|
|
timeout, err := time.ParseDuration(strings.TrimSpace(value))
|
|
if err != nil {
|
|
return 0, execUsageError{fmt.Sprintf("invalid update timeout %q: use a duration like 5s or 750ms", value)}
|
|
}
|
|
if timeout <= 0 {
|
|
return 0, execUsageError{fmt.Sprintf("invalid update timeout %q: timeout must be a positive duration", value)}
|
|
}
|
|
return timeout, nil
|
|
}
|
|
|
|
func parseUpdateTarget(value string) (string, error) {
|
|
target := strings.TrimSpace(value)
|
|
if target == "" {
|
|
return "", execUsageError{"--target requires a non-empty value"}
|
|
}
|
|
return target, nil
|
|
}
|
|
|
|
func writeUpdateHelp(w io.Writer) error {
|
|
_, err := fmt.Fprint(w, `Usage:
|
|
zero update --check [flags]
|
|
zero update --apply [flags]
|
|
zero upgrade [flags]
|
|
|
|
Flags:
|
|
--check Check the latest GitHub release without installing
|
|
--apply Download, verify, and install the latest release
|
|
--json Print the update result as JSON
|
|
--repo <owner/repo> Repository to check when no endpoint is provided
|
|
--endpoint <url|repo> Release API URL or owner/repo slug to check
|
|
--timeout <duration> Release check timeout (default 5s)
|
|
--target <platform> Release target to verify with --check (for example windows-x64); not valid with --apply
|
|
-h, --help Show this help
|
|
`)
|
|
return err
|
|
}
|