From abd4f0121534309b74a2850fc1ed3fc93e1c5d43 Mon Sep 17 00:00:00 2001 From: Benno van den Berg Date: Fri, 29 Mar 2024 13:14:40 +0100 Subject: [PATCH] Update fiberplane/fiberplane --- Cargo.lock | 273 +++++++++++++++++++++++++++++++++----------------- Cargo.toml | 5 +- src/config.rs | 6 +- 3 files changed, 184 insertions(+), 100 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d3bf82c..4c9eee8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -195,7 +195,7 @@ checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64uuid" version = "1.1.0" -source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=main#d4a700d0c04f313cc05af8a35ee716ebcef9d0c1" +source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=updates_2024-03-15#da1493afddc3117521914a5989a56a2745959471" dependencies = [ "base64 0.13.1", "serde", @@ -834,15 +834,6 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if 1.0.0", -] - [[package]] name = "enum-iterator" version = "0.7.0" @@ -936,7 +927,7 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fiberplane" version = "1.0.0-beta.14" -source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=main#d4a700d0c04f313cc05af8a35ee716ebcef9d0c1" +source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=updates_2024-03-15#da1493afddc3117521914a5989a56a2745959471" dependencies = [ "base64uuid", "fiberplane-api-client", @@ -949,7 +940,7 @@ dependencies = [ [[package]] name = "fiberplane-api-client" version = "1.0.0-beta.13" -source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=main#d4a700d0c04f313cc05af8a35ee716ebcef9d0c1" +source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=updates_2024-03-15#da1493afddc3117521914a5989a56a2745959471" dependencies = [ "anyhow", "base64uuid", @@ -966,7 +957,7 @@ dependencies = [ [[package]] name = "fiberplane-markdown" version = "1.0.0-beta.13" -source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=main#d4a700d0c04f313cc05af8a35ee716ebcef9d0c1" +source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=updates_2024-03-15#da1493afddc3117521914a5989a56a2745959471" dependencies = [ "fiberplane-models", "pulldown-cmark", @@ -978,7 +969,7 @@ dependencies = [ [[package]] name = "fiberplane-models" version = "1.0.0-beta.13" -source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=main#d4a700d0c04f313cc05af8a35ee716ebcef9d0c1" +source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=updates_2024-03-15#da1493afddc3117521914a5989a56a2745959471" dependencies = [ "base64 0.13.1", "base64uuid", @@ -1002,7 +993,7 @@ dependencies = [ [[package]] name = "fiberplane-provider-runtime" version = "2.0.0-beta.13" -source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=main#d4a700d0c04f313cc05af8a35ee716ebcef9d0c1" +source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=updates_2024-03-15#da1493afddc3117521914a5989a56a2745959471" dependencies = [ "bytes", "fiberplane-models", @@ -1022,7 +1013,7 @@ dependencies = [ [[package]] name = "fiberplane-templates" version = "1.0.0-beta.14" -source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=main#d4a700d0c04f313cc05af8a35ee716ebcef9d0c1" +source = "git+ssh://git@github.com/fiberplane/fiberplane.git?branch=updates_2024-03-15#da1493afddc3117521914a5989a56a2745959471" dependencies = [ "base64uuid", "fiberplane-models", @@ -1107,8 +1098,9 @@ dependencies = [ "futures-util", "grok", "hex", + "http 1.1.0", "human-panic", - "hyper", + "hyper 0.14.27", "indicatif", "lazy_static", "memchr", @@ -1345,25 +1337,6 @@ dependencies = [ "onig", ] -[[package]] -name = "h2" -version = "0.3.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.1.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "hashbrown" version = "0.11.2" @@ -1426,6 +1399,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -1433,7 +1417,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" 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.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -1475,9 +1482,8 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -1489,18 +1495,60 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", - "http", - "hyper", + "http 1.1.0", + "hyper 1.2.0", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2321,6 +2369,26 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "pin-project-lite" version = "0.2.13" @@ -2643,21 +2711,21 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.22" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338" dependencies = [ "async-compression", "base64 0.21.5", "bytes", - "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", "hyper-rustls", + "hyper-util", "ipnet", "js-sys", "log", @@ -2668,10 +2736,11 @@ dependencies = [ "pin-project-lite", "rustls", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "system-configuration", + "sync_wrapper", "tokio", "tokio-rustls", "tokio-util", @@ -2796,14 +2865,16 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.9" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" dependencies = [ "log", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] @@ -2815,13 +2886,20 @@ dependencies = [ "base64 0.21.5", ] +[[package]] +name = "rustls-pki-types" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" + [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] @@ -2852,16 +2930,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "seahash" version = "4.1.0" @@ -3116,9 +3184,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -3177,6 +3245,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + [[package]] name = "syn" version = "1.0.109" @@ -3199,6 +3273,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "synstructure" version = "0.12.6" @@ -3226,27 +3306,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "system_error" version = "0.1.1" @@ -3480,11 +3539,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] @@ -3537,6 +3597,28 @@ dependencies = [ "winnow", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -4174,9 +4256,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "wezterm-bidi" diff --git a/Cargo.toml b/Cargo.toml index 67d0056..64803e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ cli-table = "0.4" crossterm = { version = "0.27.0", features = ["event-stream"] } directories = "5.0.1" dialoguer = { version = "0.11.0", features = ["fuzzy-select"] } -fiberplane = { version = "1.0.0-beta.11", features = [ +fiberplane = { version = "1.0.0-beta.14", features = [ "api-client", "base64uuid-creation", "clap", @@ -32,6 +32,7 @@ futures = "0.3" futures-util = "0.3.21" grok = "2.0.0" hex = "0.4.3" +http = "1.1" human-panic = "1.1.3" hyper = { version = "0.14.13", features = [ "http1", @@ -86,6 +87,6 @@ vergen = { version = "8.0.0", features = [ ] } [patch.crates-io] -fiberplane = { git = "ssh://git@github.com/fiberplane/fiberplane.git", branch = "main" } +fiberplane = { git = "ssh://git@github.com/fiberplane/fiberplane.git", branch = "updates_2024-03-15" } #fp-bindgen-support = { git = "ssh://git@github.com/fiberplane/fp-bindgen.git", branch = "release-3.0.0" } #fp-bindgen-macros = { git = "ssh://git@github.com/fiberplane/fp-bindgen.git", branch = "release-3.0.0" } diff --git a/src/config.rs b/src/config.rs index 0a3aefc..72f3134 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,9 +1,9 @@ +use crate::MANIFEST; use anyhow::{anyhow, Error, Result}; use directories::ProjectDirs; use fiberplane::api_client::clients::default_config; use fiberplane::api_client::ApiClient; -use hyper::http::HeaderValue; -use hyper::HeaderMap; +use http::{HeaderMap, HeaderValue}; use serde::{Deserialize, Serialize}; use std::io::ErrorKind; use std::path::PathBuf; @@ -11,8 +11,6 @@ use tokio::fs; use tracing::debug; use url::Url; -use crate::MANIFEST; - #[derive(Serialize, Deserialize, Debug)] pub struct Config { #[serde(skip)]