diff --git a/Cargo.lock b/Cargo.lock index c584218..5779bc1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,7 +65,7 @@ name = "amp-client" version = "0.8.0" source = "git+https://github.com/amphitheatre-app/amp-client-rust?tag=v0.8.0#33787548091b299ec12ca89b05651fb3860818ec" dependencies = [ - "amp-common", + "amp-common 0.8.0", "futures", "reqwest-eventsource", "serde", @@ -85,8 +85,8 @@ dependencies = [ "data-encoding", "dirs", "json_comments", - "k8s-openapi", - "kube", + "k8s-openapi 0.21.1", + "kube 0.89.0", "notify", "oci-distribution", "schemars", @@ -98,7 +98,35 @@ dependencies = [ "ureq", "url", "utoipa", - "validator", + "validator 0.17.0", +] + +[[package]] +name = "amp-common" +version = "0.8.3" +source = "git+https://github.com/amphitheatre-app/common?tag=v0.8.3#9c59e1ed87e2ce67aa10cad6f464b35c823de656" +dependencies = [ + "anyhow", + "chrono", + "confy", + "convert_case", + "data-encoding", + "dirs", + "json_comments", + "k8s-openapi 0.22.0", + "kube 0.91.0", + "notify", + "oci-distribution", + "schemars", + "serde", + "serde_json", + "thiserror", + "toml", + "tracing", + "ureq", + "url", + "utoipa", + "validator 0.18.1", ] [[package]] @@ -179,6 +207,18 @@ dependencies = [ "derive_arbitrary", ] +[[package]] +name = "async-broadcast" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +dependencies = [ + "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-compression" version = "0.4.6" @@ -195,6 +235,28 @@ dependencies = [ "zstd-safe", ] +[[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.48", +] + [[package]] name = "async-trait" version = "0.1.77" @@ -448,6 +510,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "confy" version = "0.6.1" @@ -686,6 +757,27 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "event-listener" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "eventsource-stream" version = "0.2.3" @@ -1078,11 +1170,30 @@ dependencies = [ "hyper", "hyper-util", "log", - "rustls", + "rustls 0.22.3", "rustls-native-certs", "rustls-pki-types", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", + "tower-service", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "908bb38696d7a037a01ebcc68a00634112ac2bbf8ca74e30a2c3d2f4f021302b" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "log", + "rustls 0.23.5", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", "tower-service", ] @@ -1326,6 +1437,20 @@ dependencies = [ "serde_json", ] +[[package]] +name = "k8s-openapi" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19501afb943ae5806548bc3ebd7f3374153ca057a38f480ef30adfde5ef09755" +dependencies = [ + "base64 0.22.0", + "chrono", + "schemars", + "serde", + "serde-value", + "serde_json", +] + [[package]] name = "kqueue" version = "1.0.8" @@ -1352,11 +1477,24 @@ version = "0.89.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92cd10d00ad38b2f72a5223cd8f2827968466a5d32ae89672d2b0df06488c499" dependencies = [ - "k8s-openapi", - "kube-client", - "kube-core", - "kube-derive", - "kube-runtime", + "k8s-openapi 0.21.1", + "kube-client 0.89.0", + "kube-core 0.89.0", + "kube-derive 0.89.0", + "kube-runtime 0.89.0", +] + +[[package]] +name = "kube" +version = "0.91.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "264461a7ebf4fb0fcf23e4c7e4f9387c5696ee61d003de207d9b5a895ff37bfa" +dependencies = [ + "k8s-openapi 0.22.0", + "kube-client 0.91.0", + "kube-core 0.91.0", + "kube-derive 0.91.0", + "kube-runtime 0.91.0", ] [[package]] @@ -1375,15 +1513,52 @@ dependencies = [ "http-body", "http-body-util", "hyper", - "hyper-rustls", + "hyper-rustls 0.26.0", "hyper-timeout", "hyper-util", "jsonpath-rust", - "k8s-openapi", - "kube-core", + "k8s-openapi 0.21.1", + "kube-core 0.89.0", "pem", "pin-project", - "rustls", + "rustls 0.22.3", + "rustls-pemfile 2.1.1", + "secrecy", + "serde", + "serde_json", + "serde_yaml", + "thiserror", + "tokio", + "tokio-util", + "tower", + "tower-http", + "tracing", +] + +[[package]] +name = "kube-client" +version = "0.91.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47164ad6c47398ee4bdf90509c7b44026229721cb1377eb4623a1ec2a00a85e9" +dependencies = [ + "base64 0.22.0", + "bytes", + "chrono", + "either", + "futures", + "home", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls 0.27.1", + "hyper-timeout", + "hyper-util", + "jsonpath-rust", + "k8s-openapi 0.22.0", + "kube-core 0.91.0", + "pem", + "rustls 0.23.5", "rustls-pemfile 2.1.1", "secrecy", "serde", @@ -1407,7 +1582,7 @@ dependencies = [ "form_urlencoded", "http", "json-patch", - "k8s-openapi", + "k8s-openapi 0.21.1", "once_cell", "schemars", "serde", @@ -1415,6 +1590,23 @@ dependencies = [ "thiserror", ] +[[package]] +name = "kube-core" +version = "0.91.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2797d3044a238825432129cd9537e12c2a6dacbbb5352381af5ea55e1505ed4f" +dependencies = [ + "chrono", + "form_urlencoded", + "http", + "json-patch", + "k8s-openapi 0.22.0", + "schemars", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "kube-derive" version = "0.89.0" @@ -1428,6 +1620,19 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "kube-derive" +version = "0.91.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf837edaa0c478f85e9a3cddb17fa80d58a57c1afa722b3a9e55753ea162f41" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "serde_json", + "syn 2.0.48", +] + [[package]] name = "kube-runtime" version = "0.89.0" @@ -1441,8 +1646,36 @@ dependencies = [ "futures", "hashbrown 0.14.3", "json-patch", - "k8s-openapi", - "kube-client", + "k8s-openapi 0.21.1", + "kube-client 0.89.0", + "parking_lot", + "pin-project", + "serde", + "serde_json", + "smallvec", + "thiserror", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "kube-runtime" +version = "0.91.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e463e89a1fb222c65a5469b568803153d1bf13d084a8dd42b659e6cca66edc6e" +dependencies = [ + "ahash", + "async-broadcast", + "async-stream", + "async-trait", + "backoff", + "derivative", + "futures", + "hashbrown 0.14.3", + "json-patch", + "k8s-openapi 0.22.0", + "kube-client 0.91.0", "parking_lot", "pin-project", "serde", @@ -1776,6 +2009,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + [[package]] name = "parking_lot" version = "0.12.1" @@ -1903,7 +2142,7 @@ name = "playground-api" version = "0.3.0" dependencies = [ "amp-client", - "amp-common", + "amp-common 0.8.3", "anyhow", "axum", "chrono", @@ -2096,7 +2335,7 @@ dependencies = [ "http-body", "http-body-util", "hyper", - "hyper-rustls", + "hyper-rustls 0.26.0", "hyper-tls", "hyper-util", "ipnet", @@ -2107,7 +2346,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.22.3", "rustls-pemfile 1.0.4", "rustls-pki-types", "serde", @@ -2117,7 +2356,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.25.0", "tokio-util", "tower-service", "url", @@ -2226,6 +2465,21 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls" +version = "0.23.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afabcee0551bd1aa3e18e5adbf2c0544722014b899adb31bd186ec638d3da97e" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.7.0" @@ -2711,7 +2965,18 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls", + "rustls 0.22.3", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.5", "rustls-pki-types", "tokio", ] @@ -2998,7 +3263,7 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls", + "rustls 0.22.3", "rustls-pki-types", "rustls-webpki", "serde", @@ -3103,7 +3368,23 @@ dependencies = [ "serde_derive", "serde_json", "url", - "validator_derive", + "validator_derive 0.17.0", +] + +[[package]] +name = "validator" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e" +dependencies = [ + "idna", + "once_cell", + "regex", + "serde", + "serde_derive", + "serde_json", + "url", + "validator_derive 0.18.1", ] [[package]] @@ -3120,6 +3401,20 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "validator_derive" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55591299b7007f551ed1eb79a684af7672c19c3193fb9e0a31936987bb2438ec" +dependencies = [ + "darling", + "once_cell", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "valuable" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 3bfeaf3..f323571 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ path = "src/lib.rs" [dependencies] amp-client = { git = "https://github.com/amphitheatre-app/amp-client-rust", tag = "v0.8.0" } -amp-common = { git = "https://github.com/amphitheatre-app/common", tag = "v0.8.0" } +amp-common = { git = "https://github.com/amphitheatre-app/common", tag = "v0.8.3" } anyhow = "1.0.83" axum = { version = "0.7.5" } clap = { version = "4.5.4", features = ["derive", "env"] }