Use env::split_paths and env::var_os

kube/src/config/file_config.rs

@@ -186,17 +186,16 @@ impl Kubeconfig {
     }
 
     /// Create `Kubeconfig` from `KUBECONFIG` environment variable.
-    /// Supports list of files to be merged. `KUBECONFIG` value must contain a valid unicode data.
+    /// Supports list of files to be merged.
     ///
     /// # Panics
     ///
     /// Panics if `KUBECONFIG` value contains the NUL character.
     pub fn from_env() -> Result<Option<Self>> {
-        match std::env::var(KUBECONFIG) {
-            Ok(value) => {
-                let paths = value
-                    .split(if cfg!(windows) { ';' } else { ':' })
-                    .filter(|s| !s.is_empty())
+        match std::env::var_os(KUBECONFIG) {
+            Some(value) => {
+                let paths = std::env::split_paths(&value)
+                    .filter(|p| !p.as_os_str().is_empty())
                     .collect::<Vec<_>>();
                 if paths.is_empty() {
                     return Ok(None);
@@ -208,8 +207,7 @@ impl Kubeconfig {
                 Ok(Some(merged))
             }
 
-            Err(std::env::VarError::NotPresent) => Ok(None),
-            Err(std::env::VarError::NotUnicode(_)) => Err(ConfigError::InvalidKubeconfigEnv.into()),
+            None => Ok(None),
         }
     }
 

kube/src/error.rs

@@ -166,8 +166,6 @@ pub enum ConfigError {
 
     #[error("Unable to find path of kubeconfig")]
     NoKubeconfigPath,
-    #[error("KUBECONFIG environment variable must contain a valid unicode data")]
-    InvalidKubeconfigEnv,
 
     #[error("Failed to decode base64: {0}")]
     Base64Decode(#[source] base64::DecodeError),