fix: running linter

Signed-off-by: John Zakrzewski <[email protected]>

Author: John Zakrzewski

control-plane/csi-driver/src/bin/controller/client.rs

@@ -126,15 +126,14 @@ impl RestApiClient {
         let ca_certificate_path = cfg.ca_certificate_path();
         let cert = match ca_certificate_path {
             Some(path) => {
-                let cert = std::fs::read(path)
-                .map_err(|error| {
+                let cert = std::fs::read(path).map_err(|error| {
                     anyhow::anyhow!(
                         "Failed to create openapi configuration, Error: '{:?}'",
                         error
                     )
                 })?;
                 Some(cert)
-            },
+            }
             None => None,
         };
         let tower = match (url.scheme(), cert) {
@@ -153,25 +152,23 @@ impl RestApiClient {
                             error
                         )
                     })?
-            },
+            }
             ("https", None) => {
                 anyhow::bail!("HTTPS endpoint requires a CA certificate path");
-            },
+            }
             (_, Some(_path)) => {
                 anyhow::bail!("CA certificate path is only supported for HTTPS endpoints");
-            },
-            _ => {
-                clients::tower::Configuration::builder()
-                    .with_timeout(Some(cfg.io_timeout()))
-                    .with_concurrency_limit(Some(concurrency_limit))
-                    .build_url(url)
-                    .map_err(|error| {
-                        anyhow::anyhow!(
-                            "Failed to create openapi configuration, Error: '{:?}'",
-                            error
-                        )
-                    })?
             }
+            _ => clients::tower::Configuration::builder()
+                .with_timeout(Some(cfg.io_timeout()))
+                .with_concurrency_limit(Some(concurrency_limit))
+                .build_url(url)
+                .map_err(|error| {
+                    anyhow::anyhow!(
+                        "Failed to create openapi configuration, Error: '{:?}'",
+                        error
+                    )
+                })?,
         };
 
         REST_CLIENT.get_or_init(|| Self {

control-plane/csi-driver/src/bin/controller/config.rs

@@ -1,7 +1,11 @@
 use anyhow::Context;
 use clap::ArgMatches;
 use once_cell::sync::OnceCell;
-use std::{collections::HashMap, path::{PathBuf, Path}, time::Duration};
+use std::{
+    collections::HashMap,
+    path::{Path, PathBuf},
+    time::Duration,
+};
 
 static CONFIG: OnceCell<CsiControllerConfig> = OnceCell::new();
 
@@ -98,8 +102,8 @@ impl CsiControllerConfig {
         self.force_unstage_volume
     }
 
-     /// Path to the CA certificate file.
-     pub(crate) fn ca_certificate_path(&self) -> Option<&Path> {
+    /// Path to the CA certificate file.
+    pub(crate) fn ca_certificate_path(&self) -> Option<&Path> {
         self.ca_certificate_path.as_deref()
     }
 }

k8s/operators/src/pool/main.rs

@@ -31,7 +31,7 @@ use kube::{
 use mayastorpool::client::{check_crd, delete, list};
 use openapi::clients::{self, tower::Url};
 use std::{collections::HashMap, sync::Arc, time::Duration};
-use tracing::{error, info, trace, warn, debug};
+use tracing::{debug, error, info, trace, warn};
 use utils::tracing_telemetry::{FmtLayer, FmtStyle};
 
 const PAGINATION_LIMIT: u32 = 100;
@@ -129,46 +129,50 @@ async fn pool_controller(args: ArgMatches) -> anyhow::Result<()> {
         .expect("timeout value is invalid")
         .into();
 
-    let ca_certificate_path:Option<&str> = args.get_one::<String>("tls-client-ca-path").map(|x| x.as_str());
+    let ca_certificate_path: Option<&str> = args
+        .get_one::<String>("tls-client-ca-path")
+        .map(|x| x.as_str());
     // take in cert path and make pem file
     let cert = match ca_certificate_path {
         Some(path) => {
             let cert = std::fs::read(path).expect("Failed to read certificate file");
             Some(cert)
-        },
+        }
         None => None,
     };
     let cfg = match (url.scheme(), cert) {
         ("https", Some(cert)) => {
             debug!("Attempting TLS connection to {}", url);
 
-            clients::tower::Configuration::new(url, timeout, None, Some(cert.as_slice()), true, None)
-                .map_err(
-                    |error| {
-                        anyhow::anyhow!(
-                            "Failed to create openapi configuration, Error: '{:?}'",
-                            error
-                        )
-                    },
-            )?
-        },
+            clients::tower::Configuration::new(
+                url,
+                timeout,
+                None,
+                Some(cert.as_slice()),
+                true,
+                None,
+            )
+            .map_err(|error| {
+                anyhow::anyhow!(
+                    "Failed to create openapi configuration, Error: '{:?}'",
+                    error
+                )
+            })?
+        }
         ("https", None) => {
             anyhow::bail!("HTTPS endpoint requires a CA certificate path");
-        },
+        }
         (_, Some(_path)) => {
             anyhow::bail!("CA certificate path is only supported for HTTPS endpoints");
-        },
-        _ => {
-            clients::tower::Configuration::new(url, timeout, None, None, true, None)
-                .map_err(
-                    |error| {
-                        anyhow::anyhow!(
-                            "Failed to create openapi configuration, Error: '{:?}'",
-                            error
-                        )
-                    },
-            )?
         }
+        _ => clients::tower::Configuration::new(url, timeout, None, None, true, None).map_err(
+            |error| {
+                anyhow::anyhow!(
+                    "Failed to create openapi configuration, Error: '{:?}'",
+                    error
+                )
+            },
+        )?,
     };
     let interval = args
         .get_one::<String>("interval")