feat: formatting fix

Author: abhraina-aws

crates/chat-cli/src/cli/chat/consts.rs

@@ -27,7 +27,6 @@ pub const AGENT_FORMAT_TOOLS_DOC_URL: &str =
 pub const AGENT_MIGRATION_DOC_URL: &str =
     "https://github.com/aws/amazon-q-developer-cli/blob/main/docs/legacy-profile-to-agent-migration.md";
 
-
 // The environment variable name where we set additional metadata for the AWS CLI user agent.
 pub const USER_AGENT_ENV_VAR: &str = "AWS_EXECUTION_ENV";
 pub const USER_AGENT_APP_NAME: &str = "AmazonQ-For-CLI";

crates/chat-cli/src/cli/chat/tools/execute/mod.rs

@@ -10,6 +10,7 @@ use regex::Regex;
 use serde::Deserialize;
 use tracing::error;
 
+use super::env_vars_with_user_agent;
 use crate::cli::agent::{
     Agent,
     PermissionEvalResult,
@@ -23,8 +24,6 @@ use crate::cli::chat::tools::{
 use crate::cli::chat::util::truncate_safe;
 use crate::os::Os;
 
-use super::env_vars_with_user_agent;
-
 // Platform-specific modules
 #[cfg(windows)]
 mod windows;
@@ -249,7 +248,6 @@ pub fn format_output(output: &str, max_size: usize) -> String {
     )
 }
 
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -391,19 +389,22 @@ mod tests {
     #[tokio::test]
     async fn test_cloudtrail_tracking() {
         use crate::cli::chat::consts::{
-            USER_AGENT_APP_NAME, USER_AGENT_ENV_VAR, USER_AGENT_VERSION_KEY, USER_AGENT_VERSION_VALUE,
+            USER_AGENT_APP_NAME,
+            USER_AGENT_ENV_VAR,
+            USER_AGENT_VERSION_KEY,
+            USER_AGENT_VERSION_VALUE,
         };
-        
+
         let os = Os::new().await.unwrap();
-        
+
         // Test that env_vars_with_user_agent sets the AWS_EXECUTION_ENV variable correctly
         let env_vars = env_vars_with_user_agent(&os);
-        
+
         // Check that AWS_EXECUTION_ENV is set
         assert!(env_vars.contains_key(USER_AGENT_ENV_VAR));
-        
+
         let user_agent_value = env_vars.get(USER_AGENT_ENV_VAR).unwrap();
-        
+
         // Check the format is correct
         let expected_metadata = format!(
             "{} {}/{}",
@@ -415,19 +416,20 @@ mod tests {
     #[tokio::test]
     async fn test_cloudtrail_tracking_with_existing_env() {
         use crate::cli::chat::consts::{
-            USER_AGENT_APP_NAME, USER_AGENT_ENV_VAR,
+            USER_AGENT_APP_NAME,
+            USER_AGENT_ENV_VAR,
         };
-        
+
         let os = Os::new().await.unwrap();
-        
+
         // Set an existing AWS_EXECUTION_ENV value (safe because Os uses in-memory hashmap in tests)
         unsafe {
             os.env.set_var(USER_AGENT_ENV_VAR, "ExistingValue");
         }
-        
+
         let env_vars = env_vars_with_user_agent(&os);
         let user_agent_value = env_vars.get(USER_AGENT_ENV_VAR).unwrap();
-        
+
         // Should contain both the existing value and our metadata
         assert!(user_agent_value.contains("ExistingValue"));
         assert!(user_agent_value.contains(USER_AGENT_APP_NAME));

crates/chat-cli/src/cli/chat/tools/execute/unix.rs

@@ -12,8 +12,8 @@ use tracing::error;
 
 use super::{
     CommandResult,
-    format_output,
     env_vars_with_user_agent,
+    format_output,
 };
 use crate::os::Os;
 

crates/chat-cli/src/cli/chat/tools/execute/windows.rs

@@ -12,8 +12,8 @@ use tracing::error;
 
 use super::{
     CommandResult,
-    format_output,
     env_vars_with_user_agent,
+    format_output,
 };
 use crate::os::Os;
 
@@ -30,7 +30,6 @@ pub async fn run_command<W: Write>(
     max_result_size: usize,
     mut updates: Option<W>,
 ) -> Result<CommandResult> {
-    
     // Set up environment variables with user agent metadata for CloudTrail tracking
     let env_vars = env_vars_with_user_agent(os);
 

crates/chat-cli/src/cli/chat/tools/mod.rs

@@ -38,7 +38,10 @@ use tracing::error;
 use use_aws::UseAws;
 
 use super::consts::{
-    MAX_TOOL_RESPONSE_SIZE, USER_AGENT_APP_NAME, USER_AGENT_ENV_VAR, USER_AGENT_VERSION_KEY,
+    MAX_TOOL_RESPONSE_SIZE,
+    USER_AGENT_APP_NAME,
+    USER_AGENT_ENV_VAR,
+    USER_AGENT_VERSION_KEY,
     USER_AGENT_VERSION_VALUE,
 };
 use super::util::images::RichImageBlocks;
@@ -433,7 +436,7 @@ pub fn env_vars_with_user_agent(os: &Os) -> std::collections::HashMap<String, St
 
     // Check if the user agent metadata env var already exists using Os
     let existing_value = os.env.get(USER_AGENT_ENV_VAR).ok();
-    
+
     // If the user agent metadata env var already exists, append to it, otherwise set it
     if let Some(existing_value) = existing_value {
         if !existing_value.is_empty() {

crates/chat-cli/src/cli/chat/tools/use_aws.rs

@@ -22,15 +22,14 @@ use super::{
     InvokeOutput,
     MAX_TOOL_RESPONSE_SIZE,
     OutputKind,
+    env_vars_with_user_agent,
 };
 use crate::cli::agent::{
     Agent,
     PermissionEvalResult,
 };
 use crate::os::Os;
 
-use super::env_vars_with_user_agent;
-
 const READONLY_OPS: [&str; 6] = ["get", "describe", "list", "ls", "search", "batch_get"];
 
 // TODO: we should perhaps composite this struct with an interface that we can use to mock the