Skip to content

Commit d4f975f

Browse files
committed
Merge branch 'or-api-bn-tls-yes' into 'master'
feat(BOUN-726): prep work for making API BN reconfigurable See merge request dfinity-lab/public/ic!12478
2 parents 5eb2810 + f0c479d commit d4f975f

15 files changed

+806
-55
lines changed

Cargo.Bazel.StaticOpenSSL.json.lock

Lines changed: 111 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "9e9b1ede247300264fb7266d56eb5c5e3677cf97c66f9abbae68b3977d0d4049",
2+
"checksum": "5efe1f639b7df4ca260a27af1492a7a837ce48b575fe74c1d3bb607bb117ac84",
33
"crates": {
44
"abnf 0.12.0": {
55
"name": "abnf",
@@ -3391,6 +3391,101 @@
33913391
},
33923392
"license": "MIT"
33933393
},
3394+
"axum-server 0.5.1": {
3395+
"name": "axum-server",
3396+
"version": "0.5.1",
3397+
"repository": {
3398+
"Http": {
3399+
"url": "https://crates.io/api/v1/crates/axum-server/0.5.1/download",
3400+
"sha256": "447f28c85900215cc1bea282f32d4a2f22d55c5a300afdfbc661c8d6a632e063"
3401+
}
3402+
},
3403+
"targets": [
3404+
{
3405+
"Library": {
3406+
"crate_name": "axum_server",
3407+
"crate_root": "src/lib.rs",
3408+
"srcs": {
3409+
"include": [
3410+
"**/*.rs"
3411+
],
3412+
"exclude": []
3413+
}
3414+
}
3415+
}
3416+
],
3417+
"library_target_name": "axum_server",
3418+
"common_attrs": {
3419+
"compile_data_glob": [
3420+
"**"
3421+
],
3422+
"crate_features": [
3423+
"arc-swap",
3424+
"default",
3425+
"pin-project-lite",
3426+
"rustls",
3427+
"rustls-pemfile",
3428+
"tls-rustls",
3429+
"tokio-rustls"
3430+
],
3431+
"deps": {
3432+
"common": [
3433+
{
3434+
"id": "arc-swap 1.6.0",
3435+
"target": "arc_swap"
3436+
},
3437+
{
3438+
"id": "bytes 1.4.0",
3439+
"target": "bytes"
3440+
},
3441+
{
3442+
"id": "futures-util 0.3.28",
3443+
"target": "futures_util"
3444+
},
3445+
{
3446+
"id": "http 0.2.9",
3447+
"target": "http"
3448+
},
3449+
{
3450+
"id": "http-body 0.4.5",
3451+
"target": "http_body"
3452+
},
3453+
{
3454+
"id": "hyper 0.14.26",
3455+
"target": "hyper"
3456+
},
3457+
{
3458+
"id": "pin-project-lite 0.2.9",
3459+
"target": "pin_project_lite"
3460+
},
3461+
{
3462+
"id": "rustls 0.21.1",
3463+
"target": "rustls"
3464+
},
3465+
{
3466+
"id": "rustls-pemfile 1.0.2",
3467+
"target": "rustls_pemfile"
3468+
},
3469+
{
3470+
"id": "tokio 1.28.2",
3471+
"target": "tokio"
3472+
},
3473+
{
3474+
"id": "tokio-rustls 0.24.0",
3475+
"target": "tokio_rustls"
3476+
},
3477+
{
3478+
"id": "tower-service 0.3.2",
3479+
"target": "tower_service"
3480+
}
3481+
],
3482+
"selects": {}
3483+
},
3484+
"edition": "2018",
3485+
"version": "0.5.1"
3486+
},
3487+
"license": "MIT"
3488+
},
33943489
"backoff 0.3.0": {
33953490
"name": "backoff",
33963491
"version": "0.3.0",
@@ -10199,7 +10294,7 @@
1019910294
"target": "criterion_plot"
1020010295
},
1020110296
{
10202-
"id": "csv 1.2.1",
10297+
"id": "csv 1.2.2",
1020310298
"target": "csv"
1020410299
},
1020510300
{
@@ -11179,13 +11274,13 @@
1117911274
},
1118011275
"license": "MIT OR Apache-2.0"
1118111276
},
11182-
"csv 1.2.1": {
11277+
"csv 1.2.2": {
1118311278
"name": "csv",
11184-
"version": "1.2.1",
11279+
"version": "1.2.2",
1118511280
"repository": {
1118611281
"Http": {
11187-
"url": "https://crates.io/api/v1/crates/csv/1.2.1/download",
11188-
"sha256": "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad"
11282+
"url": "https://crates.io/api/v1/crates/csv/1.2.2/download",
11283+
"sha256": "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
1118911284
}
1119011285
},
1119111286
"targets": [
@@ -11229,7 +11324,7 @@
1122911324
"selects": {}
1123011325
},
1123111326
"edition": "2021",
11232-
"version": "1.2.1"
11327+
"version": "1.2.2"
1123311328
},
1123411329
"license": "Unlicense/MIT"
1123511330
},
@@ -12805,6 +12900,10 @@
1280512900
"id": "axum 0.6.18",
1280612901
"target": "axum"
1280712902
},
12903+
{
12904+
"id": "axum-server 0.5.1",
12905+
"target": "axum_server"
12906+
},
1280812907
{
1280912908
"id": "backoff 0.3.0",
1281012909
"target": "backoff"
@@ -12963,7 +13062,7 @@
1296313062
"target": "crossbeam_utils"
1296413063
},
1296513064
{
12966-
"id": "csv 1.2.1",
13065+
"id": "csv 1.2.2",
1296713066
"target": "csv"
1296813067
},
1296913068
{
@@ -50662,8 +50761,8 @@
5066250761
},
5066350762
{
5066450763
"Binary": {
50665-
"crate_name": "exit",
50666-
"crate_root": "src/bin/exit.rs",
50764+
"crate_name": "sleep",
50765+
"crate_root": "src/bin/sleep.rs",
5066750766
"srcs": {
5066850767
"include": [
5066950768
"**/*.rs"
@@ -50686,8 +50785,8 @@
5068650785
},
5068750786
{
5068850787
"Binary": {
50689-
"crate_name": "sleep",
50690-
"crate_root": "src/bin/sleep.rs",
50788+
"crate_name": "exit",
50789+
"crate_root": "src/bin/exit.rs",
5069150790
"srcs": {
5069250791
"include": [
5069350792
"**/*.rs"

Cargo.Bazel.StaticOpenSSL.toml.lock

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,26 @@ dependencies = [
647647
"tower-service",
648648
]
649649

650+
[[package]]
651+
name = "axum-server"
652+
version = "0.5.1"
653+
source = "registry+https://github.com/rust-lang/crates.io-index"
654+
checksum = "447f28c85900215cc1bea282f32d4a2f22d55c5a300afdfbc661c8d6a632e063"
655+
dependencies = [
656+
"arc-swap",
657+
"bytes",
658+
"futures-util",
659+
"http",
660+
"http-body",
661+
"hyper",
662+
"pin-project-lite",
663+
"rustls 0.21.1",
664+
"rustls-pemfile",
665+
"tokio",
666+
"tokio-rustls 0.24.0",
667+
"tower-service",
668+
]
669+
650670
[[package]]
651671
name = "backoff"
652672
version = "0.3.0"
@@ -2092,9 +2112,9 @@ dependencies = [
20922112

20932113
[[package]]
20942114
name = "csv"
2095-
version = "1.2.1"
2115+
version = "1.2.2"
20962116
source = "registry+https://github.com/rust-lang/crates.io-index"
2097-
checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad"
2117+
checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
20982118
dependencies = [
20992119
"csv-core",
21002120
"itoa",
@@ -2406,6 +2426,7 @@ dependencies = [
24062426
"async-stream",
24072427
"async-trait",
24082428
"axum",
2429+
"axum-server",
24092430
"backoff 0.3.0",
24102431
"base32",
24112432
"base64 0.11.0",

0 commit comments

Comments
 (0)