fix: address clippy warnings and env var expansion issues

- Fix collapsible_if and collapsible_else_if clippy warnings
- Make config parsing more resilient to missing environment variables
- Use shellexpand::env_with_context_no_errors to avoid errors for unused profiles
- Allows users to use profiles without having all env vars set

Author: joshrotenberg

crates/redisctl/src/commands/enterprise/support_package.rs

@@ -502,16 +502,15 @@ async fn generate_node_package(
 
     // Try to get node info for display
     let mut node_address = None;
-    if let Some(node_uid) = uid {
-        if let Ok(node_info) = client
+    if let Some(node_uid) = uid
+        && let Ok(node_info) = client
             .get::<serde_json::Value>(&format!("/v1/nodes/{}", node_uid))
             .await
-        {
-            node_address = node_info
-                .get("addr")
-                .and_then(|v| v.as_str())
-                .map(String::from);
-        }
+    {
+        node_address = node_info
+            .get("addr")
+            .and_then(|v| v.as_str())
+            .map(String::from);
     }
 
     // Only show interactive output if not in JSON mode
@@ -570,18 +569,16 @@ async fn generate_node_package(
                 .await
                 .context("Failed to collect node debug info")?
         }
+    } else if use_new_api {
+        debuginfo_handler
+            .nodes_debuginfo_binary()
+            .await
+            .context("Failed to collect all nodes debug info")?
     } else {
-        if use_new_api {
-            debuginfo_handler
-                .nodes_debuginfo_binary()
-                .await
-                .context("Failed to collect all nodes debug info")?
-        } else {
-            debuginfo_handler
-                .node_binary()
-                .await
-                .context("Failed to collect node debug info")?
-        }
+        debuginfo_handler
+            .node_binary()
+            .await
+            .context("Failed to collect node debug info")?
     };
 
     if let Some(spinner) = spinner {

crates/redisctl/src/config.rs

@@ -337,13 +337,11 @@ impl Config {
     /// api_url = "${REDIS_CLOUD_API_URL:-https://api.redislabs.com/v1}"
     /// ```
     fn expand_env_vars(content: &str) -> Result<String> {
-        match shellexpand::env(content) {
-            Ok(expanded) => Ok(expanded.to_string()),
-            Err(e) => Err(anyhow::anyhow!(
-                "Environment variable expansion failed: {}",
-                e
-            )),
-        }
+        // Use shellexpand::env_with_context_no_errors which returns unexpanded vars as-is
+        // This prevents errors when env vars for unused profiles aren't set
+        let expanded =
+            shellexpand::env_with_context_no_errors(content, |var| std::env::var(var).ok());
+        Ok(expanded.to_string())
     }
 }