chore: reduce duplicate or unused cargo deps (#6630)
Signed-off-by: Adrian Cole <adrian@tetrate.io>
This commit is contained in:
@@ -18,17 +18,16 @@ anyhow = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
tokio-util = { version = "0.7.15", features = ["compat", "rt"] }
|
||||
tracing = { workspace = true }
|
||||
url = "2.5"
|
||||
serde_json = { workspace = true }
|
||||
futures = { workspace = true }
|
||||
regex = { workspace = true }
|
||||
fs-err = "3"
|
||||
url = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
assert-json-diff = "2.0.2"
|
||||
wiremock = { workspace = true }
|
||||
tempfile = "3"
|
||||
test-case = "3.3"
|
||||
test-case = { workspace = true }
|
||||
axum = "0.8"
|
||||
tower-http = { version = "0.6", features = ["cors", "fs", "auth"] }
|
||||
rmcp = { workspace = true, features = ["transport-streamable-http-server"] }
|
||||
|
||||
@@ -42,12 +42,12 @@ tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt", "json",
|
||||
tracing-appender = "0.2"
|
||||
shlex = "1.3.0"
|
||||
async-trait = "0.1.89"
|
||||
base64 = "0.22.1"
|
||||
base64 = { workspace = true }
|
||||
regex = "1.11.1"
|
||||
tar = "0.4"
|
||||
# Web server dependencies
|
||||
axum = { version = "0.8.1", features = ["ws", "macros"] }
|
||||
tower-http = { version = "0.5", features = ["cors", "fs", "auth"] }
|
||||
tower-http = { workspace = true, features = ["cors", "fs", "auth"] }
|
||||
http = "1.0"
|
||||
webbrowser = {workspace = true}
|
||||
indicatif = "0.18.1"
|
||||
@@ -66,7 +66,4 @@ disable-update = []
|
||||
|
||||
[dev-dependencies]
|
||||
tempfile = "3"
|
||||
temp-env = { version = "0.3.6", features = ["async_closure"] }
|
||||
test-case = "3.3"
|
||||
tokio = { workspace = true }
|
||||
serial_test = { workspace = true }
|
||||
|
||||
@@ -18,18 +18,15 @@ tokio-stream = { version = "0.1", features = ["io-util"] }
|
||||
tracing = { workspace = true }
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
tracing-appender = "0.2"
|
||||
url = "2.5"
|
||||
base64 = "0.21"
|
||||
url = { workspace = true }
|
||||
base64 = { workspace = true }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = { workspace = true }
|
||||
schemars = "1.0"
|
||||
shellexpand = "3.1.0"
|
||||
indoc = "2.0.5"
|
||||
xcap = "=0.4.0"
|
||||
reqwest = { version = "0.11", features = [
|
||||
"json",
|
||||
"rustls-tls-native-roots",
|
||||
], default-features = false }
|
||||
reqwest = { workspace = true, features = ["json", "rustls-tls-native-roots"], default-features = false }
|
||||
chrono = { version = "0.4.38", features = ["serde"] }
|
||||
etcetera = { workspace = true }
|
||||
tempfile = "3.8"
|
||||
@@ -41,7 +38,6 @@ lopdf = "0.36.0"
|
||||
docx-rs = "0.4.7"
|
||||
image = "0.24.9"
|
||||
umya-spreadsheet = "2.2.3"
|
||||
utoipa = { version = "4.1", optional = true }
|
||||
which = {workspace = true}
|
||||
lru = "0.16"
|
||||
tree-sitter = "0.21"
|
||||
@@ -62,10 +58,6 @@ mpatch = "=0.2.0"
|
||||
tokio-util = "0.7.16"
|
||||
|
||||
[dev-dependencies]
|
||||
sysinfo = "0.32.1"
|
||||
temp-env = "0.3.6"
|
||||
colored = "2"
|
||||
serial_test = { workspace = true }
|
||||
|
||||
[features]
|
||||
utoipa = ["dep:utoipa"]
|
||||
|
||||
@@ -17,7 +17,7 @@ rmcp = { workspace = true }
|
||||
axum = { version = "0.8.1", features = ["ws", "macros"] }
|
||||
tokio = { workspace = true }
|
||||
chrono = "0.4"
|
||||
tower-http = { version = "0.5", features = ["cors"] }
|
||||
tower-http = { workspace = true, features = ["cors"] }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = { workspace = true, features = ["preserve_order"] }
|
||||
futures = { workspace = true }
|
||||
@@ -28,17 +28,17 @@ tokio-stream = "0.1"
|
||||
anyhow = { workspace = true }
|
||||
bytes = "1.5"
|
||||
http = "1.0"
|
||||
base64 = "0.21"
|
||||
base64 = { workspace = true }
|
||||
config = { version = "0.15.13", features = ["toml"] }
|
||||
thiserror = "1.0"
|
||||
clap = { version = "4.4", features = ["derive"] }
|
||||
serde_yaml = "0.9.34"
|
||||
utoipa = { version = "4.1", features = ["axum_extras", "chrono"] }
|
||||
reqwest = { version = "0.12.9", features = ["json", "rustls-tls", "blocking", "multipart"], default-features = false }
|
||||
reqwest = { workspace = true, features = ["json", "rustls-tls", "blocking", "multipart"], default-features = false }
|
||||
tokio-util = "0.7.15"
|
||||
serde_path_to_error = "0.1.20"
|
||||
tokio-tungstenite = { version = "0.28.0", features = ["rustls-tls-native-roots"] }
|
||||
url = "2.5.7"
|
||||
url = { workspace = true }
|
||||
rand = "0.9.2"
|
||||
hex = "0.4.3"
|
||||
socket2 = "0.6.1"
|
||||
@@ -58,8 +58,6 @@ name = "generate_schema"
|
||||
path = "src/bin/generate_schema.rs"
|
||||
|
||||
[dev-dependencies]
|
||||
tower = "0.5"
|
||||
async-trait = "0.1.89"
|
||||
tempfile = "3.15.0"
|
||||
tower = { workspace = true }
|
||||
env-lock = { workspace = true }
|
||||
wiremock = { workspace = true }
|
||||
|
||||
+5
-20
@@ -12,7 +12,7 @@ workspace = true
|
||||
|
||||
[build-dependencies]
|
||||
tokio = { workspace = true }
|
||||
reqwest = { version = "0.12.9", features = ["json", "rustls-tls-native-roots"], default-features = false }
|
||||
reqwest = { workspace = true, features = ["json", "rustls-tls-native-roots"], default-features = false }
|
||||
|
||||
[dependencies]
|
||||
lru = "0.16"
|
||||
@@ -27,19 +27,7 @@ anyhow = { workspace = true }
|
||||
thiserror = "1.0"
|
||||
futures = { workspace = true }
|
||||
dirs = "5.0"
|
||||
reqwest = { version = "0.12.9", features = [
|
||||
"rustls-tls-native-roots",
|
||||
"json",
|
||||
"cookies",
|
||||
"gzip",
|
||||
"brotli",
|
||||
"deflate",
|
||||
"zstd",
|
||||
"charset",
|
||||
"http2",
|
||||
"stream",
|
||||
"blocking"
|
||||
], default-features = false }
|
||||
reqwest = { workspace = true, features = ["rustls-tls-native-roots", "json", "cookies", "gzip", "brotli", "deflate", "zstd", "charset", "http2", "stream", "blocking"], default-features = false }
|
||||
tokio = { workspace = true }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = { workspace = true }
|
||||
@@ -57,8 +45,8 @@ clap = { version = "4.4", features = ["derive"] }
|
||||
indoc = "2.0.5"
|
||||
nanoid = "0.4"
|
||||
sha2 = "0.10"
|
||||
base64 = "0.21"
|
||||
url = "2.5"
|
||||
base64 = { workspace = true }
|
||||
url = { workspace = true }
|
||||
axum = "0.8.1"
|
||||
webbrowser = {workspace = true}
|
||||
lazy_static = "1.5.0"
|
||||
@@ -118,17 +106,14 @@ unbinder = "0.1.7"
|
||||
winapi = { version = "0.3", features = ["wincred"] }
|
||||
|
||||
[dev-dependencies]
|
||||
agent-client-protocol-schema = "0.10.5"
|
||||
criterion = "0.5"
|
||||
serial_test = { workspace = true }
|
||||
mockall = "0.13.1"
|
||||
wiremock = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
tokio-util = { version = "0.7.15", features = ["compat"] }
|
||||
temp-env = "0.3.6"
|
||||
dotenvy = "0.15.7"
|
||||
ctor = "0.2.9"
|
||||
test-case = "3.3"
|
||||
test-case = { workspace = true }
|
||||
env-lock = { workspace = true }
|
||||
rmcp = { workspace = true, features = ["transport-streamable-http-server"] }
|
||||
|
||||
|
||||
@@ -1630,55 +1630,46 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn get_secrets_primary_from_env_uses_env_for_secondary() {
|
||||
temp_env::with_vars(
|
||||
[
|
||||
("TEST_PRIMARY", Some("primary_env")),
|
||||
("TEST_SECONDARY", Some("secondary_env")),
|
||||
],
|
||||
|| {
|
||||
let config = new_test_config();
|
||||
let secrets = config
|
||||
.get_secrets("TEST_PRIMARY", &["TEST_SECONDARY"])
|
||||
.unwrap();
|
||||
let _guard = env_lock::lock_env([
|
||||
("TEST_PRIMARY", Some("primary_env")),
|
||||
("TEST_SECONDARY", Some("secondary_env")),
|
||||
]);
|
||||
let config = new_test_config();
|
||||
let secrets = config
|
||||
.get_secrets("TEST_PRIMARY", &["TEST_SECONDARY"])
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(secrets["TEST_PRIMARY"], "primary_env");
|
||||
assert_eq!(secrets["TEST_SECONDARY"], "secondary_env");
|
||||
},
|
||||
);
|
||||
assert_eq!(secrets["TEST_PRIMARY"], "primary_env");
|
||||
assert_eq!(secrets["TEST_SECONDARY"], "secondary_env");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn get_secrets_primary_from_secret_uses_secret_for_secondary() {
|
||||
temp_env::with_vars(
|
||||
[("TEST_PRIMARY", None::<&str>), ("TEST_SECONDARY", None)],
|
||||
|| {
|
||||
let config = new_test_config();
|
||||
config
|
||||
.set_secret("TEST_PRIMARY", &"primary_secret")
|
||||
.unwrap();
|
||||
config
|
||||
.set_secret("TEST_SECONDARY", &"secondary_secret")
|
||||
.unwrap();
|
||||
let _guard = env_lock::lock_env([("TEST_PRIMARY", None::<&str>), ("TEST_SECONDARY", None)]);
|
||||
let config = new_test_config();
|
||||
config
|
||||
.set_secret("TEST_PRIMARY", &"primary_secret")
|
||||
.unwrap();
|
||||
config
|
||||
.set_secret("TEST_SECONDARY", &"secondary_secret")
|
||||
.unwrap();
|
||||
|
||||
let secrets = config
|
||||
.get_secrets("TEST_PRIMARY", &["TEST_SECONDARY"])
|
||||
.unwrap();
|
||||
let secrets = config
|
||||
.get_secrets("TEST_PRIMARY", &["TEST_SECONDARY"])
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(secrets["TEST_PRIMARY"], "primary_secret");
|
||||
assert_eq!(secrets["TEST_SECONDARY"], "secondary_secret");
|
||||
},
|
||||
);
|
||||
assert_eq!(secrets["TEST_PRIMARY"], "primary_secret");
|
||||
assert_eq!(secrets["TEST_SECONDARY"], "secondary_secret");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn get_secrets_primary_missing_returns_error() {
|
||||
temp_env::with_vars([("TEST_PRIMARY", None::<&str>)], || {
|
||||
let config = new_test_config();
|
||||
let _guard = env_lock::lock_env([("TEST_PRIMARY", None::<&str>)]);
|
||||
let config = new_test_config();
|
||||
|
||||
let result = config.get_secrets("TEST_PRIMARY", &[]);
|
||||
let result = config.get_secrets("TEST_PRIMARY", &[]);
|
||||
|
||||
assert!(matches!(result, Err(ConfigError::NotFound(_))));
|
||||
});
|
||||
assert!(matches!(result, Err(ConfigError::NotFound(_))));
|
||||
}
|
||||
|
||||
fn new_test_config() -> Config {
|
||||
|
||||
Reference in New Issue
Block a user