Merge branch 'main' into chore/sync-edgezero-pr-257

Reconcile main (Osano CMP mirror #773, fastly extraction out of core,
EC/storage refactors) with this branch's EdgeZero/fastly-0.12 bump.

Resolution decisions:
- Keep this branch's dependency bump: fastly/log-fastly 0.12 and edgezero
  git deps tracking branch=main (over main's pinned rev + 0.11.12), plus
  the trusted-server-* crate renames.
- Take main's newer runtime code for conflicted files (EC http:: migration,
  settings, geo, testlight, adapter restructure), then forward-port it to
  the edgezero-main / fastly-0.12 API surface:
  - Body::into_bytes() now returns Option<Bytes>; buffered sites use
    unwrap_or_default() (batch_sync, pull_sync, identify/testlight tests).
  - fastly 0.12 get_tls_protocol()/get_tls_cipher_openssl_name() return
    Result<Option>; call sites use .ok().flatten().
  - edgezero-main moved adapter symbols into submodules
    (request::into_core_request, config_store::FastlyConfigStore,
    context::FastlyRequestContext) and made router oneshot()/IntoResponse
    into_response() fallible; dispatch and test sites updated accordingly.
- Accept main's deletion of core storage/secret_store.rs (fastly removal).
- Fix a directory-rename gap: main added Osano JS under the old crates/js
  path; relocated into crates/trusted-server-js so the bundle is discovered.

Verified: cargo fmt/clippy/test --workspace, wasm release build,
JS vitest + format. All green.

Author: aram356

.github/workflows/integration-tests.yml

@@ -83,6 +83,54 @@ jobs:
           INTEGRATION_ORIGIN_PORT: ${{ env.ORIGIN_PORT }}
           RUST_LOG: info
 
+  integration-tests-edgezero:
+    name: integration tests (EdgeZero entry point)
+    needs: prepare-artifacts
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up integration test runtime
+        id: shared-setup
+        uses: ./.github/actions/setup-integration-test-env
+        with:
+          origin-port: ${{ env.ORIGIN_PORT }}
+          check-dependency-versions: "false"
+          install-viceroy: "true"
+          build-wasm: "false"
+          build-test-images: "false"
+
+      - name: Download integration test artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: integration-test-artifacts
+          path: ${{ env.ARTIFACTS_DIR }}
+
+      # Exercises the EdgeZero entry point against the same WASM binary by
+      # pointing Viceroy at a config store with `edgezero_enabled = "true"`.
+      # Scoped to the container-free EC lifecycle suite (minimal TCP origin), a
+      # focused parity subset covering Fastly request conversion, config-store
+      # dispatch, publisher fallback proxying, and end-to-end EC/API wiring on
+      # the EdgeZero path. The legacy `integration-tests` job above still covers
+      # the full framework matrix.
+      - name: Run EdgeZero EC lifecycle tests
+        run: >-
+          cargo test
+          --manifest-path crates/integration-tests/Cargo.toml
+          --target x86_64-unknown-linux-gnu
+          test_ec_lifecycle_fastly
+          -- --include-ignored --test-threads=1
+        env:
+          WASM_BINARY_PATH: ${{ env.WASM_ARTIFACT_PATH }}
+          INTEGRATION_ORIGIN_PORT: ${{ env.ORIGIN_PORT }}
+          VICEROY_CONFIG_PATH: ${{ github.workspace }}/crates/integration-tests/fixtures/configs/viceroy-template-edgezero.toml
+          # Opt into the EdgeZero entry-point canary in test_ec_lifecycle_fastly.
+          # Only set here, so the legacy integration-tests job runs the same
+          # scenarios through legacy_main without asserting the EdgeZero-only 405.
+          EXPECT_EDGEZERO_ENTRY_POINT: "true"
+          RUST_LOG: info
+
   browser-tests:
     name: browser integration tests
     needs: prepare-artifacts

CHANGELOG.md

@@ -10,13 +10,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - **Breaking** — `bid_param_zone_overrides` inner values must now be JSON objects; previously non-object or empty values (`"header" = "x"`, `"header" = {}`) were accepted and silently produced a dead rule at runtime. They now fail at startup with a configuration error. Operators upgrading should audit their `bid_param_zone_overrides` config for non-object zone entries.
+- **Breaking** — Sourcepoint browser module inclusion now requires explicit `[integrations.sourcepoint].enabled = true`; operators relying on the previous unconditional Sourcepoint module should enable the integration before upgrading.
 
 ### Security
 
 - Validate synthetic ID format on inbound values from the `x-synthetic-id` header and `synthetic_id` cookie; values that do not match the expected format (`64-hex-hmac.6-alphanumeric-suffix`) are discarded and a fresh ID is generated rather than forwarded to response headers, cookies, or third-party APIs
 
 ### Added
 
+- Added Osano consent mirror integration docs and public enablement guidance.
 - Implemented basic authentication for configurable endpoint paths (#73)
 - Added integrations guide with example `testlight` integration
 

Cargo.lock

@@ -22,7 +22,10 @@ log-fastly = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 trusted-server-core = { workspace = true }
+url = { workspace = true }
 urlencoding = { workspace = true }
 
 [dev-dependencies]
+bytes = { workspace = true }
 edgezero-core = { workspace = true, features = ["test-utils"] }
+trusted-server-core = { workspace = true, features = ["test-utils"] }