From 8e34f31810aa6a99501b3cec1696cbaf02faebbe Mon Sep 17 00:00:00 2001 From: Vincent Stuyck Date: Sat, 20 Dec 2025 13:22:00 +0100 Subject: [PATCH] fix typos --- src/api/folders.rs | 10 +++--- src/api/hosts.rs | 14 ++++---- src/api/mod.rs | 14 ++++---- src/api/rules/contactgroups.rs | 4 +-- src/client.rs | 58 +++++++++++++++++----------------- src/error.rs | 4 +-- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/api/folders.rs b/src/api/folders.rs index 8a4eb51..c9a2c64 100644 --- a/src/api/folders.rs +++ b/src/api/folders.rs @@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize}; use crate::api::rules::contactgroups::HostContactGroups; use crate::api::rules::snmp::SnmpCommunity; -use crate::api::{BulkReadDomainExtention, BulkUpdateDomainExtention, DomainExtention}; +use crate::api::{BulkReadDomainExtension, BulkUpdateDomainExtension, DomainExtension}; use crate::{ApiClient, Client, Result}; pub const ROOT_FOLDER: &str = "/"; @@ -109,7 +109,7 @@ pub struct MetaData { pub created_by: Option, } -impl DomainExtention for FolderConfig { +impl DomainExtension for FolderConfig { const DOMAIN_TYPE: super::DomainType = super::DomainType::FolderConfig; type CreationRequest = FolderCreationRequest; @@ -227,10 +227,10 @@ impl FolderDeleteQuery { pub enum FolderDeleteMode { #[default] Recursive, - AbotyOnNonEmpty, + AbortOnNonEmpty, } -impl BulkReadDomainExtention for FolderConfig { +impl BulkReadDomainExtension for FolderConfig { type BulkReadQuery = FolderBulkReadQuery; } @@ -246,7 +246,7 @@ impl FolderBulkReadQuery { } } -impl BulkUpdateDomainExtention for FolderConfig { +impl BulkUpdateDomainExtension for FolderConfig { type BulkUpdateRequest = FolderBulkUpdateRequest; } diff --git a/src/api/hosts.rs b/src/api/hosts.rs index 5820a4a..458f3ff 100644 --- a/src/api/hosts.rs +++ b/src/api/hosts.rs @@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize}; use crate::api::folders::FolderAttributes; use crate::api::{ - BulkCreateDomainExtention, BulkDeleteDomainExtention, BulkReadDomainExtention, - BulkUpdateDomainExtention, DomainExtention, + BulkCreateDomainExtension, BulkDeleteDomainExtension, BulkReadDomainExtension, + BulkUpdateDomainExtension, DomainExtension, }; use crate::{ApiClient, Client}; @@ -23,7 +23,7 @@ pub struct HostConfig { pub cluster_nodes: Option>, } -impl DomainExtention for HostConfig { +impl DomainExtension for HostConfig { const DOMAIN_TYPE: super::DomainType = super::DomainType::HostConfig; type CreationRequest = HostCreationRequest; @@ -105,14 +105,14 @@ impl HostUpdateRequest { } } -impl BulkCreateDomainExtention for HostConfig {} -impl BulkReadDomainExtention for HostConfig { +impl BulkCreateDomainExtension for HostConfig {} +impl BulkReadDomainExtension for HostConfig { type BulkReadQuery = HostBulkReadQuery; } -impl BulkUpdateDomainExtention for HostConfig { +impl BulkUpdateDomainExtension for HostConfig { type BulkUpdateRequest = HostBulkUpdateRequest; } -impl BulkDeleteDomainExtention for HostConfig {} +impl BulkDeleteDomainExtension for HostConfig {} #[derive(Debug, Default, Clone, Serialize)] pub struct HostBulkReadQuery { diff --git a/src/api/mod.rs b/src/api/mod.rs index 0285f9c..d6ef87f 100644 --- a/src/api/mod.rs +++ b/src/api/mod.rs @@ -81,7 +81,7 @@ pub(crate) struct DomainCollection { // pub extensions: Option, } -pub trait DomainExtention: DeserializeOwned + Serialize { +pub trait DomainExtension: DeserializeOwned + Serialize { const DOMAIN_TYPE: DomainType; type CreationRequest: Serialize; @@ -91,14 +91,14 @@ pub trait DomainExtention: DeserializeOwned + Serialize { type DeleteQuery: Serialize; } -// these are essentials tags for domain extentions to signal that bulk operations are possible -// not every extention supports bulk operations. and not all extentions that do support all of them +// these are essential tags for domain extensions to signal that bulk operations are possible +// not every extension supports bulk operations. and not all extensions that do support all of them // and those that do tend to have a bit different types -pub trait BulkCreateDomainExtention: DomainExtention {} -pub trait BulkReadDomainExtention: DomainExtention { +pub trait BulkCreateDomainExtension: DomainExtension {} +pub trait BulkReadDomainExtension: DomainExtension { type BulkReadQuery: Serialize; } -pub trait BulkUpdateDomainExtention: DomainExtention { +pub trait BulkUpdateDomainExtension: DomainExtension { type BulkUpdateRequest: Serialize; } -pub trait BulkDeleteDomainExtention: DomainExtention {} +pub trait BulkDeleteDomainExtension: DomainExtension {} diff --git a/src/api/rules/contactgroups.rs b/src/api/rules/contactgroups.rs index 2e70b4f..9ff31ed 100644 --- a/src/api/rules/contactgroups.rs +++ b/src/api/rules/contactgroups.rs @@ -5,6 +5,6 @@ pub struct HostContactGroups { groups: Vec, r#use: bool, use_for_services: bool, - recuse_use: bool, - recuse_perms: bool, + recurse_use: bool, + recurse_perms: bool, } diff --git a/src/client.rs b/src/client.rs index fe969d3..5bcb946 100644 --- a/src/client.rs +++ b/src/client.rs @@ -11,8 +11,8 @@ use serde::de::DeserializeOwned; use tokio::sync::Semaphore; use crate::api::{ - BulkCreateDomainExtention, BulkDeleteDomainExtention, BulkReadDomainExtention, - BulkUpdateDomainExtention, DomainCollection, DomainExtention, DomainObject, DomainType, + BulkCreateDomainExtension, BulkDeleteDomainExtension, BulkReadDomainExtension, + BulkUpdateDomainExtension, DomainCollection, DomainExtension, DomainObject, DomainType, }; use crate::{Error, Result}; @@ -26,8 +26,8 @@ pub(crate) struct InnerClient { #[derive(Default, PartialEq, Eq)] enum SslStrategy { - NoSll, - IngoreHostname, + NoSsl, + IgnoreHostname, IgnoreCertificate, #[default] Strict, @@ -96,7 +96,7 @@ pub enum ClientBuildError { #[error("failed to build client: {0}")] BuildClient(#[from] reqwest::Error), #[error( - "invalid credentials. thise can only consist of visibly ASCII characters (ie. (32-127))" + "invalid credentials. these can only consist of visible ASCII characters (i.e. (32-127))" )] InvalidCredentials(#[from] reqwest::header::InvalidHeaderValue), } @@ -107,14 +107,14 @@ impl ClientBuilder { self } pub fn without_ssl(mut self) -> Self { - self.ssl = SslStrategy::NoSll; + self.ssl = SslStrategy::NoSsl; self } pub fn ignore_hostname_verification(mut self) -> Self { - self.ssl = SslStrategy::IngoreHostname; + self.ssl = SslStrategy::IgnoreHostname; self } - pub fn ignore_certificate_veritifcation(mut self) -> Self { + pub fn ignore_certificate_verification(mut self) -> Self { self.ssl = SslStrategy::IgnoreCertificate; self } @@ -128,7 +128,7 @@ impl ClientBuilder { } fn protocol(&self) -> &str { - if self.ssl == SslStrategy::NoSll { + if self.ssl == SslStrategy::NoSsl { "http" } else { "https" @@ -137,7 +137,7 @@ impl ClientBuilder { fn port(&self) -> u16 { if self.port != 0 { self.port - } else if self.ssl == SslStrategy::NoSll { + } else if self.ssl == SslStrategy::NoSsl { 80 } else { 443 @@ -165,7 +165,7 @@ impl ClientBuilder { let mut builder = reqwest::ClientBuilder::new() .default_headers(headers) .danger_accept_invalid_certs(self.ssl == SslStrategy::IgnoreCertificate) - .danger_accept_invalid_hostnames(self.ssl == SslStrategy::IngoreHostname); + .danger_accept_invalid_hostnames(self.ssl == SslStrategy::IgnoreHostname); if let Some(sock) = self.resolve { builder = builder.resolve(&self.hostname, sock); @@ -181,7 +181,7 @@ impl ClientBuilder { }; // checkmk api struggles with more than 10 requests at a time - // not sure if this has been inproved since 2.2 + // not sure if this has been improved since 2.2 let semaphore = Semaphore::new(10); Ok(Client(Arc::new(InnerClient { @@ -282,7 +282,7 @@ impl InnerClient { } } - pub(crate) async fn create_domain_object( + pub(crate) async fn create_domain_object( &self, body: &E::CreationRequest, query: &E::CreationQuery, @@ -297,7 +297,7 @@ impl InnerClient { self.invoke_api(request).await } - pub(crate) async fn read_domain_object( + pub(crate) async fn read_domain_object( &self, id: impl Display, query: &E::ReadQuery, @@ -311,7 +311,7 @@ impl InnerClient { self.query_api(request).await } - pub(crate) async fn update_domain_object( + pub(crate) async fn update_domain_object( &self, id: impl Display, request: &E::UpdateRequest, @@ -328,7 +328,7 @@ impl InnerClient { self.invoke_api(request).await } - pub(crate) async fn delete_domain_object( + pub(crate) async fn delete_domain_object( &self, id: impl Display, query: &E::DeleteQuery, @@ -343,13 +343,13 @@ impl InnerClient { self.invoke_api(request).await } - pub(crate) async fn bulk_create_domain_objects( + pub(crate) async fn bulk_create_domain_objects( &self, entries: &[E::CreationRequest], query: &E::CreationQuery, ) -> Result<()> { #[derive(Serialize)] - struct Request<'a, D: BulkCreateDomainExtention> { + struct Request<'a, D: BulkCreateDomainExtension> { entries: &'a [D::CreationRequest], } @@ -363,7 +363,7 @@ impl InnerClient { self.invoke_api(request).await } - pub(crate) async fn bulk_read_domain_objects( + pub(crate) async fn bulk_read_domain_objects( &self, query: &E::BulkReadQuery, ) -> Result>> { @@ -377,12 +377,12 @@ impl InnerClient { let response: DomainCollection = self.query_api(request).await?; Ok(response.value) } - pub(crate) async fn bulk_update_domain_objects( + pub(crate) async fn bulk_update_domain_objects( &self, entries: &[E::BulkUpdateRequest], ) -> Result<()> { #[derive(Serialize)] - struct Request<'a, D: BulkUpdateDomainExtention> { + struct Request<'a, D: BulkUpdateDomainExtension> { entries: &'a [D::BulkUpdateRequest], } @@ -395,7 +395,7 @@ impl InnerClient { self.invoke_api(request).await } - pub(crate) async fn bulk_delete_domain_objects( + pub(crate) async fn bulk_delete_domain_objects( &self, entries: &[String], ) -> Result<()> { @@ -433,12 +433,12 @@ impl Display for BulkAction { } } -pub struct ApiClient { +pub struct ApiClient { pub(crate) inner: Arc, _marker: PhantomData, } -impl From<&Client> for ApiClient { +impl From<&Client> for ApiClient { fn from(value: &Client) -> Self { Self { inner: value.0.clone(), @@ -447,7 +447,7 @@ impl From<&Client> for ApiClient { } } -impl ApiClient { +impl ApiClient { pub async fn create( &self, request: &D::CreationRequest, @@ -469,7 +469,7 @@ impl ApiClient { } } -impl ApiClient { +impl ApiClient { pub async fn bulk_create( &self, request: &[D::CreationRequest], @@ -481,7 +481,7 @@ impl ApiClient { } } -impl ApiClient { +impl ApiClient { pub async fn bulk_read(&self, query: &D::BulkReadQuery) -> Result> { let objs = self.inner.bulk_read_domain_objects::(query).await?; let exts = objs.into_iter().map(|obj| obj.extensions).collect(); @@ -489,13 +489,13 @@ impl ApiClient { } } -impl ApiClient { +impl ApiClient { pub async fn bulk_update(&self, entries: &[D::BulkUpdateRequest]) -> Result<()> { self.inner.bulk_update_domain_objects::(entries).await } } -impl ApiClient { +impl ApiClient { pub async fn bulk_delete(&self, ids: &[String]) -> Result<()> { self.inner.bulk_delete_domain_objects::(ids).await } diff --git a/src/error.rs b/src/error.rs index 648d693..0ff9ff2 100644 --- a/src/error.rs +++ b/src/error.rs @@ -15,14 +15,14 @@ pub enum Error { #[error( "Failed to send request: {}: {}", .0, .0.cause().map(|e| e.to_string()) - .unwrap_or_else(|| "Uknown Cause".to_string()) + .unwrap_or_else(|| "Unknown Cause".to_string()) )] SendRequest(#[source] reqwest::Error), #[error("Failed to receive response-body: {0}")] ReceiveBody(#[source] reqwest::Error), #[error("Failed to deserialize response: {0}")] DeserializeResponse(#[source] serde_json::Error), - #[error("Recieved an error from checkmk ({}): {}", .0.status, .0.detail)] + #[error("Received an error from checkmk ({}): {}", .0.status, .0.detail)] CheckmkError(#[source] CheckmkError), #[error("Checkmk site has not yet started. log in as site user and execute 'omd start'")]