mirror of
https://github.com/onyx-dot-app/onyx.git
synced 2026-10-22 19:32:55 -05:00
## Description
Make ODS reuse shared development infrastructure by default, with
`--isolated` for separate datasets.
- Use the same service specifications and launchers for `stack`, `web
dev`, and `backend` commands. Remove the duplicate `stack
--frontend-only` option.
- Enforce project ownership across checkouts and resolve database
commands to the actual managed database.
- Stop services before pending migrations, preserve them when already at
head, and reject manual migrations beneath managed services.
- Harden startup cancellation, shutdown grace, descendant cleanup,
terminal input, and frontend API validation. Preserve Windows foreground
commands.
- Consolidate environment helpers, protect symlinked environment files,
propagate restore errors, and update help and documentation.
This PR contains only ODS and its development-stack skill. It does not
include the plugins implementation.
## How Has This Been Tested?
- Targeted command and regression tests using fake tools and disposable
Git repositories.
- Race tests for runtime targeting, ownership, migration ordering,
process cleanup, and terminal input.
- `go vet ./...`, pre-commit checks, native builds, and Windows
cross-builds.
- The full Go suite was run. Its remaining failures are the existing
macOS devcontainer SSH-mount fixture expectations in
`TestDevcontainerCommands` and `TestRunDevRebuild`.
No real database migrations, restores, or development-stack restarts
ran. Native Windows execution remains untested.
## Additional Options
- [ ] [Optional] Please cherry-pick this PR to the latest release
version.
- [x] [Optional] Override Linear Check
<!-- This is an auto-generated description by cubic. -->
---
## Summary by cubic
ODS now shares development infrastructure across worktrees by default,
with `--isolated` for separate datasets. `stack`, `web dev`, and
`backend` use the same service specs and launchers, and the duplicate
`stack --frontend-only` option is removed.
- Direct launches run the same dependency-prepare step as stack startup,
so `backend` and `web dev` work with fresh or stale Python environments.
- A stopped preview discards its former project state before retargeting
to another API owner.
- Enforces project ownership across checkouts and resolves database
commands to the managed database. New tests reject conflicting targets
before any mutation.
- Stops services before pending migrations, preserves them when already
at head, and rejects manual migrations beneath managed services.
Migration probe failures fail closed.
- Hardens startup cancellation, shutdown grace, and descendant cleanup;
ODS keeps the terminal foreground group so Ctrl-C still honors shutdown
timeouts, and tmux pane identifiers no longer change service identity.
- Database passwords reach tools through the child environment only,
never in process arguments; Windows foreground commands are preserved.
- Consolidates environment helpers, protects symlinked env files,
propagates restore errors, and refreshes help and documentation. Test
commits exercise the new migration-target and preview-launch paths.
<sup>Written for commit 14500cb051.
Summary will update on new commits.</sup>
<a
href="https://cubic.dev/pr/onyx-dot-app/onyx/pull/16246?utm_source=github"
target="_blank" rel="noopener noreferrer"
data-no-image-dialog="true"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://www.cubic.dev/buttons/review-in-cubic-dark.svg"><source
media="(prefers-color-scheme: light)"
srcset="https://www.cubic.dev/buttons/review-in-cubic-light.svg"><img
alt="View guided diff"
src="https://www.cubic.dev/buttons/review-in-cubic-light.svg"></picture></a>
<a
href="https://www.cubic.dev/action/auto-fix/pr/onyx-dot-app/onyx/16246?returnTo=https%3A%2F%2Fgithub.com%2Fonyx-dot-app%2Fonyx%2Fpull%2F16246&source=description"
target="_blank" rel="noopener noreferrer"
data-no-image-dialog="true"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://www.cubic.dev/buttons/turn-on-auto-fix-dark.svg"><source
media="(prefers-color-scheme: light)"
srcset="https://www.cubic.dev/buttons/turn-on-auto-fix-light.svg"><img
alt="Turn on auto-fix"
src="https://www.cubic.dev/buttons/turn-on-auto-fix-light.svg"></picture></a>
<!-- End of auto-generated description by cubic. -->
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **New Features**
* Added the global `--isolated` option for separate development stacks;
shared infrastructure is the default, with clearer project ownership and
status information.
* Added `ods web dev` previews that can use a healthy managed API on
macOS and Linux, plus foreground startup on Windows.
* Expanded command guidance for development workflows, database
targeting, and dump formats.
* **Bug Fixes**
* Pending migrations now stop managed application services first;
healthy services remain running when no migrations are needed.
* Database operations verify project ownership and target selection
before making changes. Restore errors now fail the command, SQL restores
stop on errors, and temporary files are cleaned up after failures.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
152 lines
4.4 KiB
Go
152 lines
4.4 KiB
Go
package cmd
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"time"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/onyx-dot-app/onyx/tools/ods/internal/docker"
|
|
"github.com/onyx-dot-app/onyx/tools/ods/internal/paths"
|
|
)
|
|
|
|
// DBDumpOptions holds options for the db dump command.
|
|
type DBDumpOptions struct {
|
|
Format string
|
|
Schema string
|
|
Output string
|
|
}
|
|
|
|
// NewDBDumpCommand creates the db dump command.
|
|
func NewDBDumpCommand() *cobra.Command {
|
|
opts := &DBDumpOptions{}
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "dump [output-file]",
|
|
Short: "Create a database snapshot",
|
|
Long: `Create a database snapshot using pg_dump.
|
|
|
|
The snapshot is saved to the specified output file, or to the default
|
|
snapshots directory (~/.local/share/onyx-dev/snapshots/) if no file is specified.
|
|
|
|
Examples:
|
|
ods db dump # Creates onyx_<timestamp>.dump in snapshots dir
|
|
ods db dump mybackup.dump # Creates mybackup.dump in snapshots dir
|
|
ods db dump /path/to/backup.sql --format sql # Creates SQL at the specified path
|
|
ods db dump --format sql # Creates SQL format instead of custom format`,
|
|
Args: cobra.MaximumNArgs(1),
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
if len(args) > 0 {
|
|
opts.Output = args[0]
|
|
}
|
|
if err := runDBDump(opts); err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
},
|
|
}
|
|
|
|
cmd.Flags().StringVar(&opts.Format, "format", "custom", "Output format: 'custom' (pg_dump -Fc) or 'sql' (plain SQL)")
|
|
cmd.Flags().StringVar(&opts.Schema, "schema", "", "Dump only a specific schema")
|
|
|
|
return cmd
|
|
}
|
|
|
|
func runDBDump(opts *DBDumpOptions) error {
|
|
ext := strings.ToLower(filepath.Ext(opts.Output))
|
|
if ext == ".sql" && opts.Format != "sql" || ext == ".dump" && opts.Format != "custom" {
|
|
return fatalErrorf("Output extension %s does not match dump format %q; use --format sql with .sql or --format custom with .dump", ext, opts.Format)
|
|
}
|
|
// Find PostgreSQL container.
|
|
target, container, config, err := resolveDBContainerTarget()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
log.Infof("Selected project %s, PostgreSQL container %s", target.Project, container)
|
|
release, err := lockRuntimeTarget(target, false)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer release()
|
|
|
|
// Determine output file path.
|
|
outputPath := determineOutputPath(opts.Output, opts.Format)
|
|
|
|
// Ensure output directory exists.
|
|
outputDir := filepath.Dir(outputPath)
|
|
if err := os.MkdirAll(outputDir, 0755); err != nil {
|
|
return fatalErrorf("Failed to create output directory: %w", err)
|
|
}
|
|
|
|
log.Infof("Dumping database '%s' to: %s", config.Database, outputPath)
|
|
|
|
// Build pg_dump arguments.
|
|
args := config.PgDumpArgs(opts.Format)
|
|
if opts.Schema != "" {
|
|
args = append(args, "-n", opts.Schema)
|
|
}
|
|
|
|
// Create a temporary file in the container.
|
|
containerTmpFile := "/tmp/onyx_dump_tmp"
|
|
args = append(args, "-f", containerTmpFile)
|
|
|
|
// Run pg_dump in container.
|
|
env := config.Env()
|
|
pgDumpArgs := append([]string{"pg_dump"}, args...)
|
|
defer func() { _ = docker.Exec(container, "rm", "-f", containerTmpFile) }()
|
|
if err := docker.ExecWithEnv(container, env, pgDumpArgs...); err != nil {
|
|
return fatalErrorf("Failed to run pg_dump: %w", err)
|
|
}
|
|
// Copy the dump file from container to host.
|
|
if err := docker.CopyFromContainer(container, containerTmpFile, outputPath); err != nil {
|
|
return fatalErrorf("Failed to copy dump file: %w", err)
|
|
}
|
|
|
|
// Get file size for info.
|
|
if info, err := os.Stat(outputPath); err == nil {
|
|
log.Infof("Dump completed successfully (%s)", humanizeBytes(info.Size()))
|
|
} else {
|
|
log.Info("Dump completed successfully")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// determineOutputPath determines the output file path based on options.
|
|
func determineOutputPath(output string, format string) string {
|
|
ext := ".dump"
|
|
if format == "sql" {
|
|
ext = ".sql"
|
|
}
|
|
|
|
if output == "" {
|
|
// Generate default filename with timestamp.
|
|
timestamp := time.Now().Format("20060102_150405")
|
|
filename := fmt.Sprintf("onyx_%s%s", timestamp, ext)
|
|
return filepath.Join(paths.SnapshotsDir(), filename)
|
|
}
|
|
|
|
// Check if output is just a filename (no directory).
|
|
if filepath.Dir(output) == "." {
|
|
return filepath.Join(paths.SnapshotsDir(), output)
|
|
}
|
|
|
|
return output
|
|
}
|
|
|
|
// humanizeBytes converts bytes to a human-readable string.
|
|
func humanizeBytes(bytes int64) string {
|
|
const unit = 1024
|
|
if bytes < unit {
|
|
return fmt.Sprintf("%d B", bytes)
|
|
}
|
|
div, exp := int64(unit), 0
|
|
for n := bytes / unit; n >= unit; n /= unit {
|
|
div *= unit
|
|
exp++
|
|
}
|
|
return fmt.Sprintf("%.1f %cB", float64(bytes)/float64(div), "KMGTPE"[exp])
|
|
}
|