diff options
| author | Yaroslav Halchenko <debian@onerussian.com> | 2024-04-05 16:51:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-05 15:51:57 +0100 |
| commit | 28b0b490f93fe9f7964d0593b9ba600f4b24663e (patch) | |
| tree | 628f48458d142f61aa70192fa2b36778846fb3ca /atuin-client | |
| parent | perf(dotfiles): cache aliases and read straight from file (#1918) (diff) | |
| download | atuin-28b0b490f93fe9f7964d0593b9ba600f4b24663e.zip | |
chore(ci): Add codespell support (config, workflow) and make it fix some typos (#1916)
* Add github action to codespell main on push and PRs
* Add rudimentary codespell config
* ignore crate, inbetween etc
* [DATALAD RUNCMD] run codespell throughout fixing typo automagically but ignoring the failure due to ambigous typos
=== Do not change lines below ===
{
"chain": [],
"cmd": "codespell -w || :",
"exit": 0,
"extra_inputs": [],
"inputs": [],
"outputs": [],
"pwd": "."
}
^^^ Do not change lines above ^^^
* [DATALAD RUNCMD] Do interactive fixing of leftover ambigous typos
=== Do not change lines below ===
{
"chain": [],
"cmd": "codespell -w -i 3 -C 2",
"exit": 0,
"extra_inputs": [],
"inputs": [],
"outputs": [],
"pwd": "."
}
^^^ Do not change lines above ^^^
Diffstat (limited to 'atuin-client')
| -rw-r--r-- | atuin-client/src/record/encryption.rs | 2 | ||||
| -rw-r--r-- | atuin-client/src/record/sqlite_store.rs | 6 | ||||
| -rw-r--r-- | atuin-client/src/record/store.rs | 2 | ||||
| -rw-r--r-- | atuin-client/src/record/sync.rs | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/atuin-client/src/record/encryption.rs b/atuin-client/src/record/encryption.rs index ca49660c..3ad3be66 100644 --- a/atuin-client/src/record/encryption.rs +++ b/atuin-client/src/record/encryption.rs @@ -36,7 +36,7 @@ See - <https://www.yubico.com/gb/product/yubihsm-2-fips/> - <https://cheatsheetseries.owasp.org/cheatsheets/Cryptographic_Storage_Cheat_Sheet.html#encrypting-stored-keys> -Why would we care? In the past we have recieved some requests for company solutions. If in future we can configure a +Why would we care? In the past we have received some requests for company solutions. If in future we can configure a KMS service with little effort, then that would solve a lot of issues for their security team. Even for personal use, if a user is not comfortable with sharing keys between hosts, diff --git a/atuin-client/src/record/sqlite_store.rs b/atuin-client/src/record/sqlite_store.rs index 6333bb27..e17893eb 100644 --- a/atuin-client/src/record/sqlite_store.rs +++ b/atuin-client/src/record/sqlite_store.rs @@ -171,7 +171,7 @@ impl Store for SqliteStore { match res { Err(sqlx::Error::RowNotFound) => Ok(None), - Err(e) => Err(eyre!("an error occured: {}", e)), + Err(e) => Err(eyre!("an error occurred: {}", e)), Ok(record) => Ok(Some(record)), } } @@ -238,7 +238,7 @@ impl Store for SqliteStore { match res { Err(sqlx::Error::RowNotFound) => Ok(None), - Err(e) => Err(eyre!("an error occured: {}", e)), + Err(e) => Err(eyre!("an error occurred: {}", e)), Ok(v) => Ok(Some(v)), } } @@ -603,7 +603,7 @@ mod tests { // reencrypt the store, then check if // 1) it cannot be decrypted with the old key - // 2) it can be decrypted wiht the new key + // 2) it can be decrypted with the new key let (new_key, _) = generate_encoded_key().unwrap(); store diff --git a/atuin-client/src/record/store.rs b/atuin-client/src/record/store.rs index ae8ea356..188e18ce 100644 --- a/atuin-client/src/record/store.rs +++ b/atuin-client/src/record/store.rs @@ -5,7 +5,7 @@ use atuin_common::record::{EncryptedData, HostId, Record, RecordId, RecordIdx, R /// A record store stores records /// In more detail - we tend to need to process this into _another_ format to actually query it. -/// As is, the record store is intended as the source of truth for arbitratry data, which could +/// As is, the record store is intended as the source of truth for arbitrary data, which could /// be shell history, kvs, etc. #[async_trait] pub trait Store { diff --git a/atuin-client/src/record/sync.rs b/atuin-client/src/record/sync.rs index 02c53d44..234c6442 100644 --- a/atuin-client/src/record/sync.rs +++ b/atuin-client/src/record/sync.rs @@ -15,7 +15,7 @@ pub enum SyncError { #[error("the local store is ahead of the remote, but for another host. has remote lost data?")] LocalAheadOtherHost, - #[error("an issue with the local database occured: {msg:?}")] + #[error("an issue with the local database occurred: {msg:?}")] LocalStoreError { msg: String }, #[error("something has gone wrong with the sync logic: {msg:?}")] |
