diff --git a/Cargo.lock b/Cargo.lock index 879b7663d3b1b..30edc7eeb5427 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -460,9 +460,9 @@ version = "6.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117113a7ff4a98f2a864fa7a5274033b0907fce65dc8464993c75033f8074f90" dependencies = [ - "async-graphql-derive", - "async-graphql-parser", - "async-graphql-value", + "async-graphql-derive 6.0.9", + "async-graphql-parser 6.0.9", + "async-graphql-value 6.0.9", "async-stream", "async-trait", "base64 0.13.1", @@ -470,10 +470,40 @@ dependencies = [ "chrono", "fnv", "futures-util", - "http", + "http 0.2.9", "indexmap 2.0.2", "mime", - "multer", + "multer 2.1.0", + "num-traits", + "once_cell", + "pin-project-lite", + "regex", + "serde", + "serde_json", + "serde_urlencoded", + "static_assertions", + "thiserror", +] + +[[package]] +name = "async-graphql" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ad990024653fd2d0321a568f64e620404a894047b2ab8c475f7452c8bb82cf6" +dependencies = [ + "async-graphql-derive 7.0.0", + "async-graphql-parser 7.0.0", + "async-graphql-value 7.0.0", + "async-stream", + "async-trait", + "base64 0.13.1", + "bytes 1.5.0", + "fnv", + "futures-util", + "http 1.0.0", + "indexmap 2.0.2", + "mime", + "multer 3.0.0", "num-traits", "once_cell", "pin-project-lite", @@ -492,7 +522,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e4bb7b7b2344d24af860776b7fe4e4ee4a67cd965f076048d023f555703b854" dependencies = [ "Inflector", - "async-graphql-parser", + "async-graphql-parser 6.0.9", + "darling 0.20.3", + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.69", + "quote 1.0.33", + "strum", + "syn 2.0.38", + "thiserror", +] + +[[package]] +name = "async-graphql-derive" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3909cc7228128099b603d057e5a920b9499ce24299f8f680d5d1f213d7b830c0" +dependencies = [ + "Inflector", + "async-graphql-parser 7.0.0", "darling 0.20.3", "proc-macro-crate 1.3.1", "proc-macro2 1.0.69", @@ -508,7 +555,19 @@ version = "6.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c47e1c1ff6cb7cae62c9cd768d76475cc68f156d8234b024fd2499ad0e91da21" dependencies = [ - "async-graphql-value", + "async-graphql-value 6.0.9", + "pest", + "serde", + "serde_json", +] + +[[package]] +name = "async-graphql-parser" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ceb02570faf16e3b6775cc286b1f0fb2e4eb846144a08c130ca5ad6e25219fe" +dependencies = [ + "async-graphql-value 7.0.0", "pest", "serde", "serde_json", @@ -526,14 +585,27 @@ dependencies = [ "serde_json", ] +[[package]] +name = "async-graphql-value" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516317bb55d143cc47941c0cb952134dd207c5ab3c839ee226eedd6dd9a96f43" +dependencies = [ + "bytes 1.5.0", + "indexmap 2.0.2", + "serde", + "serde_json", +] + [[package]] name = "async-graphql-warp" -version = "6.0.9" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d54ac2c41da8f2bc2b5976227d585e787b55f696660d26fd6e1bee50e740f98" +checksum = "7748ef4d9c506be35b7008a25f8d484386532a21e7b492900622235fec07d30f" dependencies = [ - "async-graphql", + "async-graphql 7.0.0", "futures-util", + "http 0.2.9", "serde_json", "warp", ] @@ -596,7 +668,7 @@ dependencies = [ "base64 0.21.5", "bytes 1.5.0", "futures 0.3.29", - "http", + "http 0.2.9", "memchr", "nkeys", "nuid", @@ -770,7 +842,7 @@ dependencies = [ "aws-types", "bytes 1.5.0", "hex", - "http", + "http 0.2.9", "hyper", "ring 0.16.20", "time", @@ -800,7 +872,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "aws-types", - "http", + "http 0.2.9", "regex", "tracing 0.1.40", ] @@ -815,7 +887,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "http-body", "lazy_static", "percent-encoding", @@ -842,7 +914,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -865,7 +937,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -888,7 +960,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -911,7 +983,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tower", ] @@ -933,7 +1005,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -962,7 +1034,7 @@ dependencies = [ "bytes 1.5.0", "bytes-utils", "fastrand 1.9.0", - "http", + "http 0.2.9", "http-body", "once_cell", "percent-encoding", @@ -992,7 +1064,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -1017,7 +1089,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -1040,7 +1112,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -1065,7 +1137,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tower", "tracing 0.1.40", @@ -1081,7 +1153,7 @@ dependencies = [ "aws-smithy-eventstream", "aws-smithy-http", "aws-types", - "http", + "http 0.2.9", "tracing 0.1.40", ] @@ -1096,7 +1168,7 @@ dependencies = [ "form_urlencoded", "hex", "hmac", - "http", + "http 0.2.9", "once_cell", "percent-encoding", "regex", @@ -1127,7 +1199,7 @@ dependencies = [ "crc32c", "crc32fast", "hex", - "http", + "http 0.2.9", "http-body", "md-5", "pin-project-lite", @@ -1148,7 +1220,7 @@ dependencies = [ "aws-smithy-types", "bytes 1.5.0", "fastrand 1.9.0", - "http", + "http 0.2.9", "http-body", "hyper", "hyper-rustls 0.23.2", @@ -1181,7 +1253,7 @@ dependencies = [ "bytes 1.5.0", "bytes-utils", "futures-core", - "http", + "http 0.2.9", "http-body", "hyper", "once_cell", @@ -1199,7 +1271,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes 1.5.0", - "http", + "http 0.2.9", "http-body", "pin-project-lite", "tower", @@ -1220,7 +1292,7 @@ version = "0.54.1" source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" dependencies = [ "assert-json-diff 1.1.0", - "http", + "http 0.2.9", "pretty_assertions", "regex", "roxmltree 0.14.1", @@ -1267,7 +1339,7 @@ dependencies = [ "aws-smithy-client", "aws-smithy-http", "aws-smithy-types", - "http", + "http 0.2.9", "rustc_version 0.4.0", "tracing 0.1.40", ] @@ -1283,7 +1355,7 @@ dependencies = [ "bitflags 1.3.2", "bytes 1.5.0", "futures-util", - "http", + "http 0.2.9", "http-body", "hyper", "itoa", @@ -1310,7 +1382,7 @@ dependencies = [ "async-trait", "bytes 1.5.0", "futures-util", - "http", + "http 0.2.9", "http-body", "mime", "rustversion", @@ -1597,7 +1669,7 @@ dependencies = [ "futures-util", "hex", "home", - "http", + "http 0.2.9", "hyper", "hyper-rustls 0.24.2", "hyperlocal", @@ -3799,7 +3871,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", "indexmap 1.9.3", "slab", "tokio", @@ -3870,7 +3942,7 @@ dependencies = [ "base64 0.21.5", "bytes 1.5.0", "headers-core", - "http", + "http 0.2.9", "httpdate", "mime", "sha1", @@ -3882,7 +3954,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.9", ] [[package]] @@ -4094,6 +4166,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes 1.5.0", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -4101,7 +4184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes 1.5.0", - "http", + "http 0.2.9", "pin-project-lite", ] @@ -4117,7 +4200,7 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" dependencies = [ - "http", + "http 0.2.9", "serde", ] @@ -4131,7 +4214,7 @@ dependencies = [ "async-channel", "base64 0.13.1", "futures-lite", - "http", + "http 0.2.9", "infer 0.2.3", "pin-project-lite", "rand 0.7.3", @@ -4171,7 +4254,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.9", "http-body", "httparse", "httpdate", @@ -4190,7 +4273,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" dependencies = [ - "http", + "http 0.2.9", "hyper", "linked_hash_set", "once_cell", @@ -4211,7 +4294,7 @@ dependencies = [ "bytes 1.5.0", "futures 0.3.29", "headers", - "http", + "http 0.2.9", "hyper", "openssl", "tokio", @@ -4225,7 +4308,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ - "http", + "http 0.2.9", "hyper", "log", "rustls 0.20.9", @@ -4241,7 +4324,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", + "http 0.2.9", "hyper", "log", "rustls 0.21.8", @@ -4628,7 +4711,7 @@ dependencies = [ "base64 0.21.5", "bytes 1.5.0", "chrono", - "http", + "http 0.2.9", "percent-encoding", "serde", "serde-value", @@ -4709,7 +4792,7 @@ dependencies = [ "dirs-next", "either", "futures 0.3.29", - "http", + "http 0.2.9", "http-body", "hyper", "hyper-openssl", @@ -4740,7 +4823,7 @@ checksum = "25983d07f414dfffba08c5951fe110f649113416b1d8e22f7c89c750eb2555a7" dependencies = [ "chrono", "form_urlencoded", - "http", + "http 0.2.9", "json-patch", "k8s-openapi 0.18.0", "once_cell", @@ -5354,7 +5437,25 @@ dependencies = [ "bytes 1.5.0", "encoding_rs", "futures-util", - "http", + "http 0.2.9", + "httparse", + "log", + "memchr", + "mime", + "spin 0.9.8", + "version_check", +] + +[[package]] +name = "multer" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15d522be0a9c3e46fd2632e272d178f56387bdb5c9fbb3a36c649062e9b5219" +dependencies = [ + "bytes 1.5.0", + "encoding_rs", + "futures-util", + "http 1.0.0", "httparse", "log", "memchr", @@ -5750,7 +5851,7 @@ dependencies = [ "base64 0.13.1", "chrono", "getrandom 0.2.10", - "http", + "http 0.2.9", "rand 0.8.5", "reqwest", "serde", @@ -5843,7 +5944,7 @@ dependencies = [ "chrono", "flagset", "futures 0.3.29", - "http", + "http 0.2.9", "hyper", "log", "md-5", @@ -5870,7 +5971,7 @@ dependencies = [ "dyn-clone", "ed25519-dalek", "hmac", - "http", + "http 0.2.9", "itertools 0.10.5", "log", "oauth2", @@ -7371,7 +7472,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.9", "http-body", "hyper", "hyper-rustls 0.24.2", @@ -9138,7 +9239,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.9", "http-body", "hyper", "hyper-timeout", @@ -9168,7 +9269,7 @@ dependencies = [ "bytes 1.5.0", "flate2", "h2", - "http", + "http 0.2.9", "http-body", "hyper", "hyper-timeout", @@ -9245,7 +9346,7 @@ dependencies = [ "bytes 1.5.0", "futures-core", "futures-util", - "http", + "http 0.2.9", "http-body", "http-range-header", "mime", @@ -9524,7 +9625,7 @@ dependencies = [ "byteorder", "bytes 1.5.0", "data-encoding", - "http", + "http 0.2.9", "httparse", "log", "rand 0.8.5", @@ -9851,7 +9952,7 @@ dependencies = [ "arr_macro", "assert_cmd", "async-compression", - "async-graphql", + "async-graphql 6.0.9", "async-graphql-warp", "async-nats", "async-stream", @@ -9914,7 +10015,7 @@ dependencies = [ "heim", "hex", "hostname", - "http", + "http 0.2.9", "http-body", "http-serde", "hyper", @@ -10133,7 +10234,7 @@ dependencies = [ "chrono", "chrono-tz", "encoding_rs", - "http", + "http 0.2.9", "indexmap 2.0.2", "inventory", "no-proxy", @@ -10184,7 +10285,7 @@ dependencies = [ name = "vector-core" version = "0.1.0" dependencies = [ - "async-graphql", + "async-graphql 6.0.9", "async-trait", "base64 0.21.5", "bitmask-enum", @@ -10202,7 +10303,7 @@ dependencies = [ "futures 0.3.29", "futures-util", "headers", - "http", + "http 0.2.9", "hyper-proxy", "indexmap 2.0.2", "metrics", @@ -10517,7 +10618,7 @@ dependencies = [ "futures-channel", "futures-util", "headers", - "http", + "http 0.2.9", "hyper", "log", "mime", diff --git a/Cargo.toml b/Cargo.toml index 287624f94bf50..e257aec858d06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -215,7 +215,7 @@ lapin = { version = "2.3.1", default-features = false, features = ["native-tls"] # API async-graphql = { version = "6.0.9", default-features = false, optional = true, features = ["chrono", "playground"] } -async-graphql-warp = { version = "6.0.0", default-features = false, optional = true } +async-graphql-warp = { version = "7.0.0", default-features = false, optional = true } itertools = { version = "0.11.0", default-features = false } # API client