Enable user to update existing credentials

Author: alanbijuthomas

sre_agent/cli/commands/config.py

@@ -195,51 +195,36 @@ def setup(config_path: Optional[str], full: bool):
                 console.print("   exec -l $SHELL")
                 return
 
-        # Clear existing credentials, kubectl context, and environment variables to avoid confusion
-        if platform == "aws":
-            import os
-
-            credentials_file = os.path.expanduser("~/.aws/credentials")
-            if os.path.exists(credentials_file):
-                try:
-                    os.remove(credentials_file)
-                    console.print("[dim]Cleared existing AWS credentials file[/dim]")
-                except:
-                    pass
-
-        # Clear kubectl context to force reconfiguration
-        try:
-            subprocess.run(
-                ["kubectl", "config", "unset", "current-context"],
-                capture_output=True,
-                text=True,
-                timeout=10,
-            )
-            console.print("[dim]Cleared existing kubectl context[/dim]")
-        except:
-            pass
-
-        # Clear existing .env file to force fresh setup
-        env_file = Path.cwd() / ".env"
-        if env_file.exists():
-            try:
-                env_file.unlink()
-                console.print("[dim]Cleared existing .env file[/dim]")
-            except:
-                pass
-
-        console.print(f"\nSetting up {platform.upper()} credentials...")
-
-        if platform == "aws" and detector.setup_aws_credentials():
-            primary_platform = "aws"
-        elif platform == "gcp" and detector.setup_gcp_credentials():
-            primary_platform = "gcp"
+        # Preserve existing configurations for incremental updates
+
+        # Check if credentials need setup
+        if platform in configured_cloud_platforms:
+            console.print(f"\n[green]{platform.upper()} is already configured.[/green]")
+            reconfigure = Confirm.ask(f"Reconfigure {platform.upper()} credentials?", default=False)
+            
+            if reconfigure:
+                console.print(f"\nReconfiguring {platform.upper()} credentials...")
+                if platform == "aws" and detector.setup_aws_credentials():
+                    primary_platform = "aws"
+                elif platform == "gcp" and detector.setup_gcp_credentials():
+                    primary_platform = "gcp"
+                else:
+                    console.print(f"[red]❌ {platform.upper()} configuration failed.[/red]")
+                    return
+            else:
+                primary_platform = platform
         else:
-            console.print(
-                f"[red]❌ {platform.upper()} configuration failed. SRE Agent requires cloud credentials to work.[/red]"
-            )
-            console.print("Please try again or check your cloud CLI installation.")
-            return
+            console.print(f"\nSetting up {platform.upper()} credentials...")
+            if platform == "aws" and detector.setup_aws_credentials():
+                primary_platform = "aws"
+            elif platform == "gcp" and detector.setup_gcp_credentials():
+                primary_platform = "gcp"
+            else:
+                console.print(
+                    f"[red]❌ {platform.upper()} configuration failed. SRE Agent requires cloud credentials to work.[/red]"
+                )
+                console.print("Please try again or check your cloud CLI installation.")
+                return
 
         # Step 2: Configure kubectl access after cloud platform is set up (required)
         if primary_platform and has_kubectl and not kubectl_configured:
@@ -408,21 +393,18 @@ def setup(config_path: Optional[str], full: bool):
                 "SRE Agent services need these variables to function properly."
             )
 
-            if not env_setup.interactive_setup():
-                console.print(
-                    "[red]❌ Environment variable setup failed or was cancelled.[/red]"
-                )
-                console.print(
-                    "SRE Agent requires environment variables to work properly."
-                )
-                console.print(
-                    "You can run setup again later with: [cyan]sre-agent config setup[/cyan]"
-                )
-                return
-        else:
+        # Always run interactive setup to allow updating existing variables
+        if not env_setup.interactive_setup():
+            console.print(
+                "[red]❌ Environment variable setup failed or was cancelled.[/red]"
+            )
+            console.print(
+                "SRE Agent requires environment variables to work properly."
+            )
             console.print(
-                "[green]✅ All required environment variables are configured![/green]"
+                "You can run setup again later with: [cyan]sre-agent config setup[/cyan]"
             )
+            return
     else:
         console.print(
             "[yellow]⚠️  Skipping environment setup - no cloud platform configured.[/yellow]"

sre_agent/cli/utils/env_setup.py

@@ -438,11 +438,7 @@ def interactive_setup(self) -> bool:
         required_vars = self.get_required_env_vars()
         existing_vars = self.load_existing_env()
         missing_required, missing_optional = self.check_missing_env_vars()
-        
-        if not missing_required and not missing_optional:
-            console.print("[green]✅ All environment variables are already configured![/green]")
-            return True
-        
+
         # Show what we need to configure
         if missing_required:
             console.print(f"[yellow]Missing {len(missing_required)} required variables:[/yellow]")
@@ -526,55 +522,101 @@ def interactive_setup(self) -> bool:
                     console.print(f"[green]Auto-detected GKE cluster: {auto_cluster}[/green]")
                     updated_vars['TARGET_GKE_CLUSTER_NAME'] = auto_cluster
 
-        # Configure missing required variables
-        for var_name in missing_required:
-            if var_name in updated_vars:
-                continue  # Already auto-detected
-                
+        # Configure all variables (allow updating existing ones)
+        changes_made = False
+        all_required_vars = [var for var in required_vars.keys() if required_vars[var]['required']]
+        
+        for var_name in all_required_vars:
             config = required_vars[var_name]
 
-            # Special handling for PROVIDER - show as a choice menu
+            # Special handling for PROVIDER - show as a choice menu with current value
             if var_name == "PROVIDER":
+                current_provider = existing_vars.get("PROVIDER", "")
+                
                 console.print(f"\n[cyan]LLM Provider Selection[/cyan]")
-                console.print("Which LLM provider would you like to use?")
-                console.print("  1. Anthropic (Claude)")
-                console.print("  2. Google (Gemini)")
+                if current_provider:
+                    console.print(f"Current: {current_provider}")
+                    console.print("Which LLM provider would you like to use?")
+                    console.print("  1. Anthropic (Claude)")
+                    console.print("  2. Google (Gemini)")
+                    console.print("  3. Keep current")
+                    
+                    choice = Prompt.ask("Choose provider", choices=["1", "2", "3"], default="3")
+                else:
+                    console.print("Which LLM provider would you like to use?")
+                    console.print("  1. Anthropic (Claude)")
+                    console.print("  2. Google (Gemini)")
+                    
+                    choice = Prompt.ask("Choose provider", choices=["1", "2"], default="1")
 
-                choice = Prompt.ask("Choose provider", choices=["1", "2"], default="1")
                 if choice == "1":
-                    updated_vars["PROVIDER"] = "anthropic"
-                    console.print("[green]Selected: Anthropic (Claude)[/green]")
-                else:
-                    updated_vars["PROVIDER"] = "google"
-                    console.print("[green]Selected: Google (Gemini)[/green]")
+                    new_provider = "anthropic"
+                elif choice == "2":
+                    new_provider = "google"
+                else:  # choice == "3" (keep current)
+                    new_provider = current_provider
+                
+                if new_provider != current_provider:
+                    changes_made = True
+                    console.print(f"[green]Selected: {new_provider}[/green]")
+                elif current_provider:
+                    console.print(f"[green]Keeping: {current_provider}[/green]")
+                
+                updated_vars["PROVIDER"] = new_provider
                 continue
 
+            # Get current value or provide defaults
+            current_value = existing_vars.get(var_name, "")
+            if not current_value:
+                # Provide defaults for first-time setup
+                if var_name == "MODEL":
+                    if updated_vars.get("PROVIDER") == "anthropic":
+                        current_value = "claude-3-7-sonnet-latest"
+                    elif updated_vars.get("PROVIDER") == "google":
+                        current_value = "gemini-1.5-pro"
+                elif var_name == "MAX_TOKENS":
+                    current_value = "4000"
+                elif var_name == "PROJECT_ROOT":
+                    current_value = "src" if self.minimal else "."
+                elif var_name == "GITHUB_ORGANISATION" and self.minimal:
+                    current_value = "fuzzylabs"
+                elif var_name == "GITHUB_REPO_NAME" and self.minimal:
+                    current_value = "microservices-demo"
+                elif var_name == "DEV_BEARER_TOKEN":
+                    current_value = "dev_token_" + str(hash("sre-agent"))[:8]
+
             console.print(f"\n[cyan]{var_name}[/cyan] ({config['description']})")
 
-            # Provide defaults for some variables
-            default_value = ""
-            if var_name == "MODEL":
-                if updated_vars.get("PROVIDER") == "anthropic":
-                    default_value = "claude-3-5-sonnet-20241022"
-                elif updated_vars.get("PROVIDER") == "google":
-                    default_value = "gemini-1.5-pro"
-            elif var_name == "MAX_TOKENS":
-                default_value = "4000"
-            elif var_name == "PROJECT_ROOT":
-                default_value = "src" if self.minimal else "."
-            elif var_name == "GITHUB_ORGANISATION" and self.minimal:
-                default_value = "fuzzylabs"
-            elif var_name == "GITHUB_REPO_NAME" and self.minimal:
-                default_value = "microservices-demo"
-            elif var_name == "DEV_BEARER_TOKEN":
-                default_value = "dev_token_" + str(hash("sre-agent"))[:8]
+            # Smart prompt text based on whether value exists
+            if current_value:
+                # Show current value (masked if sensitive)
+                if config['sensitive']:
+                    if len(current_value) > 6:
+                        display_value = f"{current_value[:3]}...{current_value[-3:]}"
+                    else:
+                        display_value = "*" * len(current_value)
+                else:
+                    display_value = current_value
+                
+                console.print(f"Current: {display_value}")
+                prompt_text = f"Enter {var_name} or press Enter to keep current"
+            else:
+                prompt_text = f"Enter {var_name}"
 
             if config['sensitive']:
-                value = Prompt.ask(f"Enter {var_name}", default=default_value, password=True)
+                # Don't use default for password fields to avoid showing sensitive data
+                value = Prompt.ask(prompt_text, password=True)
+                if not value:  # User pressed Enter without typing
+                    value = current_value
             else:
-                value = Prompt.ask(f"Enter {var_name}", default=default_value)
-            if value:
+                value = Prompt.ask(prompt_text, default=current_value)
+            
+            # Track changes
+            if value != current_value:
+                changes_made = True
                 updated_vars[var_name] = value
+            elif current_value:
+                updated_vars[var_name] = current_value
             elif config['required']:
                 # For required variables, empty values are not allowed
                 console.print(f"[red]❌ {var_name} is required and cannot be empty[/red]")
@@ -587,19 +629,37 @@ def interactive_setup(self) -> bool:
             if selected_provider == "google":
                 api_key_var = "GEMINI_API_KEY"
 
-            if api_key_var not in updated_vars or not updated_vars[api_key_var]:
-                console.print(f"\n[cyan]{api_key_var}[/cyan] (Required for {selected_provider} provider)")
-                if selected_provider == "anthropic":
-                    console.print("Get your API key from: https://console.anthropic.com/")
-                elif selected_provider == "google":
-                    console.print("Get your API key from: https://aistudio.google.com/app/apikey")
-                
-                api_key = Prompt.ask(f"Enter {api_key_var}", password=True)
-                if api_key:
-                    updated_vars[api_key_var] = api_key
-                else:
-                    console.print(f"[red]❌ {api_key_var} is required for the selected provider[/red]")
-                    return False
+            # Handle API key with smart prompting
+            current_api_key = existing_vars.get(api_key_var, "")
+            
+            console.print(f"\n[cyan]{api_key_var}[/cyan] (Required for {selected_provider} provider)")
+            if selected_provider == "anthropic":
+                console.print("Get your API key from: https://console.anthropic.com/")
+            elif selected_provider == "google":
+                console.print("Get your API key from: https://aistudio.google.com/app/apikey")
+            
+            if current_api_key:
+                # Show masked current value
+                masked_key = f"{current_api_key[:3]}...{current_api_key[-3:]}" if len(current_api_key) > 6 else "*" * len(current_api_key)
+                console.print(f"Current: {masked_key}")
+                prompt_text = f"Enter {api_key_var} or press Enter to keep current"
+            else:
+                prompt_text = f"Enter {api_key_var}"
+            
+            # Don't use default for password fields to avoid showing sensitive data
+            api_key = Prompt.ask(prompt_text, password=True)
+            if not api_key:  # User pressed Enter without typing
+                api_key = current_api_key
+            
+            # Track changes for API key
+            if api_key != current_api_key:
+                changes_made = True
+                updated_vars[api_key_var] = api_key
+            elif current_api_key:
+                updated_vars[api_key_var] = current_api_key
+            elif not api_key:
+                console.print(f"[red]❌ {api_key_var} is required for the selected provider[/red]")
+                return False
 
         # Ask about optional variables (skip API keys and Slack vars)
         optional_vars_to_configure = [
@@ -644,14 +704,18 @@ def interactive_setup(self) -> bool:
             elif selected_provider == "google" and "ANTHROPIC_API_KEY" not in updated_vars:
                 updated_vars["ANTHROPIC_API_KEY"] = ""
 
-        # Save to .env file
-        try:
-            self.save_env_file(updated_vars)
-            console.print(f"\n[green]✅ Environment variables saved to {self.env_file}[/green]")
+        # Save to .env file only if changes were made
+        if changes_made:
+            try:
+                self.save_env_file(updated_vars)
+                console.print(f"\n[green]✅ Environment variables updated and saved to {self.env_file}[/green]")
+                return True
+            except Exception as e:
+                console.print(f"[red]❌ Failed to save .env file: {e}[/red]")
+                return False
+        else:
+            console.print(f"\n[green]✅ No changes made - {self.env_file} unchanged[/green]")
             return True
-        except Exception as e:
-            console.print(f"[red]❌ Failed to save .env file: {e}[/red]")
-            return False
 
     def save_env_file(self, env_vars: Dict[str, str]) -> None:
         """Save environment variables to .env file."""