From 1811855ff4232c0628d0b6942544ffab54b220ac Mon Sep 17 00:00:00 2001 From: neuronull Date: Mon, 31 Jul 2023 13:28:52 -0600 Subject: [PATCH] chore(deps): Bump async_graphql, async_graphql_warp from 5.0.10 to 6.0.0 --- Cargo.lock | 96 ++++++++++++++++++++++--- Cargo.toml | 4 +- src/api/schema/components/mod.rs | 4 +- src/api/schema/metrics/mod.rs | 2 +- src/api/schema/metrics/sink/mod.rs | 6 +- src/api/schema/metrics/source/mod.rs | 6 +- src/api/schema/metrics/transform/mod.rs | 4 +- 7 files changed, 98 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a5f635dafc5cf..2b8e9538d7f29 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -415,14 +415,13 @@ version = "5.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b35ef8f9be23ee30fe1eb1cf175c689bc33517c6c6d0fd0669dade611e5ced7f" dependencies = [ - "async-graphql-derive", - "async-graphql-parser", - "async-graphql-value", + "async-graphql-derive 5.0.10", + "async-graphql-parser 5.0.10", + "async-graphql-value 5.0.10", "async-stream", "async-trait", "base64 0.13.1", "bytes 1.4.0", - "chrono", "fnv", "futures-util", "http", @@ -440,6 +439,37 @@ dependencies = [ "thiserror", ] +[[package]] +name = "async-graphql" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d1f56ef571e325930c41685502269651505160ae0d7e0d7413dd84afe86432c" +dependencies = [ + "async-graphql-derive 6.0.0", + "async-graphql-parser 6.0.0", + "async-graphql-value 6.0.0", + "async-stream", + "async-trait", + "base64 0.13.1", + "bytes 1.4.0", + "chrono", + "fnv", + "futures-util", + "http", + "indexmap 2.0.0", + "mime", + "multer", + "num-traits", + "once_cell", + "pin-project-lite", + "regex", + "serde", + "serde_json", + "serde_urlencoded", + "static_assertions", + "thiserror", +] + [[package]] name = "async-graphql-derive" version = "5.0.10" @@ -447,7 +477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a0f6ceed3640b4825424da70a5107e79d48d9b2bc6318dfc666b2fc4777f8c4" dependencies = [ "Inflector", - "async-graphql-parser", + "async-graphql-parser 5.0.10", "darling 0.14.2", "proc-macro-crate 1.2.1", "proc-macro2 1.0.66", @@ -456,13 +486,42 @@ dependencies = [ "thiserror", ] +[[package]] +name = "async-graphql-derive" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a3a4c50aafce65a48d1aba749aaa946173a52d274abb5b9f76360a966ce17c6" +dependencies = [ + "Inflector", + "async-graphql-parser 6.0.0", + "darling 0.20.3", + "proc-macro-crate 1.2.1", + "proc-macro2 1.0.66", + "quote 1.0.32", + "strum", + "syn 2.0.27", + "thiserror", +] + [[package]] name = "async-graphql-parser" version = "5.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecc308cd3bc611ee86c9cf19182d2b5ee583da40761970e41207f088be3db18f" dependencies = [ - "async-graphql-value", + "async-graphql-value 5.0.10", + "pest", + "serde", + "serde_json", +] + +[[package]] +name = "async-graphql-parser" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64488a0f0afd284f829977437a2e49e9f62cb72ea5fbd96aec19f87351576df" +dependencies = [ + "async-graphql-value 6.0.0", "pest", "serde", "serde_json", @@ -480,13 +539,25 @@ dependencies = [ "serde_json", ] +[[package]] +name = "async-graphql-value" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86046bbced96c0fab3ff5d2b3c769c0c55b0b3a7d67f9e2f2044f349f2e7d501" +dependencies = [ + "bytes 1.4.0", + "indexmap 2.0.0", + "serde", + "serde_json", +] + [[package]] name = "async-graphql-warp" -version = "5.0.10" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce971f92675defe1adf14f9e70b8798d797db9f454463b611a552bffd5532188" +checksum = "4de785650dd90a223b5f5968c5345215160a36d196c9295c6c9a316cb29cba04" dependencies = [ - "async-graphql", + "async-graphql 6.0.0", "futures-util", "serde_json", "warp", @@ -8032,6 +8103,9 @@ name = "strum" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros", +] [[package]] name = "strum_macros" @@ -9271,7 +9345,7 @@ dependencies = [ "arr_macro", "assert_cmd", "async-compression", - "async-graphql", + "async-graphql 6.0.0", "async-graphql-warp", "async-stream", "async-trait", @@ -9613,7 +9687,7 @@ dependencies = [ name = "vector-core" version = "0.1.0" dependencies = [ - "async-graphql", + "async-graphql 5.0.10", "async-trait", "base64 0.21.2", "bitmask-enum", diff --git a/Cargo.toml b/Cargo.toml index dc33ef1b6b109..2ac69822e056d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -221,8 +221,8 @@ smpl_jwt = { version = "0.7.1", default-features = false, optional = true } lapin = { version = "2.3.1", default-features = false, features = ["native-tls"], optional = true } # API -async-graphql = { version = "5.0.10", default-features = false, optional = true, features = ["chrono"] } -async-graphql-warp = { version = "5.0.10", default-features = false, optional = true } +async-graphql = { version = "6.0.0", default-features = false, optional = true, features = ["chrono", "playground"] } +async-graphql-warp = { version = "6.0.0", default-features = false, optional = true } itertools = { version = "0.11.0", default-features = false, optional = true } # API client diff --git a/src/api/schema/components/mod.rs b/src/api/schema/components/mod.rs index 20880f3a06698..1b5e4cf82a201 100644 --- a/src/api/schema/components/mod.rs +++ b/src/api/schema/components/mod.rs @@ -25,8 +25,8 @@ use crate::{ #[derive(Debug, Clone, Interface)] #[graphql( - field(name = "component_id", type = "String"), - field(name = "component_type", type = "String") + field(name = "component_id", ty = "String"), + field(name = "component_type", ty = "String") )] pub enum Component { Source(source::Source), diff --git a/src/api/schema/metrics/mod.rs b/src/api/schema/metrics/mod.rs index 11b8abc51ddc5..1a273dc5e9bee 100644 --- a/src/api/schema/metrics/mod.rs +++ b/src/api/schema/metrics/mod.rs @@ -37,7 +37,7 @@ pub use uptime::Uptime; use crate::config::ComponentKey; #[derive(Interface)] -#[graphql(field(name = "timestamp", type = "Option>"))] +#[graphql(field(name = "timestamp", ty = "Option>"))] pub enum MetricType { Uptime(Uptime), } diff --git a/src/api/schema/metrics/sink/mod.rs b/src/api/schema/metrics/sink/mod.rs index 97f943a7dbef7..c864270834cec 100644 --- a/src/api/schema/metrics/sink/mod.rs +++ b/src/api/schema/metrics/sink/mod.rs @@ -7,9 +7,9 @@ use crate::event::Metric; #[derive(Debug, Clone, Interface)] #[graphql( - field(name = "received_events_total", type = "Option"), - field(name = "sent_bytes_total", type = "Option"), - field(name = "sent_events_total", type = "Option") + field(name = "received_events_total", ty = "Option"), + field(name = "sent_bytes_total", ty = "Option"), + field(name = "sent_events_total", ty = "Option") )] pub enum SinkMetrics { GenericSinkMetrics(generic::GenericSinkMetrics), diff --git a/src/api/schema/metrics/source/mod.rs b/src/api/schema/metrics/source/mod.rs index 5463ac0ecf545..fe5c40ff6c346 100644 --- a/src/api/schema/metrics/source/mod.rs +++ b/src/api/schema/metrics/source/mod.rs @@ -8,9 +8,9 @@ use crate::event::Metric; #[derive(Debug, Clone, Interface)] #[graphql( - field(name = "received_bytes_total", type = "Option"), - field(name = "received_events_total", type = "Option"), - field(name = "sent_events_total", type = "Option") + field(name = "received_bytes_total", ty = "Option"), + field(name = "received_events_total", ty = "Option"), + field(name = "sent_events_total", ty = "Option") )] pub enum SourceMetrics { GenericSourceMetrics(generic::GenericSourceMetrics), diff --git a/src/api/schema/metrics/transform/mod.rs b/src/api/schema/metrics/transform/mod.rs index bfdc8a5a08b30..183a97907f592 100644 --- a/src/api/schema/metrics/transform/mod.rs +++ b/src/api/schema/metrics/transform/mod.rs @@ -7,8 +7,8 @@ use crate::event::Metric; #[derive(Debug, Clone, Interface)] #[graphql( - field(name = "received_events_total", type = "Option"), - field(name = "sent_events_total", type = "Option") + field(name = "received_events_total", ty = "Option"), + field(name = "sent_events_total", ty = "Option") )] pub enum TransformMetrics { GenericTransformMetrics(generic::GenericTransformMetrics),