From 98d432d7cf71356c9e4ba46eb8b90c99898f39e0 Mon Sep 17 00:00:00 2001 From: Johnny Graettinger Date: Fri, 1 Sep 2023 17:52:22 +0000 Subject: [PATCH] Cargo.toml: update for rust connectors refactor --- Cargo.lock | 125 +++++++++++++++++++++++++++++------------------------ Cargo.toml | 5 ++- 2 files changed, 71 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 53823e65d0..204775d54a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -32,9 +32,11 @@ dependencies = [ "async-process", "async-trait", "base64 0.13.1", + "build", "bytes", "chrono", "clap 3.2.24", + "colored_json", "derivative", "doc", "futures", @@ -45,7 +47,7 @@ dependencies = [ "proto-flow", "regex", "reqwest", - "rusqlite", + "runtime", "schemars", "serde", "serde_json", @@ -60,6 +62,7 @@ dependencies = [ "tracing-subscriber", "url", "uuid 1.3.1", + "validation", "validator", ] @@ -425,9 +428,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.2.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bitvec" @@ -469,28 +472,16 @@ dependencies = [ "anyhow", "assemble", "bytes", - "cgo", - "connector-init", - "derive-typescript", - "doc", "futures", - "insta", - "json", - "lazy_static", - "models", "ops", - "pbjson-types", - "prost", "proto-flow", + "reqwest", "runtime", "rusqlite", - "serde", - "serde_json", - "serde_yaml", "sources", "tables", - "thiserror", "tokio", + "tonic", "tracing", "url", "validation", @@ -773,6 +764,18 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colored_json" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74cb9ce6b86f6e54bfa9518df2eeeef65d424ec7244d083ed97229185e366a91" +dependencies = [ + "is-terminal", + "serde", + "serde_json", + "yansi", +] + [[package]] name = "comfy-table" version = "6.1.4" @@ -1161,30 +1164,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "derive-typescript" -version = "0.0.0" -dependencies = [ - "anyhow", - "doc", - "insta", - "itertools 0.10.5", - "json", - "lazy_static", - "locate-bin", - "models", - "proto-flow", - "regex", - "serde", - "serde_json", - "serde_yaml", - "sources", - "tables", - "tempfile", - "tracing", - "url", -] - [[package]] name = "diff" version = "0.1.13" @@ -1446,7 +1425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" dependencies = [ "cfg-if 1.0.0", - "rustix", + "rustix 0.37.15", "windows-sys 0.48.0", ] @@ -1505,13 +1484,13 @@ dependencies = [ "assert_cmd", "async-process", "base64 0.13.1", + "build", "bytelines", "bytes", "clap 3.2.24", "comfy-table", "connector-init", "crossterm", - "derive-typescript", "dirs", "doc", "extractors", @@ -1547,7 +1526,6 @@ dependencies = [ "serde_yaml", "size", "sources", - "superslice", "tables", "tempfile", "time 0.3.20", @@ -1557,10 +1535,8 @@ dependencies = [ "tracing", "tracing-subscriber", "url", - "urlencoding", "uuid 1.3.1", "validation", - "walkdir", ] [[package]] @@ -2126,6 +2102,17 @@ dependencies = [ "serde", ] +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi 0.3.1", + "rustix 0.38.10", + "windows-sys 0.48.0", +] + [[package]] name = "itertools" version = "0.4.19" @@ -2275,9 +2262,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.142" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libflate" @@ -2365,6 +2352,12 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf" +[[package]] +name = "linux-raw-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + [[package]] name = "locate-bin" version = "0.0.0" @@ -3292,6 +3285,7 @@ dependencies = [ "regex", "serde", "serde_json", + "zeroize", ] [[package]] @@ -3759,6 +3753,7 @@ name = "runtime" version = "0.0.0" dependencies = [ "anyhow", + "async-process", "bytes", "clap 3.2.24", "connector-init", @@ -3769,6 +3764,8 @@ dependencies = [ "insta", "json-patch", "librocksdb-sys", + "locate-bin", + "models", "ops", "pbjson-types", "prost", @@ -3785,6 +3782,7 @@ dependencies = [ "tracing", "tracing-subscriber", "tuple", + "zeroize", ] [[package]] @@ -3793,7 +3791,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.2.1", + "bitflags 2.4.0", "chrono", "csv", "fallible-iterator", @@ -3823,7 +3821,20 @@ dependencies = [ "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.4", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] @@ -4622,7 +4633,7 @@ dependencies = [ "cfg-if 1.0.0", "fastrand", "redox_syscall 0.3.5", - "rustix", + "rustix 0.37.15", "windows-sys 0.45.0", ] @@ -5161,12 +5172,6 @@ dependencies = [ "serde", ] -[[package]] -name = "urlencoding" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" - [[package]] name = "utf-8" version = "0.7.6" @@ -5785,6 +5790,12 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zeroize" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" + [[package]] name = "zip" version = "0.5.13" diff --git a/Cargo.toml b/Cargo.toml index 808ab2853d..5ad587b339 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,7 @@ [workspace] resolver = "2" members = ["crates/*"] +exclude = ["crates/derive-typescript"] [workspace.package] version = "0.0.0" @@ -39,6 +40,7 @@ caseless = "0.2" chardetng = "0.1" chrono = { version = "0.4", features = ["serde"] } clap = { version = "3.2", features = ["derive", "env"] } +colored_json = "3" comfy-table = "6.1" # The `console_error_panic_hook` crate causes panics in a Rust WASM module to be logged # with `console.error`. @@ -159,16 +161,15 @@ tracing-subscriber = { version = "0.3", features = [ "fmt", ] } shared_child = "1.0.0" +zeroize = "1.6" unicode-bom = "1.1" unicode-normalization = "0.1" url = { version = "2.2", features = ["serde"] } -urlencoding = { version = "2.1.2" } uuid = { version = "1.1", features = ["serde", "v4"] } validator = { version = "0.15", features = ["derive"] } quickcheck = "1.0" quickcheck_macros = "1.0" -walkdir = "2" wasm-bindgen = "0.2.62" # `wee_alloc` is a tiny allocator for wasm that is only ~1K in code size # compared to the default allocator's ~10K. It is slower than the default