upgrade deps

Author: jondot

Cargo.lock

@@ -17,28 +17,28 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
 serde_derive = { workspace = true }
-fs-err = "2.9.0"
+fs-err = "3.2.2"
 eyre = "0.6.8"
 thiserror = { workspace = true }
 tokio = { workspace = true }
 # async-trait = "*"
 tracing = "^0.1.34"
-tracing-tree = { version = "0.2.1" }
+tracing-tree = { version = "0.4.1" }
 tracing-subscriber = { version = "^0.3.11", features = ["env-filter"] }
 strum = { workspace = true }
 proc-macro2 = "1.0.63"                                                  # Remove once https://github.com/rust-lang/rust/issues/113152 is fixed.
 clap = { version = "4.3.0", features = ["cargo", "derive"] }
 exitcode = { version = "^1.1.2" }
-console = { version = "0.15.8" }
+console = { version = "0.16.2" }
 comfy-table = { version = "7.1.1" }
-dialoguer = { version = "0.11.0" }
+dialoguer = { version = "0.12.0" }
 teller-providers = { workspace = true }
 teller-core = { workspace = true }
 
 [dev-dependencies]
 insta = { workspace = true }
 dockertest-server = { version = "0.1.7", features = ["hashi", "cloud"] }
-trycmd = "0.14.10"
+trycmd = "0.15.11"
 
 [[bin]]
 name = "teller"

teller-cli/Cargo.toml

@@ -19,11 +19,11 @@ serde_variant = { workspace = true }
 lazy_static = { workspace = true }
 strum = { workspace = true }
 shell-words = "1"
-duct = "0.13.6"
+duct = "1.1.1"
 thiserror = { workspace = true }
-fs-err = "2.9.0"
+fs-err = "3.2.2"
 ignore = "0.4.22"
-unicode-width = "0.1.12"
+unicode-width = "0.2.2"
 aho-corasick = { workspace = true }
 tera = { workspace = true }
 csv = "1.2.1"

teller-core/Cargo.toml

@@ -119,8 +119,8 @@ mod tests {
         assert_eq!(get_visual_position(b"", 0), None);
         assert_eq!(get_visual_position(b"a", 1), None);
 
-        assert_eq!(get_visual_position(b"abcde\nfghi", 8), Some((2, 3)));
-        assert_eq!(get_visual_position(b"abcde\r\nfghi", 8), Some((2, 2)));
+        assert_eq!(get_visual_position(b"abcde\nfghi", 8), Some((2, 4)));
+        assert_eq!(get_visual_position(b"abcde\r\nfghi", 8), Some((2, 3)));
 
         let text = r#" 100% ❯ j teller-rs
     /Users/jondot/spikes/teller-rs
@@ -137,7 +137,7 @@ mod tests {
     ~/spikes/teller-rs on  master [!?] via 🦀 v1.73.0-nightly
      100% ❯"#;
         let position = get_visual_position(text.as_bytes(), 438);
-        assert_eq!(position, Some((11, 19)));
+        assert_eq!(position, Some((11, 20)));
     }
 
     #[test]

teller-core/src/scan.rs

@@ -1,14 +1,14 @@
 ---
 source: teller-core/src/scan.rs
-expression: normalize_matches(res.unwrap())
+expression: normalize_matches(&res.unwrap())
 ---
 [
     Match {
         path: "fixtures/config.yml",
         position: Some(
             (
                 3,
-                11,
+                12,
             ),
         ),
         offset: 32,

teller-core/src/snapshots/teller_core__scan__tests__scan-2.snap

@@ -1,6 +1,6 @@
 ---
 source: teller-core/src/scan.rs
-expression: normalize_matches(res.unwrap())
+expression: normalize_matches(&res.unwrap())
 ---
 [
     Match {
@@ -36,7 +36,7 @@ expression: normalize_matches(res.unwrap())
         position: Some(
             (
                 3,
-                11,
+                12,
             ),
         ),
         offset: 32,

teller-core/src/snapshots/teller_core__scan__tests__scan-3.snap

@@ -1,14 +1,14 @@
 ---
 source: teller-core/src/scan.rs
-expression: normalize_matches(res.unwrap())
+expression: normalize_matches(&res.unwrap())
 ---
 [
     Match {
         path: "fixtures/config.yml",
         position: Some(
             (
                 3,
-                11,
+                12,
             ),
         ),
         offset: 32,

teller-core/src/snapshots/teller_core__scan__tests__scan.snap

@@ -42,9 +42,10 @@ serde_yaml = { workspace = true }
 serde_derive = { workspace = true }
 strum = { workspace = true }
 thiserror = { workspace = true }
+hyper-util = { version = "0.1", features = ["client-legacy"] }
 fs-err = "3"
 home = "0.5"
-hyper = "0.14"
+hyper = "1.8.1"
 tokio = "1"
 # gcp
 google-secretmanager1 = { version = "5.0", optional = true }
@@ -61,13 +62,13 @@ dotenvy = { version = "0.15.7", optional = true }
 vaultrs = { version = "0.7.4", optional = true }
 rustify = { version = "0.6.1", optional = true }
 # HashiCorp Consul
-rs-consul = { version = "0.6", optional = true }
+rs-consul = { version = "0.13.0", optional = true }
 
-etcd-client = { version = "0.15", optional = true }
+etcd-client = { version = "0.18.0", optional = true }
 
 [dev-dependencies]
 insta = { workspace = true }
 dockertest-server = { version = "0.1.7", features = ["hashi", "cloud"] }
-dockertest = "0.3"
+dockertest = "0.3.0"
 tokio = { workspace = true }
 test-log = "0.2"

teller-providers/Cargo.toml

@@ -94,8 +94,9 @@ impl HashiCorpConsul {
             consul: Consul::new(rs_consul::Config {
                 address,
                 token: Some(token),
-                #[allow(clippy::default_trait_access)]
-                hyper_builder: Default::default(),
+                hyper_builder: hyper_util::client::legacy::Client::builder(
+                    hyper_util::rt::TokioExecutor::new(),
+                ),
             }),
             opts,
             name: name.to_string(),
@@ -125,7 +126,7 @@ impl Provider for HashiCorpConsul {
             .map_err(|e| to_err(pm, e))?;
 
         let mut results = vec![];
-        for kv_pair in res {
+        for kv_pair in res.response {
             let val = kv_pair.value.ok_or_else(|| Error::NotFound {
                 path: pm.path.to_string(),
                 msg: "value not found".to_string(),
@@ -170,6 +171,7 @@ impl Provider for HashiCorpConsul {
                 })
                 .await
                 .map_err(|e| to_err(pm, e))?
+                .response
                 .iter()
                 .map(|resp| resp.key.clone())
                 .collect::<Vec<_>>()
@@ -180,10 +182,10 @@ impl Provider for HashiCorpConsul {
                 .collect::<Vec<_>>()
         };
 
-        for key in keys {
+        for key in &keys {
             self.consul
                 .delete_key(rs_consul::DeleteKeyRequest {
-                    key: &key,
+                    key,
                     datacenter: &self.opts.dc.clone().unwrap_or_default(),
                     ..Default::default()
                 })