A bit of colour and styles

Author: Stefan Aichholzer

src/lib.rs

@@ -65,7 +65,7 @@ impl KeeConfig {
 }
 
 pub fn format_profile_name(account_name: &str) -> String {
-    format!("kee-{}", account_name)
+    format!("kee-{account_name}")
 }
 
 pub fn parse_aws_config_section(
@@ -74,7 +74,7 @@ pub fn parse_aws_config_section(
 ) -> Option<HashMap<String, String>> {
     let mut in_section = false;
     let mut section_data = HashMap::new();
-    let target_section = format!("[{}]", section_name);
+    let target_section = format!("[{section_name}]");
 
     for line in content.lines() {
         let line = line.trim();

src/main.rs

@@ -23,7 +23,7 @@ const KEE_ART: &str = r#"
 #[derive(Parser)]
 #[command(name = "kee")]
 #[command(about = KEE_ART)]
-#[command(long_about = format!("{}\n\nExamples:\n  kee add myaccount          Add a new AWS account\n  kee use myaccount          Use an account (starts sub-shell)\n  kee list                   List all configured accounts\n  kee current                Show current active account\n  kee remove myaccount       Remove an account configuration", KEE_ART))]
+#[command(long_about = format!("{KEE_ART}\n\nExamples:\n  kee add myaccount          Add a new AWS account\n  kee use myaccount          Use an account (starts sub-shell)\n  kee list                   List all configured accounts\n  kee current                Show current active account\n  kee remove myaccount       Remove an account configuration"))]
 struct Cli {
     #[command(subcommand)]
     command: Commands,
@@ -66,7 +66,7 @@ struct KeeManager {
 }
 
 fn hlt(text: &str) -> String {
-    format!("{}{}{}", BOLD_WHITE, text, RESET)
+    format!("{BOLD_WHITE}{text}{RESET}")
 }
 
 impl KeeManager {
@@ -105,7 +105,7 @@ impl KeeManager {
     }
 
     fn add_account(&self, account_name: &str) -> io::Result<bool> {
-        let profile_name = format!("kee-{}", account_name);
+        let profile_name = format!("kee-{account_name}");
 
         println!("\n Starting SSO configuration...");
         println!(" (This will open your browser to complete authentication.)");
@@ -123,7 +123,7 @@ impl KeeManager {
         println!(
             "\n {} When prompted for 'session name', use: {}\n",
             hlt("Tip:"),
-            hlt(&account_name)
+            hlt(account_name)
         );
 
         // Run aws configure sso
@@ -181,7 +181,7 @@ impl KeeManager {
         let mut config = configparser::ini::Ini::new();
         config.read(content).ok()?;
 
-        let section_name = format!("profile {}", profile_name);
+        let section_name = format!("profile {profile_name}");
         let section = config.get_map_ref().get(&section_name)?;
 
         let sso_account_id = section.get("sso_account_id")?.as_ref()?.clone();
@@ -200,7 +200,7 @@ impl KeeManager {
 
         // Handle SSO session format - get sso_start_url and sso_region from sso-session section
         let (sso_start_url, sso_region) = if !session_name.is_empty() {
-            let sso_section_name = format!("sso-session {}", session_name);
+            let sso_section_name = format!("sso-session {session_name}");
             if let Some(sso_section) = config.get_map_ref().get(&sso_section_name) {
                 let start_url = sso_section
                     .get("sso_start_url")
@@ -261,7 +261,7 @@ impl KeeManager {
                 ""
             };
 
-            println!(" {}{}", hlt(&account_name), status);
+            println!(" {}{}", hlt(account_name), status);
             println!(
                 " • {} {} | {} {}",
                 hlt("Account:"),
@@ -278,14 +278,14 @@ impl KeeManager {
         let mut config = self.load_config();
 
         if !config.accounts.contains_key(account_name) {
-            println!("\n Account '{}' not found.", hlt(&account_name));
+            println!("\n Account '{}' not found.", hlt(account_name));
             return Ok(false);
         }
 
         // Confirm removal
         print!(
             "\n Are you sure you want to remove account '{}'? (y/N): ",
-            hlt(&account_name)
+            hlt(account_name)
         );
         io::stdout().flush()?;
 
@@ -310,24 +310,22 @@ impl KeeManager {
         self.save_config(&config)?;
 
         // Remove AWS profile and session
-        let hlt_account = hlt(&account_name);
+        let hlt_account = hlt(account_name);
         match self.remove_aws_profile(&account_info.profile_name) {
             Ok(_) => {
                 if !account_info.session_name.is_empty() {
                     let _ = self.remove_sso_session(&account_info.session_name);
                     println!(
-                        " [✓] Account '{}', AWS profile '{}', and SSO session '{}' removed.",
-                        hlt_account, hlt_account, hlt_account
+                        " [✓] Account '{hlt_account}', AWS profile '{hlt_account}', and SSO session '{hlt_account}' removed."
                     );
                 } else {
                     println!(
-                        " [✓] Account '{}' and AWS profile '{}' removed.",
-                        hlt_account, hlt_account
+                        " [✓] Account '{hlt_account}' and AWS profile '{hlt_account}' removed."
                     );
                 }
             }
             Err(e) => {
-                println!(" [✓] Account '{}' removed from Kee.", hlt_account);
+                println!(" [✓] Account '{hlt_account}' removed from Kee.");
                 println!(
                     " [!] {} Could not remove AWS profile '{}': {}",
                     hlt("Warning:"),
@@ -359,22 +357,21 @@ impl KeeManager {
         }
 
         let mut config = self.load_config();
-        let hlt_account = hlt(&account_name);
+        let hlt_account = hlt(account_name);
 
         if !config.accounts.contains_key(account_name) {
-            println!("\n Account '{}' not found.", hlt_account);
+            println!("\n Account '{hlt_account}' not found.");
 
             if !config.accounts.is_empty() {
                 println!(" Available accounts:");
                 for name in config.accounts.keys() {
-                    println!(" • {}\n", hlt(&name));
+                    println!(" • {}\n", hlt(name));
                 }
             }
 
             // Offer to add the account
             print!(
-                " Would you like to add account '{}' now? (y/N): ",
-                hlt_account
+                " Would you like to add account '{hlt_account}' now? (y/N): "
             );
             io::stdout().flush()?;
 
@@ -384,8 +381,7 @@ impl KeeManager {
             if input.trim().to_lowercase() == "y" {
                 if self.add_account(account_name)? {
                     print!(
-                        " Would you like to use account '{}' now? (y/N): ",
-                        hlt_account
+                        " Would you like to use account '{hlt_account}' now? (y/N): "
                     );
                     io::stdout().flush()?;
 
@@ -399,12 +395,12 @@ impl KeeManager {
                         println!(
                             "\n Account '{}' is ready to use. Run '{}' when needed.",
                             hlt_account,
-                            hlt(&format!("kee use {}", account_name))
+                            hlt(&format!("kee use {account_name}"))
                         );
                         return Ok(true);
                     }
                 } else {
-                    println!(" Failed to add account '{}'.", hlt_account);
+                    println!(" Failed to add account '{hlt_account}'.");
                     return Ok(false);
                 }
             } else {
@@ -484,8 +480,8 @@ impl KeeManager {
         };
 
         // Show banner
-        println!("{}", KEE_ART);
-        println!("    Session: {}", hlt(&account_name));
+        println!("{KEE_ART}");
+        println!("    Session: {}", hlt(account_name));
         println!("\n    Starting a sub-shell for this session...");
         println!("    Type '{}' to return to your main shell.", hlt("exit"));
         println!();
@@ -499,15 +495,15 @@ impl KeeManager {
         // Update PS1 for Unix-like systems
         if !cfg!(windows) {
             if let Ok(ps1) = env::var("PS1") {
-                cmd.env("PS1", format!("(kee:{}) {}", account_name, ps1));
+                cmd.env("PS1", format!("(kee:{account_name}) {ps1}"));
             } else {
-                cmd.env("PS1", format!("(kee:{}) $ ", account_name));
+                cmd.env("PS1", format!("(kee:{account_name}) $ "));
             }
         }
 
         let _ = cmd.status();
 
-        println!("\n {} — Session ended.", hlt(&account_name));
+        println!("\n {} — Session ended.", hlt(account_name));
         Ok(())
     }
 
@@ -524,10 +520,10 @@ impl KeeManager {
 
         let mut output = String::new();
         for (section_name, section_map) in config.get_map_ref() {
-            output.push_str(&format!("[{}]\n", section_name));
+            output.push_str(&format!("[{section_name}]\n"));
             for (key, value_opt) in section_map {
                 if let Some(value) = value_opt {
-                    output.push_str(&format!("{} = {}\n", key, value));
+                    output.push_str(&format!("{key} = {value}\n"));
                 }
             }
             output.push('\n');
@@ -547,15 +543,15 @@ impl KeeManager {
             .read(content)
             .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
 
-        let section_name = format!("profile {}", profile_name);
+        let section_name = format!("profile {profile_name}");
         config.remove_section(&section_name);
 
         let mut output = String::new();
         for (section_name, section_map) in config.get_map_ref() {
-            output.push_str(&format!("[{}]\n", section_name));
+            output.push_str(&format!("[{section_name}]\n"));
             for (key, value_opt) in section_map {
                 if let Some(value) = value_opt {
-                    output.push_str(&format!("{} = {}\n", key, value));
+                    output.push_str(&format!("{key} = {value}\n"));
                 }
             }
             output.push('\n');
@@ -575,15 +571,15 @@ impl KeeManager {
             .read(content)
             .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
 
-        let section_name = format!("sso-session {}", session_name);
+        let section_name = format!("sso-session {session_name}");
         config.remove_section(&section_name);
 
         let mut output = String::new();
         for (section_name, section_map) in config.get_map_ref() {
-            output.push_str(&format!("[{}]\n", section_name));
+            output.push_str(&format!("[{section_name}]\n"));
             for (key, value_opt) in section_map {
                 if let Some(value) = value_opt {
-                    output.push_str(&format!("{} = {}\n", key, value));
+                    output.push_str(&format!("{key} = {value}\n"));
                 }
             }
             output.push('\n');