resolving comments

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

Author: John Zakrzewski

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

@@ -126,7 +126,13 @@ impl RestApiClient {
         let ca_certificate_path = cfg.ca_certificate_path();
         let cert = match ca_certificate_path {
             Some(path) => {
-                let cert = std::fs::read(path).expect("Failed to read certificate file");
+                let cert = std::fs::read(path)
+                .map_err(|error| {
+                    anyhow::anyhow!(
+                        "Failed to create openapi configuration, Error: '{:?}'",
+                        error
+                    )
+                })?;
                 Some(cert)
             },
             None => None,

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

@@ -1,7 +1,7 @@
 use anyhow::Context;
 use clap::ArgMatches;
 use once_cell::sync::OnceCell;
-use std::{collections::HashMap, time::Duration};
+use std::{collections::HashMap, path::{PathBuf, Path}, time::Duration};
 
 static CONFIG: OnceCell<CsiControllerConfig> = OnceCell::new();
 
@@ -18,7 +18,7 @@ pub(crate) struct CsiControllerConfig {
     /// Force unstage volume.
     force_unstage_volume: bool,
     /// Path to the CA certificate file.
-    ca_certificate_path: Option<String>,
+    ca_certificate_path: Option<PathBuf>,
 }
 
 impl CsiControllerConfig {
@@ -54,7 +54,7 @@ impl CsiControllerConfig {
             );
         };
 
-        let ca_certificate_path = args.get_one::<String>("tls-client-ca-path");
+        let ca_certificate_path: Option<&PathBuf> = args.get_one::<PathBuf>("tls-client-ca-path");
 
         CONFIG.get_or_init(|| Self {
             rest_endpoint: rest_endpoint.into(),
@@ -99,7 +99,7 @@ impl CsiControllerConfig {
     }
 
      /// Path to the CA certificate file.
-     pub(crate) fn ca_certificate_path(&self) -> Option<&str> {
+     pub(crate) fn ca_certificate_path(&self) -> Option<&Path> {
         self.ca_certificate_path.as_deref()
     }
 }

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

@@ -134,7 +134,7 @@ async fn main() -> anyhow::Result<()> {
         .arg(
             Arg::new("tls-client-ca-path")
                 .long("tls-client-ca-path")
-                .help("path to the CA certificate file"),
+                .help("path to the CA certificate file")
         )
         .get_matches();