Skip to content

Reconciled follow-up above PR 1506 - #1605

Closed
ChristianPavilonis wants to merge 4 commits into
spec/edgezero-pr275-migrationfrom
review/ts-pr1506-reconciliation-20261113
Closed

ChristianPavilonis wants to merge 4 commits into
spec/edgezero-pr275-migrationfrom
review/ts-pr1506-reconciliation-20261113

Conversation

@ChristianPavilonis

Copy link
Copy Markdown
Collaborator

Summary

Refresh the owned follow-up above #1506 at 57d7c6ad8db43601ef31c1e1d1615e6dd2aa6a6a without changing Aram's branch or replaying the foundation.

  • Adopt existing EdgeZero v0.0.12-rc-axum.202611.2 at 4407d941, retaining the deliberate resolved lock and non-Copy/boxed-response caller adaptations.
  • Register native received-head preparation without upgrading an existing rejection or rewriting URI/Host/Origin/ingress evidence. Publisher forwarding authentication stays separate from protected proxy/Geo provenance.
  • Preserve Aram's subsequent Bypass cache for signed S3 image preflights #1516 implementation, stronger tests, asset guide and cutover spec. The production proxy code is unchanged from his base. Adapt two test-helper uses to the selected release and retain thirteen additional raw-cache controls instead of the old overlapping 24-case matrix. The historical owned S3 port remains in ancestry but is no longer claimed as the production review delta.
  • Keep five audited fixture corrections for pinned Chrome, deterministic collector batching, Cargo target discovery and explicit Cloudflare configuration/readiness.

The previous owned candidate and the complete new author history remain ancestors through an ordinary merge. The feature PRs retain their separate startup/Geo/HTTP/EC/consent/storage/image/wrapper/reference boundaries.

Qualification

At owned follow-up 1174c6d6d28df00217d99ff576dc2001ff8fe925, all 161 proxy cases, strict Core lint, native adapter tests, actual CLI proxy cases and docs checks pass. The refreshed combined RC passes 3,447 Core cases with 2 ignored, 114 native-adapter cases with 7 ignored, and 963 CLI cases with 29 ignored. Target-matched native/WASM adapter, strict lint, docs/guard and actual deadline/EOF/trace/cache checks also pass. Exact source, commands, counts, ignored cases, reused fingerprints and residuals are in the local refresh report.

JS/consent, six Chrome collector cases, direct DynamoDB Local, wrapper entrypoint and Terraform mock results are reused only with documented unchanged relevant inputs. They are not relabeled as new executions. The new local untagged source image and Agent/Moto proof belong to the refreshed #1539 candidate, not a new RC release.

The initial helper Clippy failure and boundary-check diff-prefix mismatch remain recorded with corrected separate receipts. Prior baseline reds and failed invocations remain input-specific historical evidence. No assertion, security policy, deadline or build-integrity check was weakened.

No fresh hosted/macOS, new RC image, fresh digest-backed wrapper image, external browser/framework or live AWS/publisher/CMP qualification is claimed. Ignored and unexecuted cases are not passes.

Ownership

Draft dependent review above #1506. Aram's TS #1506 and EdgeZero #275 remain read-only. Existing immutable tags are unchanged; no release, main merge, registry publication, deployment or live cloud operation is included. EdgeZero #499 cleanup remains separate. Source PRs #1498/#1557, closed #1545 and unrelated #1527 are not republished or duplicated.

Refs #1506, #1516.

Published snapshot; newer upstream integration pending

Published deliberately for review from the qualified #1506 checkpoint 57d7c6ad8db43601ef31c1e1d1615e6dd2aa6a6a. At publication the moving author branch was at 628474ec4a8cee8361a6927ae6b79b68fdd33a55. Newer upstream bounded-response handling, per-profile RTB caps and Sourcepoint changes are not incorporated or qualified in this snapshot. Further merge-forward reconciliation and conflict resolution may be needed before merge. Local results above describe this exact qualified source, not a merge with the newer base or a release.

Carry the behavior merged in #1516 at1810c763 without restoring the retired transport abstraction. Keep optimized requests and ordinary raw GET/unsigned HEAD caching unchanged.
@ChristianPavilonis
ChristianPavilonis marked this pull request as ready for review November 13, 2026 18:45
@ChristianPavilonis ChristianPavilonis changed the title Reconcile the owned follow-up above PR 1506 Reconciled follow-up above PR 1506 Nov 13, 2026
aram356 added a commit that referenced this pull request Nov 15, 2026
Pins the six EdgeZero crates to 10166628, a commit of EdgeZero's
rc/identity integration branch. It carries PR 275's head e9ffaa8f, which
is 5c32ae61 with EdgeZero main merged in, plus the PRs stacked on PR 275
(EdgeZero 499, 460, 406, 407, 409, 414, 422 and 439) and the JA4 request
interface (EdgeZero 469).

- EdgeZero 409 removes Forwarded and X-Forwarded-* fields on Axum before
  routing. The Axum router now records the authenticated forwarder
  decision in EdgeZero's received-head preparer, which EdgeZero 499
  restores and which runs before that removal. The preparer and its two
  tests come from 3da80af in #1605.
- EdgeZero 460 adds cache tags to OutboundCachePolicy, so the type is no
  longer Copy. Test code clones it, and ExpectedTransport drops Copy.
- EdgeZero's workspace pins getrandom to exactly 0.4.2, so the lockfile
  moves from 0.4.3 to 0.4.2.
@aram356

aram356 commented Nov 15, 2026

Copy link
Copy Markdown
Collaborator

Closing so that #1506 is the one source of the Axum forwarder change.

#1506 at 858f95087 pins EdgeZero rc/identity at 10166628 (IABTechLab/edgezero#495) in place of the v0.0.12-rc-axum.202611.2 tag. Its commit 32526960d takes the received-head preparer from this PR's 3da80afd7, with both tests, and the OutboundCachePolicy clone adaptations. IABTechLab/edgezero#409 strips Forwarded and X-Forwarded-* on Axum, so the preparer is what keeps ts dev proxy working there.

#1506 does not carry the rest of this PR. None of it is needed for the forwarder:

Change here File Status
exhausted_page_settle_budget_still_polls_gpt_registry exposes the second batch on the third registry read browser_collector.rs Not in #1506. The test also fails intermittently on main's macOS job, and the hunk applies to main as is
macOS CI installs an exact Chrome for Testing version .github/workflows/test.yml Not in #1506. Applies to main as is
The Cloudflare trace runtime receives its config through spawn_with_config_json_and_readiness trace_boundary.rs, cloudflare.rs Not in #1506. Applies to main as is
asset_proxy_keeps_caching_for_raw_control_routes, 13 raw-control cases proxy.rs Not in #1506. Test only
template-cache-local-test.sh finds the Cargo target directory with cargo metadata scripts/template-cache-local-test.sh Not in #1506
run_pre_dispatch_hook boxes its rejection test_support.rs, trace/actions.rs Not needed at the rc/identity pin

The first three fix main's own test jobs, so a small PR against main fits them best. The raw-control cache test can go onto #1506 or follow it.

@aram356 aram356 closed this Nov 15, 2026
aram356 added a commit that referenced this pull request Nov 19, 2026
The base is #1623's head 78e1f2f, which carries #1612 and #1506's repin of
EdgeZero to rc/identity 9d02d7b3. The tree
is the base plus this pull request's own changes against its previous base
branch. The cutover, the EdgeZero pin and the closed #1605 reconciliation
commits that this branch carried come from the base: EdgeZero stays pinned
to rc/identity 9d02d7b3 by rev, and the RC tag pin,
its Cargo.lock, the #1605 changelog lines, its S3 direct-client patch, its
Chrome version pin, its cache harness target-root change, its
browser-collector poll fixture and its boxed pre-dispatch test helper are
dropped in favor of the base.

Axum startup: main runs EdgeZero's run_production_app_with_initializer with
the native prepared-store initializer. EdgeZero installs the logger at
EDGEZERO__LOGGING__LEVEL as it does on the base, so the adapter's
SimpleLogger, its RUST_LOG parsing and its owns_logging override are not
revived, and the parse_log_level tests go with them. EdgeZero validates the
hosting settings before it installs that logger, so a fatal startup error
that finds no logger goes to standard error instead of being dropped, as
it was visible before.

Axum app: the base's shared identity app, its local identify and batch-sync
answers and its enabled-provider rejection stay as they are. The router
built by the initializer goes through routes_with_settings, so the
production path builds the same IdentityApp and rejects enabled providers
the same way. Hooks::routes returns the empty pre-initialization router,
Hooks::stores declares the config and secret stores, and every router
carries an empty native store snapshot in state.

Axum platform: the environment-backed config and secret stores are removed
and request services read the immutable prepared snapshots.

Tests and harnesses: the route startup test, the integration and EOF
harnesses and the smoke script use the prepared local config map and
EDGEZERO__SECRETS__ values. The startup, native acceptance and smoke
processes set EDGEZERO__LOGGING__LEVEL in place of RUST_LOG, and the
provider script drops its unused RUST_LOG value.

Docs: the README, the Axum guide and the native RC guide describe the
production runner, its fatal invalid host, port and log level values, and
the workspace EdgeZero pin 9d02d7b3 in place of the RC tag.

Cargo.lock: the base lock plus the 29 packages that the native AWS provider
features add, at the same versions as this pull request's own lock.
@aram356
aram356 removed this pull request from stack #1606 November 19, 2026 06:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants