From aebaabfb2fdfe9b722cb24136e4c794d1cf1e6ca Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Mon, 3 Jun 2024 08:39:52 -0400
Subject: [PATCH] fix: Move creds empty check to credentials module

---
 src/credentials.rs | 18 ++++++++++--------
 src/drivers.rs     | 15 +--------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/credentials.rs b/src/credentials.rs
index c7cdf08..4357167 100644
--- a/src/credentials.rs
+++ b/src/credentials.rs
@@ -59,8 +59,8 @@ static ENV_CREDENTIALS: Lazy<Option<Credentials>> = Lazy::new(|| {
         env::var(CI_REGISTRY).ok(),
         env::var(GITHUB_ACTIONS).ok(),
     ) {
-        (Some(registry), _, _) => registry,
-        (None, Some(ci_registry), None) => ci_registry,
+        (Some(registry), _, _) if !registry.is_empty() => registry,
+        (None, Some(ci_registry), None) if !ci_registry.is_empty() => ci_registry,
         (None, None, Some(_)) => "ghcr.io".to_string(),
         _ => return None,
     };
@@ -71,9 +71,9 @@ static ENV_CREDENTIALS: Lazy<Option<Credentials>> = Lazy::new(|| {
         env::var(CI_REGISTRY_USER).ok(),
         env::var(GITHUB_ACTOR).ok(),
     ) {
-        (Some(username), _, _) => username,
-        (None, Some(ci_registry_user), None) => ci_registry_user,
-        (None, None, Some(github_actor)) => github_actor,
+        (Some(username), _, _) if !username.is_empty() => username,
+        (None, Some(ci_registry_user), None) if !ci_registry_user.is_empty() => ci_registry_user,
+        (None, None, Some(github_actor)) if !github_actor.is_empty() => github_actor,
         _ => return None,
     };
     trace!("Username: {username}");
@@ -83,9 +83,11 @@ static ENV_CREDENTIALS: Lazy<Option<Credentials>> = Lazy::new(|| {
         env::var(CI_REGISTRY_PASSWORD).ok(),
         env::var(GITHUB_TOKEN).ok(),
     ) {
-        (Some(password), _, _) => password,
-        (None, Some(ci_registry_password), None) => ci_registry_password,
-        (None, None, Some(registry_token)) => registry_token,
+        (Some(password), _, _) if !password.is_empty() => password,
+        (None, Some(ci_registry_password), None) if !ci_registry_password.is_empty() => {
+            ci_registry_password
+        }
+        (None, None, Some(registry_token)) if !registry_token.is_empty() => registry_token,
         _ => return None,
     };
 
diff --git a/src/drivers.rs b/src/drivers.rs
index fad89c4..b88986c 100644
--- a/src/drivers.rs
+++ b/src/drivers.rs
@@ -256,20 +256,7 @@ impl Driver<'_> {
     pub fn init(self) -> Result<()> {
         trace!("Driver::init()");
         let init = INIT.lock().map_err(|e| anyhow!("{e}"))?;
-        credentials::set_user_creds(
-            match self.username {
-                Some(username) if !username.is_empty() => Some(username),
-                _ => None,
-            },
-            match self.password {
-                Some(password) if !password.is_empty() => Some(password),
-                _ => None,
-            },
-            match self.registry {
-                Some(registry) if !registry.is_empty() => Some(registry),
-                _ => None,
-            },
-        )?;
+        credentials::set_user_creds(self.username, self.password, self.registry)?;
 
         let mut build_driver = SELECTED_BUILD_DRIVER.lock().map_err(|e| anyhow!("{e}"))?;
         let mut inspect_driver = SELECTED_INSPECT_DRIVER.lock().map_err(|e| anyhow!("{e}"))?;