Skip to content

Commit 45bc2bc

Browse files
committed
Merge origin/main into feat/ppe
Two conflicts, both resolved by keeping each side: server/src/watcher.rs: this branch writes `*content_hash = new_hash` after a successful reload (the hot-reload fix), main added a reload-success metric on the same line. Both belong, state update first. Cargo.lock: regenerated from main's side rather than hand-merged, then re-resolved. The engine stays on the pinned revision. Verified that praxis-proxy#912's route-scoped identity fix survived, since it touches the policy filter this branch rewrote onto the engine: `route_ext` and the `MetaExtension` stamping are present and its tests came across. 1851 filter tests pass with `policy-engine` on, up from 1831. Signed-off-by: Frederico Araujo <frederico.araujo@ibm.com>
2 parents 4ed8221 + f54058f commit 45bc2bc

52 files changed

Lines changed: 3621 additions & 505 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/codeql.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: praxis-proxy/conventions/.github/actions/setup-rust@dc77dbd3a55ce96e8e31a3c8d36cea4952617dd3 # v0.1.0
3535

3636
- name: Initialize CodeQL
37-
uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
37+
uses: github/codeql-action/init@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4
3838
with:
3939
languages: ${{ matrix.language }}
4040

@@ -43,6 +43,6 @@ jobs:
4343
run: cargo build --workspace
4444

4545
- name: Perform CodeQL Analysis
46-
uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
46+
uses: github/codeql-action/analyze@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4
4747
with:
4848
category: "/language:${{ matrix.language }}"

.github/workflows/tests.yaml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,49 @@ jobs:
7272

7373
- name: Unit tests
7474
run: make test-unit
75+
76+
# ----------------------------------------------------------------------------
77+
# Non-default feature verification (per crate, parallel)
78+
# ----------------------------------------------------------------------------
79+
80+
experimental-features:
81+
runs-on: ubuntu-24.04
82+
permissions:
83+
contents: read
84+
strategy:
85+
fail-fast: false
86+
matrix:
87+
crate:
88+
- praxis-proxy-core
89+
- praxis-proxy-filter
90+
- praxis-proxy-tls
91+
- praxis-proxy
92+
steps:
93+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
94+
95+
- name: Set up Rust
96+
uses: praxis-proxy/conventions/.github/actions/setup-rust@dc77dbd3a55ce96e8e31a3c8d36cea4952617dd3 # v0.1.0
97+
98+
- name: Cache cargo-hack
99+
id: cache-hack
100+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
101+
with:
102+
path: ~/.cargo/bin/cargo-hack
103+
key: cargo-hack-0.6.45-${{ runner.os }}
104+
105+
- name: Install cargo-hack
106+
if: steps.cache-hack.outputs.cache-hit != 'true'
107+
run: cargo install cargo-hack@0.6.45 --locked
108+
109+
- name: Clippy non-default features
110+
run: >
111+
cargo hack clippy --each-feature
112+
--exclude-no-default-features --exclude-features default
113+
-p ${{ matrix.crate }}
114+
-- -D warnings
115+
116+
- name: Test non-default features
117+
run: >
118+
cargo hack test --each-feature
119+
--exclude-no-default-features --exclude-features default
120+
-p ${{ matrix.crate }}

0 commit comments

Comments
 (0)