From dc5bc4210b1d59d67fb0bc5711944ba74856c29a Mon Sep 17 00:00:00 2001 From: igor Date: Mon, 9 May 2022 09:41:54 +0200 Subject: [PATCH] Fix some typos --- crates/fluvio-controlplane/src/requests/register_spu.rs | 2 +- crates/fluvio-dataplane-protocol/src/error_code.rs | 8 ++++---- crates/fluvio-sc/src/cli.rs | 2 +- crates/fluvio-sc/src/controllers/partitions/Test.MD | 2 +- crates/fluvio-sc/src/k8/controllers/mod.rs | 2 +- crates/fluvio-sc/src/k8/objects/spu_k8_config.rs | 2 +- crates/fluvio-sc/src/stores/spu.rs | 2 +- crates/fluvio-spu/src/config/cli.rs | 2 +- crates/fluvio-spu/src/replication/follower/controller.rs | 2 +- crates/fluvio-spu/src/replication/leader/spu.rs | 2 +- crates/fluvio-spu/src/services/public/offset_update.rs | 2 +- crates/fluvio-spu/src/services/public/stream_fetch.rs | 2 +- crates/fluvio-spu/src/storage/mod.rs | 4 ++-- .../src/dispatcher/k8_dispatcher.rs | 4 +++- .../src/dispatcher/k8_ws_service.rs | 4 ++-- crates/fluvio-stream-model/src/store/k8.rs | 7 +++++-- crates/fluvio-types/src/event.rs | 9 +++++++-- crates/fluvio/src/config/tls.rs | 2 +- crates/fluvio/src/consumer.rs | 2 +- crates/fluvio/src/sync/mod.rs | 2 +- 20 files changed, 37 insertions(+), 27 deletions(-) diff --git a/crates/fluvio-controlplane/src/requests/register_spu.rs b/crates/fluvio-controlplane/src/requests/register_spu.rs index bacd02c5a1..124460b1e9 100644 --- a/crates/fluvio-controlplane/src/requests/register_spu.rs +++ b/crates/fluvio-controlplane/src/requests/register_spu.rs @@ -73,7 +73,7 @@ impl RegisterSpuResponse { pub fn failed_registration() -> Self { RegisterSpuResponse { - error_code: ErrorCode::SpuRegisterationFailed, + error_code: ErrorCode::SpuRegistrationFailed, error_message: None, } } diff --git a/crates/fluvio-dataplane-protocol/src/error_code.rs b/crates/fluvio-dataplane-protocol/src/error_code.rs index 6ff815cd40..fcd638c1a7 100644 --- a/crates/fluvio-dataplane-protocol/src/error_code.rs +++ b/crates/fluvio-dataplane-protocol/src/error_code.rs @@ -61,7 +61,7 @@ pub enum ErrorCode { SpuError, #[fluvio(tag = 1001)] #[error("failed to register an SPU")] - SpuRegisterationFailed, + SpuRegistrationFailed, #[fluvio(tag = 1002)] #[error("the SPU is offline")] SpuOffline, @@ -106,7 +106,7 @@ pub enum ErrorCode { // Stream Fetch error #[fluvio(tag = 3002)] #[error("the fetch session was not found")] - FetchSessionNotFoud, + FetchSessionNotFound, // Legacy SmartModule errors #[deprecated(since = "0.9.13")] @@ -291,7 +291,7 @@ mod test { // Spu errors assert_tag!(ErrorCode::SpuError, 1000, 0); - assert_tag!(ErrorCode::SpuRegisterationFailed, 1001, 0); + assert_tag!(ErrorCode::SpuRegistrationFailed, 1001, 0); assert_tag!(ErrorCode::SpuOffline, 1002, 0); assert_tag!(ErrorCode::SpuNotFound, 1003, 0); assert_tag!(ErrorCode::SpuAlreadyExists, 1004, 0); @@ -309,7 +309,7 @@ mod test { assert_tag!(ErrorCode::PartitionNotLeader, 3001, 0); // Stream Fetch error - assert_tag!(ErrorCode::FetchSessionNotFoud, 3002, 0); + assert_tag!(ErrorCode::FetchSessionNotFound, 3002, 0); } #[test] diff --git a/crates/fluvio-sc/src/cli.rs b/crates/fluvio-sc/src/cli.rs index 28aa1efe71..34c46bf1bf 100644 --- a/crates/fluvio-sc/src/cli.rs +++ b/crates/fluvio-sc/src/cli.rs @@ -211,7 +211,7 @@ impl TlsConfig { info!("using tls anonymous access"); TlsAcceptor::builder().map_err(|err| err.into_io_error())? }) - .with_certifiate_and_key_from_pem_files(server_crt_path, server_key_path) + .with_certificate_and_key_from_pem_files(server_crt_path, server_key_path) .map_err(|err| err.into_io_error())?; Ok(builder.build()) diff --git a/crates/fluvio-sc/src/controllers/partitions/Test.MD b/crates/fluvio-sc/src/controllers/partitions/Test.MD index 4ea7a5b613..3c1abf8dad 100644 --- a/crates/fluvio-sc/src/controllers/partitions/Test.MD +++ b/crates/fluvio-sc/src/controllers/partitions/Test.MD @@ -38,7 +38,7 @@ - Statu's Replica should have value of leader * Follower up: - - Partition with 2 replicas. + - Partition with 2 replicas. - Shutdown all SPU. This should set partition status to ElectionNoLeaderFounded - Bring up follower SPU. - It should do election (doesn't) diff --git a/crates/fluvio-sc/src/k8/controllers/mod.rs b/crates/fluvio-sc/src/k8/controllers/mod.rs index 00c87d57fa..ae1a478223 100644 --- a/crates/fluvio-sc/src/k8/controllers/mod.rs +++ b/crates/fluvio-sc/src/k8/controllers/mod.rs @@ -97,7 +97,7 @@ mod k8_operator { global_ctx.spgs().clone(), ); }); - whitelist!(config, "k8_managed_connector_delpoyment", { + whitelist!(config, "k8_managed_connector_deployment", { ManagedConnectorDeploymentController::start( global_ctx.managed_connectors().clone(), managed_connector_deployments_ctx, diff --git a/crates/fluvio-sc/src/k8/objects/spu_k8_config.rs b/crates/fluvio-sc/src/k8/objects/spu_k8_config.rs index ff3ea342c2..f15877f6c5 100644 --- a/crates/fluvio-sc/src/k8/objects/spu_k8_config.rs +++ b/crates/fluvio-sc/src/k8/objects/spu_k8_config.rs @@ -217,7 +217,7 @@ mod extended { .with_context(ctx), ) } - Err(err) => Err(K8ConvertError::KeyConvertionError(IoError::new( + Err(err) => Err(K8ConvertError::KeyConversionError(IoError::new( ErrorKind::InvalidData, format!("error converting metadata: {:#?}", err), ))), diff --git a/crates/fluvio-sc/src/stores/spu.rs b/crates/fluvio-sc/src/stores/spu.rs index 6ef5e03054..c4a0d4b72c 100644 --- a/crates/fluvio-sc/src/stores/spu.rs +++ b/crates/fluvio-sc/src/stores/spu.rs @@ -65,7 +65,7 @@ mod health_check { } pub fn listener(&self) -> OffsetChangeListener { - self.event.change_listner() + self.event.change_listener() } /// update health check diff --git a/crates/fluvio-spu/src/config/cli.rs b/crates/fluvio-spu/src/config/cli.rs index 0d40acf99a..bd697e2d53 100644 --- a/crates/fluvio-spu/src/config/cli.rs +++ b/crates/fluvio-spu/src/config/cli.rs @@ -168,7 +168,7 @@ impl SpuOpt { } else { TlsAcceptor::builder().map_err(|err| err.into_io_error())? }) - .with_certifiate_and_key_from_pem_files(server_crt_path, server_key_path) + .with_certificate_and_key_from_pem_files(server_crt_path, server_key_path) .map_err(|err| err.into_io_error())?; Ok(Some(builder.build())) diff --git a/crates/fluvio-spu/src/replication/follower/controller.rs b/crates/fluvio-spu/src/replication/follower/controller.rs index 589935805d..d8c656c83a 100644 --- a/crates/fluvio-spu/src/replication/follower/controller.rs +++ b/crates/fluvio-spu/src/replication/follower/controller.rs @@ -189,7 +189,7 @@ mod inner { let (mut sink, mut stream) = socket.split(); let mut api_stream = stream.api_stream::(); - let mut event_listener = self.group.events.change_listner(); + let mut event_listener = self.group.events.change_listener(); // starts initial sync debug!("performing initial offset sync to leader"); diff --git a/crates/fluvio-spu/src/replication/leader/spu.rs b/crates/fluvio-spu/src/replication/leader/spu.rs index 1520dea513..6ff8da8c66 100644 --- a/crates/fluvio-spu/src/replication/leader/spu.rs +++ b/crates/fluvio-spu/src/replication/leader/spu.rs @@ -87,7 +87,7 @@ pub struct FollowerSpuPendingUpdates { impl FollowerSpuPendingUpdates { pub fn listener(&self) -> OffsetChangeListener { - self.event.change_listner() + self.event.change_listener() } /// add replica to be updated diff --git a/crates/fluvio-spu/src/services/public/offset_update.rs b/crates/fluvio-spu/src/services/public/offset_update.rs index 4ac8ad7ec3..35003632bd 100644 --- a/crates/fluvio-spu/src/services/public/offset_update.rs +++ b/crates/fluvio-spu/src/services/public/offset_update.rs @@ -40,7 +40,7 @@ pub async fn handle_offset_update( ); OffsetUpdateStatus { session_id: update.session_id, - error: ErrorCode::FetchSessionNotFoud, + error: ErrorCode::FetchSessionNotFound, } } }; diff --git a/crates/fluvio-spu/src/services/public/stream_fetch.rs b/crates/fluvio-spu/src/services/public/stream_fetch.rs index 56a53e2ca3..53743c5fd4 100644 --- a/crates/fluvio-spu/src/services/public/stream_fetch.rs +++ b/crates/fluvio-spu/src/services/public/stream_fetch.rs @@ -61,7 +61,7 @@ impl StreamFetchHandler { if let Some(leader_state) = ctx.leaders_state().get(&replica).await { let (stream_id, offset_publisher) = ctx.stream_publishers().create_new_publisher().await; - let consumer_offset_listener = offset_publisher.change_listner(); + let consumer_offset_listener = offset_publisher.change_listener(); spawn(async move { if let Err(err) = StreamFetchHandler::fetch( diff --git a/crates/fluvio-spu/src/storage/mod.rs b/crates/fluvio-spu/src/storage/mod.rs index 10e0b2e26f..015acc9460 100644 --- a/crates/fluvio-spu/src/storage/mod.rs +++ b/crates/fluvio-spu/src/storage/mod.rs @@ -79,8 +79,8 @@ where /// listen to offset based on isolation pub fn offset_listener(&self, isolation: &Isolation) -> OffsetChangeListener { match isolation { - Isolation::ReadCommitted => self.hw.change_listner(), - Isolation::ReadUncommitted => self.leo.change_listner(), + Isolation::ReadCommitted => self.hw.change_listener(), + Isolation::ReadUncommitted => self.leo.change_listener(), } } diff --git a/crates/fluvio-stream-dispatcher/src/dispatcher/k8_dispatcher.rs b/crates/fluvio-stream-dispatcher/src/dispatcher/k8_dispatcher.rs index 72f4b893b0..99a403fa6b 100644 --- a/crates/fluvio-stream-dispatcher/src/dispatcher/k8_dispatcher.rs +++ b/crates/fluvio-stream-dispatcher/src/dispatcher/k8_dispatcher.rs @@ -379,7 +379,9 @@ mod convert { debug!("skipping: {} {}", S::LABEL, obj.metadata.name); continue; } - K8ConvertError::KeyConvertionError(err) => return Err(err.into()), + #[allow(deprecated)] + K8ConvertError::KeyConversionError(err) + | K8ConvertError::KeyConvertionError(err) => return Err(err.into()), K8ConvertError::Other(err) => return Err(err.into()), }, }; diff --git a/crates/fluvio-stream-dispatcher/src/dispatcher/k8_ws_service.rs b/crates/fluvio-stream-dispatcher/src/dispatcher/k8_ws_service.rs index 61f4505646..329b12f3f9 100644 --- a/crates/fluvio-stream-dispatcher/src/dispatcher/k8_ws_service.rs +++ b/crates/fluvio-stream-dispatcher/src/dispatcher/k8_ws_service.rs @@ -134,11 +134,11 @@ where } pub async fn delete(&self, meta: K8MetaItem) -> Result<(), C::MetadataClientError> { - use k8_metadata_client::k8_types::options::{DeleteOptions, PropogationPolicy}; + use k8_metadata_client::k8_types::options::{DeleteOptions, PropagationPolicy}; let options = if S::DELETE_WAIT_DEPENDENTS { Some(DeleteOptions { - propagation_policy: Some(PropogationPolicy::Foreground), + propagation_policy: Some(PropagationPolicy::Foreground), ..Default::default() }) } else { diff --git a/crates/fluvio-stream-model/src/store/k8.rs b/crates/fluvio-stream-model/src/store/k8.rs index 7d9a9b511d..673fb81a6b 100644 --- a/crates/fluvio-stream-model/src/store/k8.rs +++ b/crates/fluvio-stream-model/src/store/k8.rs @@ -148,7 +148,10 @@ where /// skip, this object, it is not considered valid object Skip(K8Obj), /// Converting error + #[deprecated = "Replace by KeyConversionError"] KeyConvertionError(IoError), + /// Converting error + KeyConversionError(IoError), Other(IoError), } @@ -192,13 +195,13 @@ where Ok(MetadataStoreObject::new(key, local_spec, local_status) .with_context(MetadataContext::new(ctx_item, owner))) } - Err(err) => Err(K8ConvertError::KeyConvertionError(IoError::new( + Err(err) => Err(K8ConvertError::KeyConversionError(IoError::new( ErrorKind::InvalidData, format!("error converting metadata: {:#?}", err), ))), } } - Err(err) => Err(K8ConvertError::KeyConvertionError(IoError::new( + Err(err) => Err(K8ConvertError::KeyConversionError(IoError::new( ErrorKind::InvalidData, format!("error converting key: {:#?}", err), ))), diff --git a/crates/fluvio-types/src/event.rs b/crates/fluvio-types/src/event.rs index 553716aca7..9a9d4033ec 100644 --- a/crates/fluvio-types/src/event.rs +++ b/crates/fluvio-types/src/event.rs @@ -102,7 +102,12 @@ pub mod offsets { self.update(self.current_value() + 1); } + #[deprecated = "Replace by change_listener"] pub fn change_listner(self: &Arc) -> OffsetChangeListener { + self.change_listener() + } + + pub fn change_listener(self: &Arc) -> OffsetChangeListener { OffsetChangeListener::new(self.clone()) } } @@ -238,7 +243,7 @@ mod test { #[fluvio_future::test] async fn test_offset_listener_no_wait() { let publisher = OffsetPublisher::shared(0); - let listener = publisher.change_listner(); + let listener = publisher.change_listener(); let status = Arc::new(AtomicBool::new(false)); TestController::start(listener, status.clone()); @@ -265,7 +270,7 @@ mod test { #[fluvio_future::test] async fn test_offset_listener_wait() { let publisher = OffsetPublisher::shared(0); - let listener = publisher.change_listner(); + let listener = publisher.change_listener(); let status = Arc::new(AtomicBool::new(false)); TestController::start(listener, status.clone()); diff --git a/crates/fluvio/src/config/tls.rs b/crates/fluvio/src/config/tls.rs index e902b7ab7b..63b6a7ae06 100644 --- a/crates/fluvio/src/config/tls.rs +++ b/crates/fluvio/src/config/tls.rs @@ -203,7 +203,7 @@ cfg_if::cfg_if! { info!("Using anonymous TLS"); let builder = TlsConnector::builder() .map_err(|err| IoError::new(IoErrorKind::InvalidData, err))? - .with_hostname_vertification_disabled() + .with_hostname_verification_disabled() .map_err(|err| IoError::new(IoErrorKind::InvalidData, err))?; let connector: TlsAnonymousConnector = builder.build().into(); diff --git a/crates/fluvio/src/consumer.rs b/crates/fluvio/src/consumer.rs index c037036efc..c2eb1d74f5 100644 --- a/crates/fluvio/src/consumer.rs +++ b/crates/fluvio/src/consumer.rs @@ -359,7 +359,7 @@ where ); let publisher = OffsetPublisher::shared(0); - let mut listener = publisher.change_listner(); + let mut listener = publisher.change_listener(); // update stream with received offsets spawn(async move { diff --git a/crates/fluvio/src/sync/mod.rs b/crates/fluvio/src/sync/mod.rs index 2403c0a398..e6f60aba59 100644 --- a/crates/fluvio/src/sync/mod.rs +++ b/crates/fluvio/src/sync/mod.rs @@ -43,7 +43,7 @@ mod context { &0 } - /// always return true, this should be changed + /// always return tru, this should be changed fn is_newer(&self, _another: &Self) -> bool { true }