diff --git a/Cargo.lock b/Cargo.lock index 8cce9ea7..5269007e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -69,9 +69,12 @@ dependencies = [ [[package]] name = "async-nats" version = "0.29.0" -source = "git+https://github.com/foxford/nats.rs?branch=main#f5fa297c236dcca2e406761e5cc0fe78338a0ae0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1174495e436c928905018f10a36160f7a8a6786450f50f4ce7fba05d1539704c" dependencies = [ - "base64 0.21.0", + "async-nats-tokio-rustls-deps", + "base64 0.13.1", + "base64-url", "bytes", "futures", "http", @@ -85,7 +88,6 @@ dependencies = [ "ring", "rustls-native-certs", "rustls-pemfile", - "rustls-webpki", "serde", "serde_json", "serde_nanos", @@ -94,11 +96,21 @@ dependencies = [ "time 0.3.20", "tokio", "tokio-retry", - "tokio-rustls 0.24.0", "tracing", "url", ] +[[package]] +name = "async-nats-tokio-rustls-deps" +version = "0.24.0-ALPHA.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cdefe54cd7867d937c0a507d2a3a830af410044282cd3e4002b5b7860e1892e" +dependencies = [ + "rustls 0.21.1", + "tokio", + "webpki 0.22.0", +] + [[package]] name = "async-trait" version = "0.1.68" @@ -229,6 +241,15 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +[[package]] +name = "base64-url" +version = "1.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a99c239d0c7e77c85dddfa9cebce48704b3c49550fcd3b84dd637e4484899f" +dependencies = [ + "base64 0.13.1", +] + [[package]] name = "base64ct" version = "1.1.1" @@ -2252,8 +2273,8 @@ dependencies = [ "pollster", "thiserror", "tokio", - "tokio-rustls 0.22.0", - "webpki", + "tokio-rustls", + "webpki 0.21.4", ] [[package]] @@ -2402,7 +2423,7 @@ dependencies = [ "log", "ring", "sct 0.6.1", - "webpki", + "webpki 0.21.4", ] [[package]] @@ -3137,9 +3158,9 @@ dependencies = [ [[package]] name = "svc-events" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15432fcea5a7eaa54236ee253e2b573bd720ef6c94a7849be17804200830b7d5" +checksum = "a30b9e3f342270165a9e7543f9ba85a45bff586cc04f4d495ffd8b4a44447974" dependencies = [ "serde", "serde_json", @@ -3151,8 +3172,9 @@ dependencies = [ [[package]] name = "svc-nats-client" -version = "0.4.0" -source = "git+https://github.com/foxford/svc-nats-client/?branch=ULMS-1896/add-transient-permanent-errors#705d841c12fbc0b26233fb5935b362540d40ff80" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c35276c77ae7ff528a5fb243f16bf95065a3ac8c91837356f2ee797c9a697203" dependencies = [ "anyhow", "async-nats", @@ -3389,17 +3411,7 @@ checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls 0.19.1", "tokio", - "webpki", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" -dependencies = [ - "rustls 0.21.1", - "tokio", + "webpki 0.21.4", ] [[package]] @@ -3823,6 +3835,16 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "whoami" version = "1.4.0" diff --git a/Cargo.toml b/Cargo.toml index 43295c2a..8a82da20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,8 +39,8 @@ svc-authn = { version = "0.8", features = ["jose", "sqlx"] } svc-authz = { version = "0.12" } svc-error = { version = "0.5", features = ["sqlx", "svc-agent", "svc-authn", "svc-authz", "sentry-extension"] } svc-utils = { version = "0.7", features = ["authn-extractor", "cors-middleware", "log-middleware"] } -svc-nats-client = { git = "https://github.com/foxford/svc-nats-client/", branch = "ULMS-1896/add-transient-permanent-errors" } -svc-events = "0.7" +svc-nats-client = "0.5" +svc-events = "0.9" tokio = { version = "1.28", features = ["full"] } tower = "0.4" tower-http = { version = "0.4", features = ["trace", "cors"] }