diff --git a/Cargo.lock b/Cargo.lock index ed7e5e69b..4b3f51511 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -45,7 +45,7 @@ dependencies = [ "actix-service", "actix-tls", "actix-utils", - "base64 0.22.1", + "base64", "bitflags 2.10.0", "brotli 8.0.2", "bytes", @@ -150,7 +150,7 @@ dependencies = [ "pin-project-lite", "rustls-pki-types", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls", "tokio-util", "tracing", ] @@ -229,7 +229,7 @@ checksum = "456348ed9dcd72a13a1f4a660449fafdecee9ac8205552e286809eb5b0b29bd3" dependencies = [ "actix-utils", "actix-web", - "base64 0.22.1", + "base64", "futures-core", "futures-util", "log", @@ -569,7 +569,7 @@ dependencies = [ "arrow-schema", "arrow-select", "atoi", - "base64 0.22.1", + "base64", "chrono", "comfy-table", "half", @@ -617,7 +617,7 @@ dependencies = [ "arrow-cast", "arrow-ipc", "arrow-schema", - "base64 0.22.1", + "base64", "bytes", "futures", "prost 0.14.1", @@ -816,7 +816,7 @@ dependencies = [ "bytes", "futures-util", "http 1.4.0", - "http-body 1.0.1", + "http-body", "http-body-util", "itoa", "matchit", @@ -825,7 +825,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "serde_core", - "sync_wrapper 1.0.2", + "sync_wrapper", "tower", "tower-layer", "tower-service", @@ -840,11 +840,11 @@ dependencies = [ "bytes", "futures-core", "http 1.4.0", - "http-body 1.0.1", + "http-body", "http-body-util", "mime", "pin-project-lite", - "sync_wrapper 1.0.2", + "sync_wrapper", "tower-layer", "tower-service", ] @@ -864,12 +864,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -1316,16 +1310,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation" version = "0.10.1" @@ -1846,7 +1830,7 @@ checksum = "794a9db7f7b96b3346fc007ff25e994f09b8f0511b4cf7dff651fadfe3ebb28f" dependencies = [ "arrow", "arrow-buffer", - "base64 0.22.1", + "base64", "blake2", "blake3", "chrono", @@ -2710,18 +2694,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e0c088bddfd73005b09807131224ad12c302655436b1270c8346a3ae8aaa37a" dependencies = [ - "base64 0.22.1", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", + "base64", ] [[package]] @@ -2743,7 +2716,7 @@ dependencies = [ "bytes", "futures-core", "http 1.4.0", - "http-body 1.0.1", + "http-body", "pin-project-lite", ] @@ -2781,30 +2754,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hyper" -version = "0.14.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.27", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.5.10", - "tokio", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "1.8.1" @@ -2817,7 +2766,7 @@ dependencies = [ "futures-core", "h2 0.4.12", "http 1.4.0", - "http-body 1.0.1", + "http-body", "httparse", "httpdate", "itoa", @@ -2828,20 +2777,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.32", - "rustls 0.21.12", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.27.7" @@ -2849,13 +2784,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ "http 1.4.0", - "hyper 1.8.1", + "hyper", "hyper-util", - "rustls 0.23.35", + "rustls", "rustls-native-certs", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tower-service", "webpki-roots 1.0.4", ] @@ -2866,7 +2801,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 1.8.1", + "hyper", "hyper-util", "pin-project-lite", "tokio", @@ -2879,14 +2814,14 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "futures-channel", "futures-core", "futures-util", "http 1.4.0", - "http-body 1.0.1", - "hyper 1.8.1", + "http-body", + "hyper", "ipnet", "libc", "percent-encoding", @@ -3525,7 +3460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c1be0c6c22ec0817cdc77d3842f721a17fd30ab6965001415b5402a74e6b740" dependencies = [ "async-trait", - "base64 0.22.1", + "base64", "bytes", "chrono", "form_urlencoded", @@ -3534,16 +3469,16 @@ dependencies = [ "http-body-util", "httparse", "humantime", - "hyper 1.8.1", + "hyper", "itertools 0.14.0", "md-5", "parking_lot", "percent-encoding", "quick-xml", "rand 0.9.2", - "reqwest 0.12.28", + "reqwest", "ring", - "rustls-pemfile 2.2.0", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", @@ -3574,13 +3509,13 @@ version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0a9d93c04da2d5e11578af6207f163c0816698b24c25a7aefae06a71e2d07bb" dependencies = [ - "base64 0.22.1", + "base64", "biscuit", "chrono", "getrandom 0.3.4", "hmac-sha256", "mime", - "reqwest 0.12.28", + "reqwest", "serde", "serde_json", "thiserror 1.0.69", @@ -3634,7 +3569,7 @@ name = "opentelemetry-proto" version = "0.31.0" source = "git+https://github.com/parmesant/opentelemetry-rust/?rev=45fb828769e6ade96d56ca1f5fa14cf0986a5341#45fb828769e6ade96d56ca1f5fa14cf0986a5341" dependencies = [ - "base64 0.22.1", + "base64", "const-hex", "opentelemetry", "opentelemetry_sdk", @@ -3721,7 +3656,7 @@ dependencies = [ "arrow-ipc", "arrow-schema", "arrow-select", - "base64 0.22.1", + "base64", "brotli 8.0.2", "bytes", "chrono", @@ -3764,7 +3699,7 @@ dependencies = [ "arrow-schema", "arrow-select", "async-trait", - "base64 0.22.1", + "base64", "byteorder", "bytes", "cargo_toml", @@ -3784,7 +3719,7 @@ dependencies = [ "futures-util", "hex", "hostname", - "http 0.2.12", + "http 1.4.0", "http-auth-basic", "human-size", "humantime", @@ -3806,10 +3741,10 @@ dependencies = [ "rdkafka", "regex", "relative-path", - "reqwest 0.11.27", + "reqwest", "rstest 0.23.0", - "rustls 0.22.4", - "rustls-pemfile 2.2.0", + "rustls", + "rustls-pemfile", "sasl2-sys", "semver", "serde", @@ -4191,7 +4126,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.35", + "rustls", "socket2 0.6.1", "thiserror 2.0.17", "tokio", @@ -4211,7 +4146,7 @@ dependencies = [ "rand 0.9.2", "ring", "rustc-hash", - "rustls 0.23.35", + "rustls", "rustls-pki-types", "slab", "thiserror 2.0.17", @@ -4453,81 +4388,37 @@ dependencies = [ "serde", ] -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "async-compression", - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.27", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.32", - "hyper-rustls 0.24.2", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-rustls 0.24.1", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots 0.25.4", - "winreg", -] - [[package]] name = "reqwest" version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "futures-core", "futures-util", "h2 0.4.12", "http 1.4.0", - "http-body 1.0.1", + "http-body", "http-body-util", - "hyper 1.8.1", - "hyper-rustls 0.27.7", + "hyper", + "hyper-rustls", "hyper-util", "js-sys", "log", "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.35", + "rustls", "rustls-native-certs", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tokio-util", "tower", "tower-http", @@ -4660,32 +4551,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring", - "rustls-pki-types", - "rustls-webpki 0.102.8", - "subtle", - "zeroize", -] - [[package]] name = "rustls" version = "0.23.35" @@ -4697,7 +4562,7 @@ dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.8", + "rustls-webpki", "subtle", "zeroize", ] @@ -4714,15 +4579,6 @@ dependencies = [ "security-framework", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - [[package]] name = "rustls-pemfile" version = "2.2.0" @@ -4742,27 +4598,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.102.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - [[package]] name = "rustls-webpki" version = "0.103.8" @@ -4823,16 +4658,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "security-framework" version = "3.5.1" @@ -4840,7 +4665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" dependencies = [ "bitflags 2.10.0", - "core-foundation 0.10.1", + "core-foundation", "core-foundation-sys", "libc", "security-framework-sys", @@ -5210,12 +5035,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.2" @@ -5263,27 +5082,6 @@ dependencies = [ "windows", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "temp-dir" version = "0.1.16" @@ -5458,34 +5256,13 @@ dependencies = [ "syn", ] -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.12", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.4", - "rustls-pki-types", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ - "rustls 0.23.35", + "rustls", "tokio", ] @@ -5592,23 +5369,23 @@ checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203" dependencies = [ "async-trait", "axum", - "base64 0.22.1", + "base64", "bytes", "flate2", "h2 0.4.12", "http 1.4.0", - "http-body 1.0.1", + "http-body", "http-body-util", - "hyper 1.8.1", + "hyper", "hyper-timeout", "hyper-util", "percent-encoding", "pin-project", "rustls-native-certs", "socket2 0.6.1", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tokio-stream", "tower", "tower-layer", @@ -5634,10 +5411,10 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75214f6b6bd28c19aa752ac09fdf0eea546095670906c21fe3940e180a4c43f2" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "http 1.4.0", - "http-body 1.0.1", + "http-body", "pin-project", "tokio-stream", "tonic", @@ -5657,7 +5434,7 @@ dependencies = [ "indexmap", "pin-project-lite", "slab", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tokio-util", "tower-layer", @@ -5671,13 +5448,18 @@ version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ + "async-compression", "bitflags 2.10.0", "bytes", + "futures-core", "futures-util", "http 1.4.0", - "http-body 1.0.1", + "http-body", + "http-body-util", "iri-string", "pin-project-lite", + "tokio", + "tokio-util", "tower", "tower-layer", "tower-service", @@ -5846,11 +5628,11 @@ version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" dependencies = [ - "base64 0.22.1", + "base64", "flate2", "log", "once_cell", - "rustls 0.23.35", + "rustls", "rustls-pki-types", "url", "webpki-roots 0.26.11", @@ -6118,12 +5900,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "webpki-roots" version = "0.26.11" @@ -6285,15 +6061,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-sys" version = "0.52.0" @@ -6330,21 +6097,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - [[package]] name = "windows-targets" version = "0.52.6" @@ -6378,12 +6130,6 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -6396,12 +6142,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -6414,12 +6154,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -6444,12 +6178,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -6462,12 +6190,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -6480,12 +6202,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -6498,12 +6214,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -6525,16 +6235,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "wit-bindgen" version = "0.46.0" diff --git a/Cargo.toml b/Cargo.toml index d2f5f0759..874286a46 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,11 +31,11 @@ parquet = "57.1.0" # Web server and HTTP-related actix-cors = "0.7.0" actix-web-lab = "0.24.3" -actix-web = { version = "4.9.0", features = ["rustls-0_22"] } +actix-web = { version = "4.9.0", features = ["rustls-0_23"] } actix-web-httpauth = "0.8" actix-web-prometheus = { version = "0.1", default-features = false } actix-web-static-files = "4.0" -http = "0.2.7" +http = "1.0" http-auth-basic = "0.3.3" tonic = { version = "0.14.1", features = [ "tls-aws-lc", @@ -63,7 +63,7 @@ base64 = "0.22.0" cookie = "0.18.1" hex = "0.4" openid = { version = "0.18.3", default-features = false, features = ["rustls"] } -rustls = "0.22.4" +rustls = { version = "0.23", default-features = false, features = ["ring", "std"] } rustls-pemfile = "2.1.2" sha2 = "0.10.8" @@ -147,13 +147,13 @@ once_cell = "1.20" rayon = "1.8" rand = "0.8.5" regex = "1.12.2" -reqwest = { version = "0.11.27", default-features = false, features = [ +reqwest = { version = "0.12", default-features = false, features = [ "rustls-tls", "json", "gzip", "brotli", "stream", -] } # cannot update cause rustls is not latest `see rustls` +] } semver = "1.0" static-files = "0.2" thiserror = "2.0" diff --git a/src/alerts/mod.rs b/src/alerts/mod.rs index 31b53f71d..8fe01fcd2 100644 --- a/src/alerts/mod.rs +++ b/src/alerts/mod.rs @@ -16,6 +16,7 @@ * */ +use actix_web::http::StatusCode; use actix_web::http::header::ContentType; use arrow_schema::{ArrowError, DataType, Schema}; use async_trait::async_trait; @@ -24,7 +25,6 @@ use datafusion::logical_expr::{LogicalPlan, Projection}; use datafusion::prelude::Expr; use datafusion::sql::sqlparser::parser::ParserError; use derive_more::FromStrError; -use http::StatusCode; use serde_json::{Error as SerdeError, Value as JsonValue}; use std::collections::HashMap; use std::fmt::Debug; diff --git a/src/correlation.rs b/src/correlation.rs index f187f45ca..a26ef4ca5 100644 --- a/src/correlation.rs +++ b/src/correlation.rs @@ -18,10 +18,10 @@ use std::collections::{HashMap, HashSet}; +use actix_web::http::StatusCode; use actix_web::{Error, http::header::ContentType}; use chrono::Utc; use datafusion::error::DataFusionError; -use http::StatusCode; use itertools::Itertools; use once_cell::sync::Lazy; use relative_path::RelativePathBuf; @@ -335,7 +335,7 @@ pub enum CorrelationError { } impl actix_web::ResponseError for CorrelationError { - fn status_code(&self) -> http::StatusCode { + fn status_code(&self) -> StatusCode { match self { Self::ObjectStorage(_) => StatusCode::INTERNAL_SERVER_ERROR, Self::Serde(_) => StatusCode::BAD_REQUEST, diff --git a/src/handlers/http/cluster/mod.rs b/src/handlers/http/cluster/mod.rs index 29527c734..8429c6e72 100644 --- a/src/handlers/http/cluster/mod.rs +++ b/src/handlers/http/cluster/mod.rs @@ -26,11 +26,12 @@ use std::time::{Duration, Instant}; use tokio::sync::{RwLock, Semaphore}; use actix_web::Responder; -use actix_web::http::header::{self, HeaderMap}; +use actix_web::http::StatusCode; +use actix_web::http::header::HeaderMap; use actix_web::web::Path; use bytes::Bytes; use chrono::Utc; -use http::{StatusCode, header as http_header}; +use http::header; use itertools::Itertools; use serde::de::{DeserializeOwned, Error}; use serde_json::error::Error as SerdeError; @@ -367,10 +368,15 @@ pub async fn sync_streams_with_ingestors( body: Bytes, stream_name: &str, ) -> Result<(), StreamError> { - let mut reqwest_headers = http_header::HeaderMap::new(); + let mut reqwest_headers = reqwest::header::HeaderMap::new(); for (key, value) in headers.iter() { - reqwest_headers.insert(key.clone(), value.clone()); + // Convert actix header name/value to reqwest header name/value + if let Ok(name) = reqwest::header::HeaderName::from_bytes(key.as_str().as_bytes()) + && let Ok(val) = reqwest::header::HeaderValue::from_bytes(value.as_bytes()) + { + reqwest_headers.insert(name, val); + } } let body_clone = body.clone(); diff --git a/src/handlers/http/cluster/utils.rs b/src/handlers/http/cluster/utils.rs index 23da74813..c0b489e44 100644 --- a/src/handlers/http/cluster/utils.rs +++ b/src/handlers/http/cluster/utils.rs @@ -21,8 +21,8 @@ use crate::{ handlers::http::{base_path_without_preceding_slash, modal::NodeType}, prism::logstream::PrismLogstreamError, }; -use actix_web::http::header; use chrono::{DateTime, Utc}; +use http::header; use serde::{Deserialize, Serialize}; use tracing::error; use url::Url; diff --git a/src/handlers/http/health_check.rs b/src/handlers/http/health_check.rs index be54256a8..90e0b07a3 100644 --- a/src/handlers/http/health_check.rs +++ b/src/handlers/http/health_check.rs @@ -18,6 +18,7 @@ use std::sync::Arc; +use actix_web::http::StatusCode; use actix_web::{ HttpResponse, body::MessageBody, @@ -26,7 +27,6 @@ use actix_web::{ error::ErrorServiceUnavailable, middleware::Next, }; -use http::StatusCode; use once_cell::sync::Lazy; use tokio::{sync::Mutex, task::JoinSet}; use tracing::{error, info}; diff --git a/src/handlers/http/ingest.rs b/src/handlers/http/ingest.rs index 39d11f42e..f00221643 100644 --- a/src/handlers/http/ingest.rs +++ b/src/handlers/http/ingest.rs @@ -18,12 +18,12 @@ use std::collections::{HashMap, HashSet}; +use actix_web::http::StatusCode; use actix_web::web::{self, Json, Path}; use actix_web::{HttpRequest, HttpResponse, http::header::ContentType}; use arrow_array::RecordBatch; use bytes::Bytes; use chrono::Utc; -use http::StatusCode; use crate::event::error::EventError; use crate::event::format::known_schema::{self, KNOWN_SCHEMA_LIST}; @@ -508,7 +508,7 @@ pub enum PostError { } impl actix_web::ResponseError for PostError { - fn status_code(&self) -> http::StatusCode { + fn status_code(&self) -> StatusCode { use PostError::*; match self { SerdeError(_) diff --git a/src/handlers/http/llm.rs b/src/handlers/http/llm.rs index d3adef2c1..1df640051 100644 --- a/src/handlers/http/llm.rs +++ b/src/handlers/http/llm.rs @@ -16,8 +16,9 @@ * */ +use actix_web::http::StatusCode; use actix_web::{HttpResponse, Result, http::header::ContentType, web}; -use http::{StatusCode, header}; +use http::header; use itertools::Itertools; use reqwest; use serde_json::{Value, json}; @@ -146,7 +147,7 @@ pub enum LLMError { } impl actix_web::ResponseError for LLMError { - fn status_code(&self) -> http::StatusCode { + fn status_code(&self) -> StatusCode { match self { Self::InvalidAPIKey => StatusCode::INTERNAL_SERVER_ERROR, Self::FailedRequest(_) => StatusCode::INTERNAL_SERVER_ERROR, diff --git a/src/handlers/http/logstream.rs b/src/handlers/http/logstream.rs index ebab386c8..2f32ef7e0 100644 --- a/src/handlers/http/logstream.rs +++ b/src/handlers/http/logstream.rs @@ -506,8 +506,8 @@ fn classify_json_error(kind: serde_json::error::Category) -> StatusCode { pub mod error { + use actix_web::http::StatusCode; use actix_web::http::header::ContentType; - use http::StatusCode; use crate::{ hottier::HotTierError, @@ -589,7 +589,7 @@ pub mod error { } impl actix_web::ResponseError for StreamError { - fn status_code(&self) -> http::StatusCode { + fn status_code(&self) -> StatusCode { match self { StreamError::CreateStream(CreateStreamError::StreamNameValidation(_)) => { StatusCode::BAD_REQUEST @@ -615,9 +615,10 @@ pub mod error { StreamError::InvalidRetentionConfig(_) => StatusCode::BAD_REQUEST, StreamError::SerdeError(_) => StatusCode::BAD_REQUEST, StreamError::Anyhow(_) => StatusCode::INTERNAL_SERVER_ERROR, - StreamError::Network(err) => { - err.status().unwrap_or(StatusCode::INTERNAL_SERVER_ERROR) - } + StreamError::Network(err) => err + .status() + .and_then(|s| StatusCode::from_u16(s.as_u16()).ok()) + .unwrap_or(StatusCode::INTERNAL_SERVER_ERROR), StreamError::HotTierNotEnabled(_) => StatusCode::FORBIDDEN, StreamError::HotTierValidation(_) => StatusCode::BAD_REQUEST, StreamError::HotTierError(_) => StatusCode::INTERNAL_SERVER_ERROR, diff --git a/src/handlers/http/mod.rs b/src/handlers/http/mod.rs index b49bee74e..ad10cb28a 100644 --- a/src/handlers/http/mod.rs +++ b/src/handlers/http/mod.rs @@ -18,9 +18,9 @@ use actix_cors::Cors; use actix_web::Responder; +use actix_web::http::StatusCode; use arrow_schema::Schema; use cluster::get_node_info; -use http::StatusCode; use modal::{NodeMetadata, NodeType}; use serde_json::Value; diff --git a/src/handlers/http/modal/ingest/ingestor_logstream.rs b/src/handlers/http/modal/ingest/ingestor_logstream.rs index 3b68f1b67..49cea29a3 100644 --- a/src/handlers/http/modal/ingest/ingestor_logstream.rs +++ b/src/handlers/http/modal/ingest/ingestor_logstream.rs @@ -18,12 +18,12 @@ use std::fs; +use actix_web::http::StatusCode; use actix_web::{ HttpRequest, Responder, web::{Json, Path}, }; use bytes::Bytes; -use http::StatusCode; use tracing::warn; use crate::{ diff --git a/src/handlers/http/modal/ingest/ingestor_rbac.rs b/src/handlers/http/modal/ingest/ingestor_rbac.rs index 4101ece19..761472f4b 100644 --- a/src/handlers/http/modal/ingest/ingestor_rbac.rs +++ b/src/handlers/http/modal/ingest/ingestor_rbac.rs @@ -18,8 +18,8 @@ use std::collections::HashSet; +use actix_web::http::StatusCode; use actix_web::{HttpResponse, web}; -use http::StatusCode; use crate::{ handlers::http::{ diff --git a/src/handlers/http/modal/mod.rs b/src/handlers/http/modal/mod.rs index ea6fffb76..f1ec5206b 100644 --- a/src/handlers/http/modal/mod.rs +++ b/src/handlers/http/modal/mod.rs @@ -150,7 +150,7 @@ pub trait ParseableServer { // Start the server with or without TLS let srv = if let Some(config) = ssl { http_server - .bind_rustls_0_22(&PARSEABLE.options.address, config)? + .bind_rustls_0_23(&PARSEABLE.options.address, config)? .run() } else { http_server.bind(&PARSEABLE.options.address)?.run() diff --git a/src/handlers/http/modal/query/querier_logstream.rs b/src/handlers/http/modal/query/querier_logstream.rs index 5ae8e91dd..a0b6204e0 100644 --- a/src/handlers/http/modal/query/querier_logstream.rs +++ b/src/handlers/http/modal/query/querier_logstream.rs @@ -19,13 +19,13 @@ use core::str; use std::{collections::HashMap, fs}; +use actix_web::http::StatusCode; use actix_web::{ HttpRequest, Responder, web::{self, Path}, }; use bytes::Bytes; use chrono::Utc; -use http::StatusCode; use tokio::sync::Mutex; use tracing::{error, warn}; diff --git a/src/handlers/http/modal/ssl_acceptor.rs b/src/handlers/http/modal/ssl_acceptor.rs index 0678154b6..d2462cc96 100644 --- a/src/handlers/http/modal/ssl_acceptor.rs +++ b/src/handlers/http/modal/ssl_acceptor.rs @@ -20,6 +20,7 @@ use std::{ fs::{self, File}, io::BufReader, path::PathBuf, + sync::Arc, }; use rustls::ServerConfig; @@ -31,7 +32,10 @@ pub fn get_ssl_acceptor( ) -> anyhow::Result> { match (tls_cert, tls_key) { (Some(cert), Some(key)) => { - let server_config = ServerConfig::builder().with_no_client_auth(); + let provider = Arc::new(rustls::crypto::ring::default_provider()); + let server_config = ServerConfig::builder_with_provider(provider) + .with_safe_default_protocol_versions()? + .with_no_client_auth(); let cert_file = &mut BufReader::new(File::open(cert)?); let key_file = &mut BufReader::new(File::open(key)?); diff --git a/src/handlers/http/modal/utils/ingest_utils.rs b/src/handlers/http/modal/utils/ingest_utils.rs index f9c5be680..dcfd83abb 100644 --- a/src/handlers/http/modal/utils/ingest_utils.rs +++ b/src/handlers/http/modal/utils/ingest_utils.rs @@ -17,8 +17,8 @@ */ use actix_web::HttpRequest; +use actix_web::http::header::USER_AGENT; use chrono::Utc; -use http::header::USER_AGENT; use opentelemetry_proto::tonic::{ logs::v1::LogsData, metrics::v1::MetricsData, trace::v1::TracesData, }; diff --git a/src/handlers/http/oidc.rs b/src/handlers/http/oidc.rs index 6785a4e12..ee73fdf9e 100644 --- a/src/handlers/http/oidc.rs +++ b/src/handlers/http/oidc.rs @@ -18,6 +18,7 @@ use std::{collections::HashSet, sync::Arc}; +use actix_web::http::StatusCode; use actix_web::{ HttpRequest, HttpResponse, cookie::{Cookie, SameSite, time}, @@ -25,7 +26,6 @@ use actix_web::{ web, }; use chrono::{Duration, TimeDelta}; -use http::StatusCode; use openid::{Bearer, Options, Token, Userinfo}; use regex::Regex; use serde::Deserialize; @@ -563,7 +563,7 @@ pub enum OIDCError { } impl actix_web::ResponseError for OIDCError { - fn status_code(&self) -> http::StatusCode { + fn status_code(&self) -> StatusCode { match self { Self::ObjectStorageError(_) => StatusCode::INTERNAL_SERVER_ERROR, Self::Serde(_) => StatusCode::INTERNAL_SERVER_ERROR, diff --git a/src/handlers/http/query.rs b/src/handlers/http/query.rs index 5129e61cc..91bfae1dd 100644 --- a/src/handlers/http/query.rs +++ b/src/handlers/http/query.rs @@ -22,6 +22,7 @@ use crate::metastore::MetastoreError; use crate::option::Mode; use crate::rbac::map::SessionKey; use crate::utils::arrow::record_batches_to_json; +use actix_web::http::StatusCode; use actix_web::http::header::ContentType; use actix_web::web::{self, Json}; use actix_web::{Either, FromRequest, HttpRequest, HttpResponse, Responder}; @@ -34,7 +35,6 @@ use datafusion::sql::sqlparser::parser::ParserError; use futures::stream::once; use futures::{Stream, StreamExt, future}; use futures_util::Future; -use http::StatusCode; use itertools::Itertools; use serde::{Deserialize, Serialize}; use serde_json::{Value, json}; @@ -590,7 +590,7 @@ Description: {0}"# } impl actix_web::ResponseError for QueryError { - fn status_code(&self) -> http::StatusCode { + fn status_code(&self) -> StatusCode { match self { QueryError::Execute(_) | QueryError::JsonParse(_) => StatusCode::INTERNAL_SERVER_ERROR, QueryError::MetastoreError(e) => e.status_code(), diff --git a/src/handlers/http/rbac.rs b/src/handlers/http/rbac.rs index 0fa788677..684ae4fa2 100644 --- a/src/handlers/http/rbac.rs +++ b/src/handlers/http/rbac.rs @@ -29,12 +29,12 @@ use crate::{ storage::ObjectStorageError, validator::{self, error::UsernameValidationError}, }; +use actix_web::http::StatusCode; use actix_web::{ HttpResponse, Responder, http::header::ContentType, web::{self, Path}, }; -use http::StatusCode; use itertools::Itertools; use serde::Serialize; use serde_json::json; @@ -416,7 +416,7 @@ pub enum RBACError { } impl actix_web::ResponseError for RBACError { - fn status_code(&self) -> http::StatusCode { + fn status_code(&self) -> StatusCode { match self { Self::UserExists(_) => StatusCode::BAD_REQUEST, Self::UserDoesNotExist => StatusCode::NOT_FOUND, diff --git a/src/handlers/http/role.rs b/src/handlers/http/role.rs index 6406f9edf..3a228f667 100644 --- a/src/handlers/http/role.rs +++ b/src/handlers/http/role.rs @@ -18,12 +18,12 @@ use std::collections::HashSet; +use actix_web::http::StatusCode; use actix_web::{ HttpResponse, Responder, http::header::ContentType, web::{self, Json}, }; -use http::StatusCode; use crate::{ parseable::PARSEABLE, @@ -176,7 +176,7 @@ pub enum RoleError { } impl actix_web::ResponseError for RoleError { - fn status_code(&self) -> http::StatusCode { + fn status_code(&self) -> StatusCode { match self { Self::ObjectStorageError(_) => StatusCode::INTERNAL_SERVER_ERROR, Self::RoleInUse => StatusCode::BAD_REQUEST, diff --git a/src/handlers/http/users/dashboards.rs b/src/handlers/http/users/dashboards.rs index 8ff38ce8d..b1184e812 100644 --- a/src/handlers/http/users/dashboards.rs +++ b/src/handlers/http/users/dashboards.rs @@ -25,12 +25,12 @@ use crate::{ users::dashboards::{DASHBOARDS, Dashboard, Tile, validate_dashboard_id}, utils::{get_hash, get_user_from_request, is_admin}, }; +use actix_web::http::StatusCode; use actix_web::{ HttpRequest, HttpResponse, Responder, http::header::ContentType, web::{self, Json, Path}, }; -use http::StatusCode; use serde_json::Error as SerdeError; pub async fn list_dashboards(req: HttpRequest) -> Result { @@ -261,7 +261,7 @@ pub enum DashboardError { } impl actix_web::ResponseError for DashboardError { - fn status_code(&self) -> http::StatusCode { + fn status_code(&self) -> StatusCode { match self { Self::ObjectStorage(_) => StatusCode::INTERNAL_SERVER_ERROR, Self::Serde(_) => StatusCode::BAD_REQUEST, diff --git a/src/handlers/http/users/filters.rs b/src/handlers/http/users/filters.rs index 58bed9335..0bbf3375f 100644 --- a/src/handlers/http/users/filters.rs +++ b/src/handlers/http/users/filters.rs @@ -24,12 +24,12 @@ use crate::{ users::filters::{CURRENT_FILTER_VERSION, FILTERS, Filter}, utils::{actix::extract_session_key_from_req, get_hash, get_user_from_request, is_admin}, }; +use actix_web::http::StatusCode; use actix_web::{ HttpRequest, HttpResponse, Responder, http::header::ContentType, web::{self, Json, Path}, }; -use http::StatusCode; use serde_json::Error as SerdeError; use ulid::Ulid; @@ -143,7 +143,7 @@ pub enum FiltersError { } impl actix_web::ResponseError for FiltersError { - fn status_code(&self) -> http::StatusCode { + fn status_code(&self) -> StatusCode { match self { Self::ObjectStorage(_) => StatusCode::INTERNAL_SERVER_ERROR, Self::Serde(_) => StatusCode::BAD_REQUEST, diff --git a/src/main.rs b/src/main.rs index 2e888079b..f8577fb15 100644 --- a/src/main.rs +++ b/src/main.rs @@ -34,6 +34,12 @@ use tracing_subscriber::{EnvFilter, Registry, fmt}; #[actix_web::main] async fn main() -> anyhow::Result<()> { init_logger(); + // Install the rustls crypto provider before any TLS operations. + // This is required for rustls 0.23+ which needs an explicit crypto provider. + // If the installation fails, log a warning but continue execution. + if let Err(e) = rustls::crypto::ring::default_provider().install_default() { + warn!("Failed to install rustls crypto provider: {:?}", e); + } // these are empty ptrs so mem footprint should be minimal let server: Box = match &PARSEABLE.options.mode { diff --git a/src/metastore/metastores/object_store_metastore.rs b/src/metastore/metastores/object_store_metastore.rs index 92fe4f88c..35f84f80b 100644 --- a/src/metastore/metastores/object_store_metastore.rs +++ b/src/metastore/metastores/object_store_metastore.rs @@ -21,11 +21,11 @@ use std::{ sync::Arc, }; +use actix_web::http::StatusCode; use arrow_schema::Schema; use bytes::Bytes; use chrono::{DateTime, Utc}; use dashmap::DashMap; -use http::StatusCode; use relative_path::RelativePathBuf; use tonic::async_trait; use tracing::warn; diff --git a/src/metastore/mod.rs b/src/metastore/mod.rs index bc77b7846..4ca5e770b 100644 --- a/src/metastore/mod.rs +++ b/src/metastore/mod.rs @@ -16,7 +16,7 @@ * */ -use http::StatusCode; +use actix_web::http::StatusCode; use serde::Serialize; use crate::storage::ObjectStorageError; diff --git a/src/metrics/mod.rs b/src/metrics/mod.rs index 2b3200f67..b038a241a 100644 --- a/src/metrics/mod.rs +++ b/src/metrics/mod.rs @@ -759,7 +759,10 @@ pub async fn get() -> Result { let encoder = prometheus::TextEncoder::new(); let metric_families = METRICS_REGISTRY.gather(); encoder.encode(&metric_families, &mut buffer).map_err(|e| { - MetricsError::Custom(e.to_string(), http::StatusCode::INTERNAL_SERVER_ERROR) + MetricsError::Custom( + e.to_string(), + actix_web::http::StatusCode::INTERNAL_SERVER_ERROR, + ) })?; Ok(HttpResponse::Ok() @@ -769,8 +772,8 @@ pub async fn get() -> Result { pub mod error { + use actix_web::http::StatusCode; use actix_web::http::header::ContentType; - use http::StatusCode; #[derive(Debug, thiserror::Error)] pub enum MetricsError { @@ -779,7 +782,7 @@ pub mod error { } impl actix_web::ResponseError for MetricsError { - fn status_code(&self) -> http::StatusCode { + fn status_code(&self) -> StatusCode { match self { Self::Custom(_, status) => *status, } diff --git a/src/metrics/prom_utils.rs b/src/metrics/prom_utils.rs index e043e4f56..68997c615 100644 --- a/src/metrics/prom_utils.rs +++ b/src/metrics/prom_utils.rs @@ -22,9 +22,9 @@ use crate::handlers::http::ingest::PostError; use crate::handlers::http::modal::Metadata; use crate::option::Mode; use crate::parseable::PARSEABLE; -use actix_web::http::header; use chrono::NaiveDateTime; use chrono::Utc; +use http::header; use prometheus_parse::Sample as PromSample; use prometheus_parse::Value as PromValue; use serde::Serialize; diff --git a/src/parseable/mod.rs b/src/parseable/mod.rs index 93d44df75..088fdeb91 100644 --- a/src/parseable/mod.rs +++ b/src/parseable/mod.rs @@ -25,12 +25,12 @@ use std::{ sync::Arc, }; -use actix_web::http::header::HeaderMap; +use actix_web::http::StatusCode; +use actix_web::http::header::{CONTENT_TYPE, HeaderMap, HeaderName, HeaderValue}; use arrow_schema::{Field, Schema}; use bytes::Bytes; use chrono::Utc; use clap::{Parser, error::ErrorKind}; -use http::{HeaderName, HeaderValue, StatusCode, header::CONTENT_TYPE}; use once_cell::sync::Lazy; pub use staging::StagingError; use streams::StreamRef; diff --git a/src/prism/home/mod.rs b/src/prism/home/mod.rs index 928589019..d3b0d36b6 100644 --- a/src/prism/home/mod.rs +++ b/src/prism/home/mod.rs @@ -18,9 +18,9 @@ use std::collections::HashMap; +use actix_web::http::StatusCode; use actix_web::http::header::ContentType; use chrono::Utc; -use http::StatusCode; use itertools::Itertools; use serde::Serialize; use tracing::error; @@ -481,7 +481,7 @@ pub enum PrismHomeError { } impl actix_web::ResponseError for PrismHomeError { - fn status_code(&self) -> http::StatusCode { + fn status_code(&self) -> StatusCode { match self { PrismHomeError::Anyhow(_) => StatusCode::INTERNAL_SERVER_ERROR, PrismHomeError::AlertError(e) => e.status_code(), diff --git a/src/prism/logstream/mod.rs b/src/prism/logstream/mod.rs index 77dd252e6..aae16d6cb 100644 --- a/src/prism/logstream/mod.rs +++ b/src/prism/logstream/mod.rs @@ -18,10 +18,10 @@ use std::sync::Arc; +use actix_web::http::StatusCode; use actix_web::http::header::ContentType; use arrow_schema::Schema; use chrono::Utc; -use http::StatusCode; use serde::{Deserialize, Serialize}; use tracing::warn; @@ -388,7 +388,7 @@ pub enum PrismLogstreamError { } impl actix_web::ResponseError for PrismLogstreamError { - fn status_code(&self) -> http::StatusCode { + fn status_code(&self) -> StatusCode { match self { PrismLogstreamError::Anyhow(_) => StatusCode::INTERNAL_SERVER_ERROR, PrismLogstreamError::StreamError(e) => e.status_code(), diff --git a/src/utils/error.rs b/src/utils/error.rs index 70f65e08e..15ff822d6 100644 --- a/src/utils/error.rs +++ b/src/utils/error.rs @@ -16,7 +16,7 @@ * */ -use http::StatusCode; +use actix_web::http::StatusCode; use serde::Serialize; #[derive(Debug, Clone, PartialEq, Eq, Serialize)] diff --git a/src/utils/header_parsing.rs b/src/utils/header_parsing.rs index bd95e5b71..95c518255 100644 --- a/src/utils/header_parsing.rs +++ b/src/utils/header_parsing.rs @@ -16,6 +16,7 @@ * */ +use actix_web::http::StatusCode; use actix_web::{HttpResponse, ResponseError}; #[derive(Debug, thiserror::Error)] @@ -37,8 +38,8 @@ pub enum ParseHeaderError { } impl ResponseError for ParseHeaderError { - fn status_code(&self) -> http::StatusCode { - http::StatusCode::BAD_REQUEST + fn status_code(&self) -> StatusCode { + StatusCode::BAD_REQUEST } fn error_response(&self) -> HttpResponse {