Merge pull request #4 from brotskydotcom/next

Update to keyring-core v0.7. Also tweak the module docs.

Author: brotskydotcom

Cargo.toml

@@ -16,7 +16,7 @@ edition = "2024"
 name = "example"
 
 [dependencies]
-keyring-core = { version = "0.5"}
+keyring-core = { version = "0.7" }
 linux-keyutils = { version = "0.2.4", features = ["std"] }
 
 [dev-dependencies]

README.md

@@ -6,7 +6,11 @@ This library provides a credential store for use with the [keyring ecosystem](ht
 
 ## Usage
 
-To use this keychain-compatible credential store provider, you must take a dependency on the [keyring-core crate](https://crates.io/crates/keyring-core) and on [this crate](https://crates.io/crates/linux-keyutils-keyring-store). Then you can instantiate a credential store and set it as your default credential store as shown in the [sample program](examples/example.rs) in this crate.
+To use this keychain-compatible credential store provider, you must take a dependency on the [keyring-core crate](https://crates.io/crates/keyring-core) and on [this crate](https://crates.io/crates/linux-keyutils-keyring-store). Then you can instantiate a credential store and set it as your default credential store as shown in the [sample program](https://github.com/open-source-cooperative/linux-keyutils-keyring-store/blob/main/examples/example.rs) in this crate.
+
+## Changelog
+
+See the [release history on GitHub](https://github.com/open-source-cooperative/linux-keyutils-keyring-store/releases) for full details.
 
 ## License
 

src/lib.rs

@@ -32,8 +32,8 @@ delimiter string in the service string.
 # Attributes
 
 There is no notion of attribute other than the description supported by keyutils,
-so the [get_attributes](keyring::Entry::get_attributes)
-and [update_attributes](keyring::Entry::update_attributes)
+so the [get_attributes](keyring_core::Entry::get_attributes)
+and [update_attributes](keyring_core::Entry::update_attributes)
 calls are both no-ops for this credential store.
 
 # Persistence

src/store.rs

@@ -3,10 +3,9 @@ use std::fmt::Formatter;
 use std::sync::Arc;
 use std::time::{SystemTime, UNIX_EPOCH};
 
-use keyring_core::Entry;
 use keyring_core::api::{CredentialPersistence, CredentialStoreApi};
 use keyring_core::attributes::parse_attributes;
-use keyring_core::error::{Error, Result};
+use keyring_core::{Entry, Result};
 
 use super::Cred;
 
@@ -38,7 +37,7 @@ impl Store {
     /// the config option `service_no_divider` to `true`.
     pub fn new_with_configuration(config: &HashMap<&str, &str>) -> Result<Arc<Self>> {
         let config = parse_attributes(
-            &["prefix", "divider", "suffix", "service_no_divider"],
+            &["prefix", "divider", "suffix", "*service_no_divider"],
             Some(config),
         )?;
         let prefix = config
@@ -56,17 +55,11 @@ impl Store {
             .map(|s| s.as_str())
             .unwrap_or("")
             .to_string();
-        let service_no_divider = match config.get("service_no_divider").map(|s| s.as_str()) {
-            None => false,
-            Some("true") => true,
-            Some("false") => false,
-            Some(_) => {
-                return Err(Error::Invalid(
-                    "service_no_divider".to_string(),
-                    "must be true or false".to_string(),
-                ));
-            }
-        };
+        let service_no_divider = config
+            .get("service_no_divider")
+            .map(|s| s.as_str())
+            .unwrap_or("false")
+            .eq("true");
         Ok(Self::new_internal(
             [prefix, divider, suffix],
             service_no_divider,