From ab673e4ba40502dd78b11f6b559db2b51734d8ac Mon Sep 17 00:00:00 2001 From: Brooks Townsend Date: Wed, 19 Jul 2023 09:26:31 -0400 Subject: [PATCH] chore(deps): updated wascap,nats,nkeys,wasmbus,ctl Signed-off-by: Brooks Townsend --- Cargo.lock | 466 +++-------------------------------------------------- Cargo.toml | 12 +- 2 files changed, 30 insertions(+), 448 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a7e7514..2942a2a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -198,40 +198,6 @@ dependencies = [ "url", ] -[[package]] -name = "async-nats" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1174495e436c928905018f10a36160f7a8a6786450f50f4ce7fba05d1539704c" -dependencies = [ - "async-nats-tokio-rustls-deps", - "base64 0.13.1", - "base64-url", - "bytes", - "futures", - "http", - "itoa", - "memchr", - "nkeys 0.2.0", - "nuid 0.3.2", - "once_cell", - "rand", - "regex", - "ring", - "rustls-native-certs", - "rustls-pemfile", - "serde", - "serde_json", - "serde_nanos", - "serde_repr", - "thiserror", - "time 0.3.23", - "tokio", - "tokio-retry", - "tracing", - "url", -] - [[package]] name = "async-nats" version = "0.30.0" @@ -266,39 +232,6 @@ dependencies = [ "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.5", - "tokio", - "webpki", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - [[package]] name = "async-trait" version = "0.1.71" @@ -1272,12 +1205,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "flate2" version = "1.0.26" @@ -1465,7 +1392,7 @@ dependencies = [ "indexmap 1.9.3", "slab", "tokio", - "tokio-util 0.7.8", + "tokio-util", "tracing", ] @@ -1672,18 +1599,6 @@ dependencies = [ "tokio-rustls 0.24.1", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - [[package]] name = "iana-time-zone" version = "0.1.57" @@ -2084,12 +1999,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - [[package]] name = "nix" version = "0.22.3" @@ -2266,7 +2175,7 @@ dependencies = [ "sha2 0.10.7", "thiserror", "tokio", - "tokio-util 0.7.8", + "tokio-util", "tracing", "unicase", ] @@ -2300,27 +2209,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "opentelemetry" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "js-sys", - "lazy_static", - "percent-encoding", - "pin-project", - "rand", - "thiserror", - "tokio", - "tokio-stream", -] - [[package]] name = "opentelemetry" version = "0.19.0" @@ -2331,40 +2219,6 @@ dependencies = [ "opentelemetry_sdk", ] -[[package]] -name = "opentelemetry-http" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449048140ee61e28f57abe6e9975eedc1f3a29855c7407bd6c12b18578863379" -dependencies = [ - "async-trait", - "bytes", - "http", - "opentelemetry 0.17.0", - "reqwest", -] - -[[package]] -name = "opentelemetry-otlp" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1a6ca9de4c8b00aa7f1a153bd76cb263287155cec642680d79d98706f3d28a" -dependencies = [ - "async-trait", - "futures", - "futures-util", - "http", - "opentelemetry 0.17.0", - "opentelemetry-http", - "prost", - "prost-build", - "reqwest", - "thiserror", - "tokio", - "tonic", - "tonic-build", -] - [[package]] name = "opentelemetry_api" version = "0.19.0" @@ -2562,16 +2416,6 @@ dependencies = [ "sha2 0.10.7", ] -[[package]] -name = "petgraph" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" -dependencies = [ - "fixedbitset", - "indexmap 1.9.3", -] - [[package]] name = "pin-project" version = "1.1.2" @@ -2673,64 +2517,11 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" -dependencies = [ - "bytes", - "heck 0.3.3", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prost", - "prost-types", - "regex", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -dependencies = [ - "bytes", - "prost", -] - [[package]] name = "provider-archive" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91058846d2bdeaea55ce059f375e1af0e57f9cfad83fd6702d539c45e8d26d7" +checksum = "3f02e3a69a868e932a76ee5e026ae1923e761f157aaf3ad0b9d4906eaebf62fc" dependencies = [ "async-compression", "data-encoding", @@ -2738,7 +2529,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-tar", - "wascap 0.8.0", + "wascap 0.11.0", ] [[package]] @@ -2924,7 +2715,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-rustls 0.24.1", - "tokio-util 0.7.8", + "tokio-util", "tower-service", "url", "wasm-bindgen", @@ -3818,16 +3609,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.1.0" @@ -3909,20 +3690,6 @@ dependencies = [ "tungstenite", ] -[[package]] -name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.8" @@ -3981,75 +3748,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tonic" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" -dependencies = [ - "async-stream", - "async-trait", - "base64 0.13.1", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "prost-derive", - "tokio", - "tokio-stream", - "tokio-util 0.6.10", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" -dependencies = [ - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand", - "slab", - "tokio", - "tokio-util 0.7.8", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - [[package]] name = "tower-service" version = "0.3.2" @@ -4111,20 +3809,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-opentelemetry" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" -dependencies = [ - "once_cell", - "opentelemetry 0.17.0", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", -] - [[package]] name = "tracing-opentelemetry" version = "0.19.0" @@ -4132,7 +3816,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00a39dcf9bfc1742fa4d6215253b33a6e474be78275884c216fc2a06267b3600" dependencies = [ "once_cell", - "opentelemetry 0.19.0", + "opentelemetry", "tracing", "tracing-core", "tracing-log", @@ -4356,7 +4040,7 @@ dependencies = [ "tracing-futures", "uuid 1.4.1", "wasmbus-rpc 0.14.0", - "wasmcloud-control-interface 0.27.0", + "wasmcloud-control-interface", ] [[package]] @@ -4404,7 +4088,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-tungstenite", - "tokio-util 0.7.8", + "tokio-util", "tower-service", "tracing", ] @@ -4441,29 +4125,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "wascap" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a85c9ab66dd6a39400cc7235b803c8819c3b76405bce83f8e6c540a8abf89a" -dependencies = [ - "base64 0.13.1", - "data-encoding", - "env_logger 0.10.0", - "humantime", - "lazy_static", - "log", - "nkeys 0.2.0", - "nuid 0.4.1", - "ring", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder 0.25.0", - "wasm-gen", - "wasmparser 0.102.0", -] - [[package]] name = "wascap" version = "0.11.0" @@ -4482,9 +4143,9 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.29.0", + "wasm-encoder", "wasm-gen", - "wasmparser 0.107.0", + "wasmparser", ] [[package]] @@ -4493,7 +4154,7 @@ version = "0.18.1" dependencies = [ "anyhow", "assert-json-diff", - "async-nats 0.29.0", + "async-nats 0.30.0", "atelier_core 0.2.22", "bytes", "cargo_atelier", @@ -4509,7 +4170,7 @@ dependencies = [ "indicatif", "log", "nix 0.26.2", - "nkeys 0.2.0", + "nkeys 0.3.0", "notify", "oci-distribution", "once_cell", @@ -4541,10 +4202,10 @@ dependencies = [ "wadm", "warp", "warp-embed", - "wascap 0.10.1", + "wascap 0.11.0", "wash-lib", - "wasmbus-rpc 0.13.0", - "wasmcloud-control-interface 0.26.0", + "wasmbus-rpc 0.14.0", + "wasmcloud-control-interface", "wasmcloud-test-util", "weld-codegen 0.7.0", "which", @@ -4556,7 +4217,7 @@ version = "0.9.1" dependencies = [ "anyhow", "async-compression", - "async-nats 0.29.0", + "async-nats 0.30.0", "bytes", "cargo_metadata", "cargo_toml", @@ -4574,7 +4235,7 @@ dependencies = [ "ignore", "indicatif", "log", - "nkeys 0.2.0", + "nkeys 0.3.0", "oci-distribution", "path-absolutize", "provider-archive", @@ -4595,13 +4256,13 @@ dependencies = [ "tokio", "tokio-stream", "tokio-tar", - "tokio-util 0.7.8", + "tokio-util", "toml 0.7.6", "wadm", "walkdir", - "wascap 0.10.1", - "wasmbus-rpc 0.13.0", - "wasmcloud-control-interface 0.26.0", + "wascap 0.11.0", + "wasmbus-rpc 0.14.0", + "wasmcloud-control-interface", "weld-codegen 0.7.0", ] @@ -4683,15 +4344,6 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" -[[package]] -name = "wasm-encoder" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eff853c4f09eec94d76af527eddad4e9de13b11d6286a1ef7134bc30135a2b7" -dependencies = [ - "leb128", -] - [[package]] name = "wasm-encoder" version = "0.29.0" @@ -4773,46 +4425,6 @@ dependencies = [ "weld-codegen 0.6.0", ] -[[package]] -name = "wasmbus-rpc" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ba72e61b8361650149b2650b72c583a1d50ac78f75213b74eaec049699c5d93" -dependencies = [ - "async-nats 0.29.0", - "async-trait", - "atty", - "base64 0.13.1", - "bytes", - "cfg-if", - "data-encoding", - "futures", - "lazy_static", - "minicbor 0.17.1", - "minicbor-ser", - "nkeys 0.2.0", - "once_cell", - "opentelemetry 0.17.0", - "opentelemetry-otlp", - "rmp-serde", - "serde", - "serde_bytes", - "serde_json", - "sha2 0.10.7", - "thiserror", - "time 0.3.23", - "tokio", - "toml 0.5.11", - "tracing", - "tracing-futures", - "tracing-opentelemetry 0.17.4", - "tracing-subscriber", - "uuid 1.4.1", - "wascap 0.8.0", - "wasmbus-macros", - "weld-codegen 0.7.0", -] - [[package]] name = "wasmbus-rpc" version = "0.14.0" @@ -4850,26 +4462,6 @@ dependencies = [ "weld-codegen 0.7.0", ] -[[package]] -name = "wasmcloud-control-interface" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d64bb64d8ce1b38fb3234ff9f1e20311d4140cb64c273ac0182a6f8fdf0695" -dependencies = [ - "async-nats 0.29.0", - "cloudevents-sdk", - "data-encoding", - "futures", - "ring", - "rmp-serde", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-futures", - "wasmbus-rpc 0.13.0", -] - [[package]] name = "wasmcloud-control-interface" version = "0.27.0" @@ -4882,7 +4474,7 @@ dependencies = [ "data-encoding", "futures", "lazy_static", - "opentelemetry 0.19.0", + "opentelemetry", "ring", "rmp-serde", "serde", @@ -4890,7 +4482,7 @@ dependencies = [ "tokio", "tracing", "tracing-futures", - "tracing-opentelemetry 0.19.0", + "tracing-opentelemetry", ] [[package]] @@ -4932,16 +4524,6 @@ dependencies = [ "wasmcloud-interface-testing", ] -[[package]] -name = "wasmparser" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" -dependencies = [ - "indexmap 1.9.3", - "url", -] - [[package]] name = "wasmparser" version = "0.107.0" diff --git a/Cargo.toml b/Cargo.toml index c9d3e71c..b1e2ae10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -90,7 +90,7 @@ members = ["./", "./crates/wash-lib"] anyhow = "1.0.71" assert-json-diff = "2.0.1" async-compression = { version = "0.3", default-features = false } -async-nats = "0.29.0" +async-nats = "0.30.0" atelier_core = "0.2" bytes = "1.4" cargo_atelier = "0.2" @@ -110,11 +110,11 @@ heck = "0.4" ignore = "0.4" indicatif = "0.17.5" log = "0.4" -nkeys = "0.2.0" +nkeys = "0.3.0" oci-distribution = { version = "0.9.4", default-features = false, features = ["rustls-tls"] } once_cell = "1.18" path-absolutize = "3.1" -provider-archive = "0.6.0" +provider-archive = "0.7.0" regex = "1.9" remove_dir_all = "0.7" reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] } @@ -142,10 +142,10 @@ tokio-util = "0.7.8" toml = "0.7.6" wadm = "0.4.0" walkdir = "2.3" -wascap = "0.10.1" +wascap = "0.11.0" wash-lib = { version = "0.9.0", path = "./crates/wash-lib" } -wasmbus-rpc = "0.13.0" -wasmcloud-control-interface = "0.26" +wasmbus-rpc = "0.14.0" +wasmcloud-control-interface = "0.27" wasmcloud-test-util = "0.6.4" weld-codegen = "0.7.0" which = "4.4.0"