From f6a7269402567e5214fd0e6b0a1a2ef86d07d2bf Mon Sep 17 00:00:00 2001 From: Bas Zalmstra Date: Fri, 16 Aug 2024 16:57:21 +0200 Subject: [PATCH] chore: bump keyring to 3.x to bump syn to 2.x (#823) --- .github/workflows/rust-compile.yml | 2 +- Cargo.toml | 2 +- crates/rattler_networking/Cargo.toml | 2 +- crates/rattler_networking/src/authentication_middleware.rs | 6 +++--- .../src/authentication_storage/backends/keyring.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/rust-compile.yml b/.github/workflows/rust-compile.yml index 9837c2ae8..a50dd078f 100644 --- a/.github/workflows/rust-compile.yml +++ b/.github/workflows/rust-compile.yml @@ -22,7 +22,7 @@ env: RUST_BACKTRACE: 1 RUSTFLAGS: "-D warnings" CARGO_TERM_COLOR: always - DEFAULT_FEATURES: tokio,serde,reqwest,sparse,sysinfo,resolvo,gateway + DEFAULT_FEATURES: indicatif,tokio,serde,wasm,reqwest,sparse,gateway,resolvo,libsolv_c jobs: check-rustdoc-links: diff --git a/Cargo.toml b/Cargo.toml index e3775ed7a..3d50a39f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,7 +79,7 @@ indicatif = "0.17.8" insta = { version = "1.38.0" } itertools = "0.13.0" json-patch = "2.0.0" -keyring = "2.3.2" +keyring = "3.1.0" lazy-regex = "3.1.0" lazy_static = "1.4.0" libc = { version = "0.2" } diff --git a/crates/rattler_networking/Cargo.toml b/crates/rattler_networking/Cargo.toml index 24044ff1b..fdf0eab8f 100644 --- a/crates/rattler_networking/Cargo.toml +++ b/crates/rattler_networking/Cargo.toml @@ -25,7 +25,7 @@ fslock = { workspace = true } google-cloud-auth = { workspace = true, optional = true } http = { workspace = true } itertools = { workspace = true } -keyring = { workspace = true } +keyring = { workspace = true, features = ["apple-native", "windows-native", "async-secret-service", "async-io", "crypto-rust"] } netrc-rs = { workspace = true } reqwest = { workspace = true, features = ["json"] } reqwest-middleware = { workspace = true } diff --git a/crates/rattler_networking/src/authentication_middleware.rs b/crates/rattler_networking/src/authentication_middleware.rs index 0f24159da..25e2a3af4 100644 --- a/crates/rattler_networking/src/authentication_middleware.rs +++ b/crates/rattler_networking/src/authentication_middleware.rs @@ -200,7 +200,7 @@ mod tests { // Make sure the keyring is empty if let Ok(entry) = keyring::Entry::new("rattler_test", host) { - let _ = entry.delete_password(); + let _ = entry.delete_credential(); } let retrieved = storage.get(host); @@ -253,7 +253,7 @@ mod tests { // Make sure the keyring is empty if let Ok(entry) = keyring::Entry::new("rattler_test", host) { - let _ = entry.delete_password(); + let _ = entry.delete_credential(); } let retrieved = storage.get(host); @@ -313,7 +313,7 @@ mod tests { // Make sure the keyring is empty if let Ok(entry) = keyring::Entry::new("rattler_test", host) { - let _ = entry.delete_password(); + let _ = entry.delete_credential(); } let retrieved = storage.get(host); diff --git a/crates/rattler_networking/src/authentication_storage/backends/keyring.rs b/crates/rattler_networking/src/authentication_storage/backends/keyring.rs index c21842078..c9a716f38 100644 --- a/crates/rattler_networking/src/authentication_storage/backends/keyring.rs +++ b/crates/rattler_networking/src/authentication_storage/backends/keyring.rs @@ -82,7 +82,7 @@ impl StorageBackend for KeyringAuthenticationStorage { fn delete(&self, host: &str) -> Result<()> { let entry = Entry::new(&self.store_key, host)?; - entry.delete_password()?; + entry.delete_credential()?; Ok(()) }