mirror of
https://github.com/onyx-dot-app/onyx.git
synced 2026-10-23 11:53:08 -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 -->
136 lines
3.3 KiB
Go
136 lines
3.3 KiB
Go
//go:build !windows
|
|
|
|
package devstack
|
|
|
|
import (
|
|
"context"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
type barrierProvider struct {
|
|
*fakeProvider
|
|
entered chan<- struct{}
|
|
release <-chan struct{}
|
|
}
|
|
|
|
func TestSharedStartupDoesNotHoldProjectWhileWaitingForLocalCheckout(t *testing.T) {
|
|
shared, _ := sharedPair(t)
|
|
local, err := Open(shared.Root, shared.Project, Isolated)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
local.Registry = shared.Registry
|
|
ctx, cancel := context.WithTimeout(context.Background(), 8*time.Second)
|
|
defer cancel()
|
|
releaseLocal, err := local.Lock(ctx, "isolated startup", time.Second)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
opts := testOptions()
|
|
opts.LockWait = 3 * time.Second
|
|
done := make(chan error, 1)
|
|
go func() {
|
|
_, err := shared.Up(ctx, &fakeProvider{services: []string{"api"}}, opts)
|
|
done <- err
|
|
}()
|
|
projectLock := filepath.Join(shared.Registry.Dir, "projects", ProjectName(shared.Project), lockFileName)
|
|
deadline := time.Now().Add(750 * time.Millisecond)
|
|
for time.Now().Before(deadline) {
|
|
if strings.Contains(readLockOwner(projectLock), "infrastructure lifecycle") {
|
|
break
|
|
}
|
|
time.Sleep(10 * time.Millisecond)
|
|
}
|
|
releaseProject, err := local.LockInfrastructure(ctx, 0)
|
|
if err != nil {
|
|
t.Errorf("shared startup acquired project before local checkout: %v", err)
|
|
} else {
|
|
releaseProject()
|
|
}
|
|
releaseLocal()
|
|
if err := <-done; err != nil {
|
|
t.Fatalf("shared startup did not finish after local checkout released: %v", err)
|
|
}
|
|
}
|
|
|
|
func (p *barrierProvider) Prepare(ctx context.Context) error {
|
|
if err := p.fakeProvider.Prepare(ctx); err != nil {
|
|
return err
|
|
}
|
|
select {
|
|
case p.entered <- struct{}{}:
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
}
|
|
select {
|
|
case <-p.release:
|
|
return nil
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
}
|
|
}
|
|
|
|
func TestUpIndependentWorktreesPrepareConcurrently(t *testing.T) {
|
|
registry := t.TempDir()
|
|
stacks := []*Stack{newTestStack(t, registry), newTestStack(t, registry)}
|
|
entered := make(chan struct{}, len(stacks))
|
|
release := make(chan struct{})
|
|
results := make(chan error, len(stacks))
|
|
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
|
defer cancel()
|
|
opts := testOptions()
|
|
opts.SkipPrepare = false
|
|
opts.LockWait = 3 * time.Second
|
|
for _, stack := range stacks {
|
|
provider := &barrierProvider{
|
|
fakeProvider: &fakeProvider{services: []string{"web"}},
|
|
entered: entered,
|
|
release: release,
|
|
}
|
|
go func() {
|
|
_, err := stack.Up(ctx, provider, opts)
|
|
results <- err
|
|
}()
|
|
}
|
|
deadline := time.NewTimer(5 * time.Second)
|
|
defer deadline.Stop()
|
|
arrivals := 0
|
|
barrier:
|
|
for arrivals < len(stacks) {
|
|
select {
|
|
case <-entered:
|
|
arrivals++
|
|
case <-deadline.C:
|
|
t.Errorf("only %d of %d worktrees entered Prepare before release; independent startup is blocked", arrivals, len(stacks))
|
|
cancel()
|
|
break barrier
|
|
}
|
|
}
|
|
close(release)
|
|
for range stacks {
|
|
if err := <-results; err != nil {
|
|
t.Errorf("independent worktree startup: %v", err)
|
|
}
|
|
}
|
|
if t.Failed() {
|
|
return
|
|
}
|
|
first, err := stacks[0].Status()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
second, err := stacks[1].Status()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if first == nil || second == nil || !first.Ready || !second.Ready {
|
|
t.Fatalf("independent stacks did not become ready: %+v, %+v", first, second)
|
|
}
|
|
if first.Ports["web"] == second.Ports["web"] {
|
|
t.Fatal("concurrent worktrees leased the same web port")
|
|
}
|
|
}
|