Commit 5447648
authored
* Sync EdgeZero PR 257 updates
* Formatting
* Sync integration-tests lockfile to edgezero 170b74b and fastly 0.11
* Track edgezero main and align fastly to 0.12
Point the edgezero dependencies at the upstream main branch and bump
fastly/log-fastly to 0.12 to match edgezero's pinned version. Forward-port
the body and TLS APIs to the newer surface:
- Body::into_bytes() now returns Option<Bytes>; buffered-body call sites use
unwrap_or_default() to preserve prior semantics.
- fastly 0.12 get_tls_protocol()/get_tls_cipher_openssl_name() return
Result<Option<&str>>; adapter call sites use .ok().flatten().
Resync the excluded integration-tests lockfile to the same versions.
* Fix OpenRTB regeneration command in README
The wrapper script lives at crates/trusted-server-openrtb/generate.sh, not in
the codegen crate. Point the example at the actual script path.
* Address review feedback: doc entrypoint shape and crate-rename helper paths
Apply the approving review's inline doc suggestions and the crate-rename
cleanup:
- integration-guide: describe directory-based entrypoint discovery
(src/integrations/<id>/index.ts) instead of arbitrary .ts files, and
point the Testlight key file at testlight/index.ts.
- creative-processing: fix the generated bundle output directory to
crates/trusted-server-js/dist (not lib/dist).
- .claude helper commands/agents: replace remaining crates/js references
with crates/trusted-server-js so local/agent verification helpers keep
working after the crate rename.
* Pin integration-tests log to 0.4.32 to match workspace lockfile
The Integration Tests CI job runs scripts/check-integration-dependency-versions.sh,
which requires the excluded trusted-server-integration-tests crate to resolve the
same shared direct-dependency versions as the workspace. Regenerating its lockfile
during the EdgeZero sync picked up log 0.4.33 while the workspace stays on 0.4.32.
Downgrade log in the integration lockfile so the parity check passes.
* Fix EdgeZero integration test paths after crate rename
The EdgeZero entry-point step in integration-tests.yml still pointed at the
pre-rename crates/integration-tests path for both --manifest-path and
VICEROY_CONFIG_PATH, so the job failed with 'manifest path does not exist'.
Point them at crates/trusted-server-integration-tests to match the rename
(the legacy integration-tests job already used the new path).
* Align toml dependency requirement with main (1.1)
The merge resolution kept this branch's looser toml = "1.0" requirement;
main uses "1.1". Both resolve to the same locked 1.1.x, so the lockfile is
unchanged, but match main to avoid widening the version range.
* Align integration-tests transitive deps with the workspace lockfile
The integration-tests lockfile was regenerated fresh during the EdgeZero
sync and picked up newer patch/minor versions of crates that also resolve
through trusted-server-core (http, bytes, uuid, lol_html, config, brotli,
chrono, regex, time, etc.), so the tests linked slightly different versions
than the production build ships.
Pin those shared transitive crates back to the workspace-resolved versions
(45 crates aligned). Six remain newer (js-sys, num-conv, wasm-bindgen
family) because the integration crate's own dependency tree constrains them
to a higher version; those cannot be downgraded without breaking
resolution. The CI direct-dependency parity check still passes and the
crate compiles --locked on the host target.
* Enforce transitive dependency parity for integration-tests lockfile
Extend check-integration-dependency-versions.sh with a lockfile-based
transitive parity check: every (name, version) the workspace lockfile
resolves must also be present in the integration lockfile for any shared
crate, so the integration tests exercise the same dependency versions the
production build ships. This catches accidental drift when the integration
lockfile is regenerated and silently bumps shared crates to newer versions
than production uses (the failure mode that produced the original log/http
drift during the EdgeZero sync).
A small documented allowlist exempts crates the integration crate's own
dependency tree forces to a different version (js-sys / wasm-bindgen family
and num-conv, pulled newer by reqwest's wasm tooling; itertools, whose
workspace 0.10.x line the integration tree never resolves).
Also align four more shared transitives that were previously skipped as
multi-version (bitflags, getrandom, hashbrown, syn) down to the workspace
versions, so the enforced allowlist stays minimal. The check is parsed
directly from the lockfiles (no cargo invocation), and a negative test
confirms it flags an injected http drift and passes after restore.
1 parent 3dc1262 commit 5447648
266 files changed
Lines changed: 1495 additions & 1395 deletions
File tree
- .claude
- agents
- commands
- .github
- actions/setup-integration-test-env
- workflows
- crates
- trusted-server-adapter-fastly/src
- trusted-server-core
- benches
- src
- auction
- consent
- ec
- integrations
- datadome
- nextjs
- platform
- request_signing
- trusted-server-integration-tests
- browser
- helpers
- tests
- nextjs
- wordpress
- fixtures
- configs
- frameworks
- nextjs
- app
- about
- api
- data
- hello
- components
- contact
- dashboard
- wordpress
- theme
- wp-admin
- tests
- common
- environments
- frameworks
- trusted-server-js
- lib
- src
- core
- styles
- templates
- integrations
- creative
- datadome
- didomi
- google_tag_manager
- gpt
- lockr
- osano
- permutive
- prebid
- prebid_modules
- sourcepoint
- testlight
- test
- core
- integrations
- creative
- datadome
- didomi
- google_tag_manager
- gpt
- lockr
- osano
- permutive
- prebid
- sourcepoint
- src
- trusted-server-openrtb-codegen
- src
- trusted-server-openrtb
- proto
- src
- docs
- guide
- integrations
- superpowers
- plans
- specs
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | | - | |
| 26 | + | |
| 27 | + | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
112 | | - | |
| 112 | + | |
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
| 40 | + | |
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | | - | |
| 6 | + | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | | - | |
| 8 | + | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
54 | | - | |
55 | 53 | | |
56 | 54 | | |
57 | 55 | | |
| |||
72 | 70 | | |
73 | 71 | | |
74 | 72 | | |
75 | | - | |
| 73 | + | |
76 | 74 | | |
77 | 75 | | |
78 | 76 | | |
| |||
91 | 89 | | |
92 | 90 | | |
93 | 91 | | |
94 | | - | |
| 92 | + | |
95 | 93 | | |
96 | 94 | | |
97 | 95 | | |
| |||
100 | 98 | | |
101 | 99 | | |
102 | 100 | | |
103 | | - | |
| 101 | + | |
0 commit comments