diff --git a/.github/workflows/rust_build.yml b/.github/workflows/rust_build.yml index 4069c6e7b..c0a53307a 100644 --- a/.github/workflows/rust_build.yml +++ b/.github/workflows/rust_build.yml @@ -36,4 +36,5 @@ jobs: libsqlite3-dev - run: cargo build --workspace - - run: cargo test + - run: cargo build --bin kanidm --features idv-tui + - run: cargo test \ No newline at end of file diff --git a/Makefile b/Makefile index 98206ef45..0de7b485d 100644 --- a/Makefile +++ b/Makefile @@ -138,6 +138,7 @@ codespell: --skip='./book/book/*' \ --skip='./book/src/images/*' \ --skip='./docs/*,./.git' \ + --skip='*.svg' \ --skip='./rlm_python/mods-available/eap' \ --skip='./server/web_ui/static/external,./server/web_ui/pkg/external' \ --skip='./server/lib/src/constants/system_config.rs,./pykanidm/site,./server/lib/src/constants/*.json' diff --git a/server/lib/src/repl/tests.rs b/server/lib/src/repl/tests.rs index 5d805dcf4..7a1fed3b9 100644 --- a/server/lib/src/repl/tests.rs +++ b/server/lib/src/repl/tests.rs @@ -1795,8 +1795,8 @@ async fn test_repl_increment_domain_rename(server_a: &QueryServer, server_b: &Qu // Add an entry to server_b. This should have it's spn regenerated after // the domain rename is replicated. - // - satifies: - // Test domain rename where the reciever of the rename has added entries, and + // - satisfies: + // Test domain rename where the receiver of the rename has added entries, and // they need spn regen to stabilise. let mut server_b_txn = server_b.write(duration_from_epoch_now()).await; diff --git a/server/lib/src/server/mod.rs b/server/lib/src/server/mod.rs index 404db6488..e99ed3c26 100644 --- a/server/lib/src/server/mod.rs +++ b/server/lib/src/server/mod.rs @@ -830,7 +830,10 @@ pub trait QueryServerTransaction<'a> { } }) .map_err(|e| { - admin_error!(?e, "Failed to retrieve authsession_expiry from system configuration"); + admin_error!( + ?e, + "Failed to retrieve authsession_expiry from system configuration" + ); e }) } @@ -845,7 +848,10 @@ pub trait QueryServerTransaction<'a> { } }) .map_err(|e| { - admin_error!(?e, "Failed to retrieve privilege_expiry from system configuration"); + admin_error!( + ?e, + "Failed to retrieve privilege_expiry from system configuration" + ); e }) } diff --git a/server/testkit/tests/proto_v1_test.rs b/server/testkit/tests/proto_v1_test.rs index 55d6ff4a7..4bf8f1c7f 100644 --- a/server/testkit/tests/proto_v1_test.rs +++ b/server/testkit/tests/proto_v1_test.rs @@ -1472,8 +1472,8 @@ async fn test_authsession_expiry(rsclient: KanidmClient) { .system_authsession_expiry_set(authsession_expiry) .await .unwrap(); - let ans = rsclient.system_authsession_expiry_get().await.unwrap(); - assert_eq!(authsession_expiry, ans); + let result = rsclient.system_authsession_expiry_get().await.unwrap(); + assert_eq!(authsession_expiry, result); } #[kanidmd_testkit::test] @@ -1488,6 +1488,6 @@ async fn test_privilege_expiry(rsclient: KanidmClient) { .system_auth_privilege_expiry_set(authsession_expiry) .await .unwrap(); - let ans = rsclient.system_auth_privilege_expiry_get().await.unwrap(); - assert_eq!(authsession_expiry, ans); + let result = rsclient.system_auth_privilege_expiry_get().await.unwrap(); + assert_eq!(authsession_expiry, result); } diff --git a/tools/cli/src/cli/identify_user_tui.rs b/tools/cli/src/cli/identify_user_tui.rs index 4af2cef25..37dd85381 100644 --- a/tools/cli/src/cli/identify_user_tui.rs +++ b/tools/cli/src/cli/identify_user_tui.rs @@ -13,6 +13,10 @@ use tokio::sync::{ oneshot::{self, Receiver}, }; +use crate::{ + CODE_FAILURE_ERROR_MESSAGE, IDENTITY_UNAVAILABLE_ERROR_MESSAGE, INVALID_STATE_ERROR_MESSAGE, + INVALID_USER_ID_ERROR_MESSAGE, +}; // here I used a simple function instead of a struct because all the channel stuff requires ownership, so if we were to use a struct with a `run` method, it would have to take ownership of everything // so might as well just use a function pub async fn run_identity_verification_tui(self_id: &str, client: KanidmClient) { diff --git a/tools/cli/src/cli/lib.rs b/tools/cli/src/cli/lib.rs index 1a0c0ad06..518542c76 100644 --- a/tools/cli/src/cli/lib.rs +++ b/tools/cli/src/cli/lib.rs @@ -230,10 +230,10 @@ mod identify_user_no_tui { println!("Exiting..."); } - pub(super) async fn run_identity_verification_no_tui<'a>( + pub(super) async fn run_identity_verification_no_tui( mut state: IdentifyUserState, client: KanidmClient, - self_id: &'a str, + self_id: &str, mut other_id: Option, ) { loop {