Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

align boring/rustls apis #320

Merged
merged 12 commits into from
Sep 19, 2024
Merged

align boring/rustls apis #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6c073c5
initial (broken) work to align boring/rustls apis
GlenDC Sep 17, 2024
0febec7
implement ClientConfig usage into HttpClient
GlenDC Sep 18, 2024
c58e94b
finish initial refactor work for common tls api
GlenDC Sep 19, 2024
23459e4
fix ALPN order + bug in http version transformation
GlenDC Sep 19, 2024
baea118
update deps: cargo update
GlenDC Sep 19, 2024
060e106
make (integration) tests more feature-compatible
GlenDC Sep 19, 2024
5633fad
disable server cert verification for integration tests
GlenDC Sep 19, 2024
10e12b9
add ignore back to the https_connect_proxy int test
GlenDC Sep 19, 2024
a629aeb
fix feature-poor warning in http-backend client conn
GlenDC Sep 19, 2024
fc9d5ef
fix another tls-dep warning in feature-min env
GlenDC Sep 19, 2024
4a342f2
fix some more issues with tls-related examples
GlenDC Sep 19, 2024
2414010
allow acceptor/connector data to be injected via ext
GlenDC Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/workflows/Coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Coverage
on:
push:
branches:
- "main"
env:
RUST_BACKTRACE: 1
jobs:
coverage:
runs-on: ubuntu-latest
strategy:
matrix:
version:
- stable
target:
- x86_64-unknown-linux-gnu
fail-fast: false
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.version }}
- name: coverage
run: cargo run --release -- tarpaulin --engine llvm --follow-exec --post-test-delay 10 --coveralls ${{ secrets.COVERALLS_TOKEN }}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ just qa
Before you can do this you do require the following to be installed:

* `Rust`, version 1.80 or beyond: <https://www.rust-lang.org/tools/install>
* `just` (to run _just_ (config) files): <https://just.systems/man/en/chapter_4.html>
* `just` (to run _just_ (config) files): <https://just.systems/man/en/packages.html>
* `cargo hack`: <https://github.com/taiki-e/cargo-hack?tab=readme-ov-file#installation>

Once this is all done you should be able to run `just qa`.
Expand Down
77 changes: 41 additions & 36 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ opentelemetry-otlp = { workspace = true }
opentelemetry_sdk = { workspace = true }
regex = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_html_form = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["macros"] }
tracing = { workspace = true }
Expand Down Expand Up @@ -307,4 +308,4 @@ required-features = ["boring", "haproxy", "http-full"]

[[example]]
name = "tls_termination"
required-features = ["haproxy", "http-full", "rustls"]
required-features = ["rustls", "haproxy", "http-full"]
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
[![Apache 2.0 License][license-apache-badge]][license-apache-url]
[![rust version][rust-version-badge]][rust-version-url]
[![Build Status][actions-badge]][actions-url]
[![Coverage Status][coverage-badge]][coverage-url]
[![Lines of Code][loc-badge]][loc-url]

[crates-badge]: https://img.shields.io/crates/v/rama.svg
Expand All @@ -20,6 +21,8 @@
[rust-version-url]: https://www.rust-lang.org
[actions-badge]: https://github.com/plabayo/rama/workflows/CI/badge.svg
[actions-url]: https://github.com/plabayo/rama/actions
[coverage-badge]: https://coveralls.io/repos/github/plabayo/rama/badge.svg?branch=main
[coverage-url]: https://coveralls.io/github/plabayo/rama?branch=main
[loc-badge]: https://img.shields.io/endpoint?url=https://ghloc.vercel.app/api/plabayo/rama/badge?filter=.rs$&style=flat&logoColor=white&label=LoC
[loc-url]: https://github.com/plabayo/rama

Expand Down
Loading