diff --git a/backend/Cargo.lock b/backend/Cargo.lock index eac63d51..dba6213b 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -262,9 +262,9 @@ version = "6.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "298a5d587d6e6fdb271bf56af2dc325a80eb291fd0fc979146584b9a05494a8c" dependencies = [ - "async-graphql-derive", - "async-graphql-parser", - "async-graphql-value", + "async-graphql-derive 6.0.11", + "async-graphql-parser 6.0.11", + "async-graphql-value 6.0.11", "async-stream", "async-trait", "base64 0.13.1", @@ -273,10 +273,10 @@ dependencies = [ "fnv", "futures-util", "handlebars", - "http", + "http 0.2.11", "indexmap 2.2.3", "mime", - "multer", + "multer 2.1.0", "num-traits", "once_cell", "pin-project-lite", @@ -292,15 +292,45 @@ dependencies = [ "uuid", ] +[[package]] +name = "async-graphql" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ba89a35adbed833e0d21db467093a087c3a07b497626009eae02cb36f060567" +dependencies = [ + "async-graphql-derive 7.0.2", + "async-graphql-parser 7.0.2", + "async-graphql-value 7.0.2", + "async-stream", + "async-trait", + "base64 0.21.7", + "bytes", + "fnv", + "futures-util", + "http 1.0.0", + "indexmap 2.2.3", + "mime", + "multer 3.0.0", + "num-traits", + "once_cell", + "pin-project-lite", + "regex", + "serde", + "serde_json", + "serde_urlencoded", + "static_assertions_next", + "thiserror", +] + [[package]] name = "async-graphql-axum" -version = "6.0.11" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a1c20a2059bffbc95130715b23435a05168c518fba9709c81fa2a38eed990c" +checksum = "74cb0d91622015797c94dbb862580ba5e89bfd4b9066ad7d8d9ac8e1ca5ab6f8" dependencies = [ - "async-graphql", + "async-graphql 7.0.2", "async-trait", - "axum", + "axum 0.7.4", "bytes", "futures-util", "serde_json", @@ -317,7 +347,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7f329c7eb9b646a72f70c9c4b516c70867d356ec46cb00dcac8ad343fd006b0" dependencies = [ "Inflector", - "async-graphql-parser", + "async-graphql-parser 6.0.11", + "darling", + "proc-macro-crate", + "proc-macro2", + "quote", + "strum", + "syn 2.0.49", + "thiserror", +] + +[[package]] +name = "async-graphql-derive" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9547f7f22688f022ea8001bdd57a1fce8996045dcb959b1730a79bafd366a9d9" +dependencies = [ + "Inflector", + "async-graphql-parser 7.0.2", "darling", "proc-macro-crate", "proc-macro2", @@ -333,7 +380,19 @@ version = "6.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6139181845757fd6a73fbb8839f3d036d7150b798db0e9bb3c6e83cdd65bd53b" dependencies = [ - "async-graphql-value", + "async-graphql-value 6.0.11", + "pest", + "serde", + "serde_json", +] + +[[package]] +name = "async-graphql-parser" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8e3d4cc5074c46adfee619b5b6cf817943332f772ed5930ed78871f7dbbac6" +dependencies = [ + "async-graphql-value 7.0.2", "pest", "serde", "serde_json", @@ -351,6 +410,18 @@ dependencies = [ "serde_json", ] +[[package]] +name = "async-graphql-value" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53ff1287a1283ea772b4099dd556ba4577d35f069ea4a93f337a525beefcfacf" +dependencies = [ + "bytes", + "indexmap 2.2.3", + "serde", + "serde_json", +] + [[package]] name = "async-io" version = "1.13.0" @@ -527,8 +598,8 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "lazy_static", "percent-encoding", "pin-project-lite", @@ -551,7 +622,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "fastrand 2.0.1", - "http", + "http 0.2.11", "percent-encoding", "tracing", "uuid", @@ -579,8 +650,8 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "once_cell", "percent-encoding", "regex", @@ -601,7 +672,7 @@ dependencies = [ "form_urlencoded", "hex", "hmac", - "http", + "http 0.2.11", "once_cell", "percent-encoding", "regex", @@ -634,8 +705,8 @@ dependencies = [ "crc32c", "crc32fast", "hex", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "md-5", "pin-project-lite", "sha1", @@ -655,9 +726,9 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand 2.0.1", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls", "lazy_static", "pin-project-lite", @@ -689,9 +760,9 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "once_cell", "percent-encoding", "pin-project-lite", @@ -710,8 +781,8 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "pin-project-lite", "tower", "tracing", @@ -739,8 +810,8 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand 2.0.1", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "once_cell", "pin-project-lite", "pin-utils", @@ -758,7 +829,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes", - "http", + "http 0.2.11", "tokio", "tracing", ] @@ -797,7 +868,7 @@ dependencies = [ "aws-smithy-client", "aws-smithy-http", "aws-smithy-types", - "http", + "http 0.2.11", "rustc_version", "tracing", ] @@ -809,16 +880,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.3.4", "axum-macros", "base64 0.21.7", "bitflags 1.3.2", "bytes", "futures-util", "headers", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "sync_wrapper", + "tokio", + "tokio-tungstenite 0.20.1", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" +dependencies = [ + "async-trait", + "axum-core 0.4.3", + "base64 0.21.7", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.1.0", + "hyper-util", "itoa", "matchit", "memchr", @@ -833,10 +940,11 @@ dependencies = [ "sha1", "sync_wrapper", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.21.0", "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -848,14 +956,35 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", "tower-service", ] +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "axum-macros" version = "0.3.8" @@ -1237,8 +1366,8 @@ dependencies = [ name = "compound_library" version = "0.1.0" dependencies = [ - "async-graphql", - "axum", + "async-graphql 6.0.11", + "axum 0.6.20", "chrono", "clap 4.5.1", "dotenvy", @@ -1899,9 +2028,9 @@ dependencies = [ name = "graphql_endpoints" version = "0.1.0" dependencies = [ - "async-graphql", + "async-graphql 6.0.11", "async-graphql-axum", - "axum", + "axum 0.6.20", "futures-core", "opa_client", "tower-service", @@ -1912,7 +2041,7 @@ dependencies = [ name = "graphql_event_broker" version = "0.1.0" dependencies = [ - "async-graphql", + "async-graphql 6.0.11", "once_cell", "tokio", "tokio-stream", @@ -1929,7 +2058,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", + "indexmap 2.2.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", "indexmap 2.2.3", "slab", "tokio", @@ -1985,7 +2133,7 @@ dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http", + "http 0.2.11", "httpdate", "mime", "sha1", @@ -1997,7 +2145,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.11", ] [[package]] @@ -2059,6 +2207,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -2066,7 +2225,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -2092,9 +2274,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.24", + "http 0.2.11", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -2106,6 +2288,25 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.2", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "tokio", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -2113,8 +2314,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "log", "rustls 0.21.10", "rustls-native-certs", @@ -2129,12 +2330,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.28", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.1.0", + "pin-project-lite", + "socket2 0.5.5", + "tokio", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -2525,7 +2742,25 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http", + "http 0.2.11", + "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", + "encoding_rs", + "futures-util", + "http 1.0.0", "httparse", "log", "memchr", @@ -2647,7 +2882,7 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" name = "opa_client" version = "0.1.0" dependencies = [ - "async-graphql", + "async-graphql 6.0.11", "derive_more", "reqwest", "serde", @@ -3029,8 +3264,8 @@ name = "pin_packing" version = "0.1.0" dependencies = [ "anyhow", - "async-graphql", - "axum", + "async-graphql 6.0.11", + "axum 0.6.20", "chrono", "clap 4.5.1", "dotenvy", @@ -3348,10 +3583,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.24", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-tls", "ipnet", "js-sys", @@ -3894,8 +4129,8 @@ dependencies = [ name = "soakdb_sync" version = "0.1.0" dependencies = [ - "async-graphql", - "axum", + "async-graphql 6.0.11", + "axum 0.6.20", "chrono", "clap 4.5.1", "derive_more", @@ -4058,6 +4293,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "static_assertions_next" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7beae5182595e9a8b683fa98c4317f956c9a2dec3b9716990d20023cc60c766" + [[package]] name = "stringprep" version = "0.1.4" @@ -4174,10 +4415,10 @@ name = "targeting" version = "0.1.0" dependencies = [ "anyhow", - "async-graphql", + "async-graphql 6.0.11", "aws-credential-types", "aws-sdk-s3", - "axum", + "axum 0.6.20", "chrono", "clap 4.5.1", "derive_more", @@ -4229,7 +4470,7 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" name = "the_paginator" version = "0.1.0" dependencies = [ - "async-graphql", + "async-graphql 6.0.11", "async-trait", "sea-orm", "serde", @@ -4395,6 +4636,18 @@ dependencies = [ "tungstenite 0.20.1", ] +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.21.0", +] + [[package]] name = "tokio-util" version = "0.7.10" @@ -4544,7 +4797,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.11", "httparse", "log", "rand", @@ -4563,7 +4816,26 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.11", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.0.0", "httparse", "log", "rand", diff --git a/backend/graphql_endpoints/Cargo.toml b/backend/graphql_endpoints/Cargo.toml index 2d27b087..04ae1aa1 100644 --- a/backend/graphql_endpoints/Cargo.toml +++ b/backend/graphql_endpoints/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] async-graphql = { workspace = true } -async-graphql-axum = { version = "6.0.11" } +async-graphql-axum = { version = "7.0.2" } axum = { workspace = true } futures-core = { version = "0.3.30" } opa_client = { path = "../opa_client" }