[schnie]

Syncs main's one commit since #2415 into v2, and ports it.

Merge with "Create a merge commit", not squash. Squash drops main as a parent (see #2374 and the five record PRs before it).

PR	How	v2 files
#2407 Retry rate-limited API requests, and stop when an API token's organization can't be looked up	Merged as a parent only, then ported	every file it touches moved on v2, so the merge commit keeps v2's tree unchanged and the second commit carries the change

The port

Same change as main's, on v2's paths:

main	v2
pkg/httputil/retry.go, retry_test.go	same paths, as is
astro-client-v1/client.go	internal/platform/astro/clients/astrov1/client.go, both NewV1Client and NewV1ClientForLogin (v2 only)
astro-client-v1alpha1/client.go	internal/platform/astro/clients/astrov1alpha1/client.go
cmd/cloud/setup.go, setup_test.go	cmd/astro/setup.go, setup_test.go
cmd/root_hooks.go, root_hooks_test.go (cloudSetup)	same paths (astroSetup)

go-retryablehttp is now a direct dependency at v0.7.8, main's version (it was already in v2's graph at v0.7.7).

Test-only fixes for v2's stricter lint: import grouping in two test files, and a reason on retry_test.go's //nolint:bodyclose.

Review fixes (v2 only; main keeps #2407 as merged)

A /code-review of the port found these. Most apply to main as well; they are fixed here because 1.x is winding down.

Retries (pkg/httputil/retry.go)

• A Retry-After wait is capped at 10s per retry. Before, it was taken as given, so Retry-After: 300 would hang a command about 15 minutes with no output.
• The retry check no longer returns an error alongside a response. That made net/http drop the response unclosed when a context ended just after the reply. retryablehttp already stops waiting when the context ends.
• The retrying client closes only its own idle connections. Wrapping the shared client directly meant every failed request closed http.DefaultTransport's connections, which Houston, Airflow and the version check also use. The new transport still reads the wrapped client's transport per request, so test transports and the no-network guard keep working.

The organization lookup (cmd/astro/setup.go)

• checkAPIToken and checkAPIKeys share one lookup, environmentOrganization. An empty org list or an org with no product is now ErrAPITokenOrganization instead of a panic. API keys now stop on a failed lookup the way an API token does, and an empty deployments list is an error too.
• Why the lookup can't be skipped: the review suggested taking the org from the token's claims and treating the lookup as optional. The product can't be dropped, though. An environment login keeps it only for the process, so every run must look it up, and it's what organization.IsOrgHosted() reads (deployment create/update validation, the monitoring DAG on deploy). Carrying on without it would treat a hosted org as hybrid.

Commands that don't need the org

• astro auth token still skips a lookup that failed because the API was unavailable (a 429, a 503, a network error), since the token is saved first and printing it needs no org. It no longer skips one the API refused with 401 or 403: that token doesn't work, and printing it with exit 0 would hide that. TestPreRunLeavesJSONStdoutAlone now has both cases.
• astro api registry queries the public provider registry, so it carries NoLoginAnnotation (as telemetry, config and context do) and the login check skips it.

Checks

• git rev-list HEAD..origin/main is 0.
• The merge commit's tree is identical to v2's.
• After the review fixes: make test, make tidy-check and make deadcode pass locally; golangci-lint v2.13.2 reports 0 issues; GOOS=windows go build ./... and go vet on the changed packages pass. (make lint itself can't run on the machine this was checked on: prek's hook runs Go 1.26.2, which v2's go.mod rejects. The same golangci-lint version was run directly instead.)

[coveralls-official]

Coverage Report for CI Build 39806272762

Coverage increased (+0.03%) to 60.602%

Details

• Coverage increased (+0.03%) from the base build.
• Patch coverage: 8 uncovered changes across 2 files (56 of 64 lines covered, 87.5%).
• 2 coverage regressions across 1 file.

Uncovered Changes

File	Changed	Covered	%
cmd/astro/setup.go	27	21	77.78%
internal/platform/astro/clients/astrov1/client.go	2	0	0.0%
Total (6 files)	64	56	87.5%

Coverage Regressions

2 previously-covered lines in 1 file lost coverage.

File	Lines Losing Coverage	Coverage
cmd/astro/setup.go	2	79.86%

---

Coverage Stats

Relevant Lines:	68546
Covered Lines:	41540
Line Coverage:	60.6%
Coverage Strength:	408.23 hits per line

---

💛 - Coveralls