mirror of
https://github.com/onyx-dot-app/onyx.git
synced 2026-10-23 03:42:59 -05:00
## Description
This PR removes `Registry.Lease` from
`tools/ods/internal/devstack/ports.go`. It was a one-line wrapper that
called `LeaseFor(root, "", requests)`. Its last production caller,
`leasePorts` in `lifecycle.go`, switched to `LeaseFor` in #16285. After
that change, only tests called `Lease`.
The tests now call `LeaseFor(root, "", ...)` directly, so their behavior
does not change. The files are `ports_test.go`, `launch_test.go`,
`ports_live_test.go`, `service_runner_test.go` and
`cmd/stack_ls_test.go`.
#16263 removed `NewConfigFromEnv` for the same reason.
## How Has This Been Tested?
- `gofmt`, `go vet ./...` and `go vet -tags live,integration ./...`
pass.
- `go test ./internal/devstack/` passes.
- In `go test ./cmd/`, only `TestRunCI_failures` fails. #16285 reports
that this test also fails on a clean main in this environment.
- Pre-commit (`golangci-lint`) passes.
## Additional Options
- [ ] [Optional] Please cherry-pick this PR to the latest release
version.
Link to Devin session:
https://app.devin.ai/sessions/a3cb68152476440ab90f20b4ed1d644b
Open in Devin Desktop:
https://app.devin.ai/desktop/session/a3cb68152476440ab90f20b4ed1d644b?variant=devin
<!-- This is an auto-generated description by cubic. -->
---
## Summary by cubic
Removes the unused `Registry.Lease` wrapper from
`tools/ods/internal/devstack/ports.go`. Its last production caller
switched to `LeaseFor` in #16285, and the affected tests now call
`LeaseFor(root, "", ...)` directly with no behavior change.
<sup>Written for commit f7bf65ef71.
Summary will update on new commits.</sup>
<a
href="https://cubic.dev/pr/onyx-dot-app/onyx/pull/16289?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/16289?returnTo=https%3A%2F%2Fgithub.com%2Fonyx-dot-app%2Fonyx%2Fpull%2F16289&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
* **Refactor**
* Consolidated port lease handling through the state-aware lease
interface.
* Removed the legacy lease method; existing lease scenarios continue to
support reclamation, replacement, release, and port selection.
* **Tests**
* Updated lease-related coverage to use the current interface while
preserving validation of stale leases, durable leases, foreign
listeners, and busy preferred ports.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: roshan <38771624+rohoswagger@users.noreply.github.com>
113 lines
3.3 KiB
Go
113 lines
3.3 KiB
Go
package devstack
|
|
|
|
import (
|
|
"errors"
|
|
"io"
|
|
"net"
|
|
"strconv"
|
|
"syscall"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func TestBindableRejectsLoopbackListeners(t *testing.T) {
|
|
for _, network := range []string{"tcp4", "tcp6"} {
|
|
t.Run(network, func(t *testing.T) {
|
|
address := "127.0.0.1:0"
|
|
if network == "tcp6" {
|
|
address = "[::1]:0"
|
|
}
|
|
listener := listenPortProbe(t, network, address)
|
|
port := listener.Addr().(*net.TCPAddr).Port
|
|
if bindable(port) {
|
|
t.Fatalf("occupied %s loopback port %d is bindable", network, port)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func listenPortProbe(t *testing.T, network, address string) net.Listener {
|
|
t.Helper()
|
|
listener, err := net.Listen(network, address)
|
|
if err != nil {
|
|
if network == "tcp6" && (errors.Is(err, syscall.EAFNOSUPPORT) || errors.Is(err, syscall.EPROTONOSUPPORT) || errors.Is(err, syscall.EADDRNOTAVAIL)) {
|
|
t.Skipf("IPv6 unavailable: %v", err)
|
|
}
|
|
t.Fatal(err)
|
|
}
|
|
t.Cleanup(func() { _ = listener.Close() })
|
|
return listener
|
|
}
|
|
|
|
func TestBindableRejectsWildcardListeners(t *testing.T) {
|
|
for _, probe := range []struct{ network, address string }{
|
|
{"tcp4", "0.0.0.0:0"},
|
|
{"tcp6", "[::]:0"},
|
|
} {
|
|
t.Run(probe.network, func(t *testing.T) {
|
|
listener := listenPortProbe(t, probe.network, probe.address)
|
|
port := listener.Addr().(*net.TCPAddr).Port
|
|
if bindable(port) {
|
|
t.Fatalf("occupied %s wildcard port %d is bindable", probe.network, port)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestBindableAcceptsReleasedPort(t *testing.T) {
|
|
listener := listenPortProbe(t, "tcp4", "127.0.0.1:0")
|
|
port := listener.Addr().(*net.TCPAddr).Port
|
|
if err := listener.Close(); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if !bindable(port) {
|
|
t.Fatalf("released port %d is not bindable", port)
|
|
}
|
|
}
|
|
|
|
func TestLeaseAvoidsLoopbackPortAndPreservesForeignListener(t *testing.T) {
|
|
for _, probe := range []struct{ network, host string }{
|
|
{"tcp4", "127.0.0.1"},
|
|
{"tcp6", "::1"},
|
|
} {
|
|
t.Run(probe.network, func(t *testing.T) {
|
|
listener := listenPortProbe(t, probe.network, net.JoinHostPort(probe.host, "0"))
|
|
port := listener.Addr().(*net.TCPAddr).Port
|
|
registry := &Registry{Dir: t.TempDir()}
|
|
ports, err := registry.LeaseFor(t.TempDir(), "", []PortRequest{{Name: "web", Preferred: port}})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if ports["web"] == port || ports["web"] <= 0 {
|
|
t.Fatalf("lease did not avoid foreign port %d: %v", port, ports)
|
|
}
|
|
conn, err := net.DialTimeout(probe.network, net.JoinHostPort(probe.host, strconv.Itoa(port)), time.Second)
|
|
if err != nil {
|
|
t.Fatalf("foreign listener stopped accepting connections: %v", err)
|
|
}
|
|
defer func() { _ = conn.Close() }()
|
|
if err := listener.(*net.TCPListener).SetDeadline(time.Now().Add(time.Second)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
accepted, err := listener.Accept()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer func() { _ = accepted.Close() }()
|
|
if err := accepted.SetDeadline(time.Now().Add(time.Second)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := conn.SetDeadline(time.Now().Add(time.Second)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, err := accepted.Write([]byte("still running")); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
response := make([]byte, len("still running"))
|
|
if _, err := io.ReadFull(conn, response); err != nil || string(response) != "still running" {
|
|
t.Fatalf("foreign listener no longer serves data: %q, %v", response, err)
|
|
}
|
|
})
|
|
}
|
|
}
|