dayhoff-tools 1.3.20__tar.gz → 1.3.22__tar.gz

{dayhoff_tools-1.3.20 → dayhoff_tools-1.3.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dayhoff-tools
-Version: 1.3.20
+Version: 1.3.22
 Summary: Common tools for all the repos at Dayhoff Labs
 Author: Daniel Martin-Alarcon
 Author-email: dma@dayhofflabs.com

{dayhoff_tools-1.3.20 → dayhoff_tools-1.3.22}/dayhoff_tools/cli/engine_commands.py

@@ -365,8 +365,8 @@ def get_ssh_public_key() -> str:
     )
 
 
-def update_ssh_config_entry(engine_name: str, instance_id: str, username: str):
-    """Add or update a single SSH config entry."""
+def update_ssh_config_entry(engine_name: str, instance_id: str, ssh_user: str):
+    """Add or update a single SSH config entry for the given SSH user."""
     config_path = Path.home() / ".ssh" / "config"
     config_path.parent.mkdir(mode=0o700, exist_ok=True)
 
@@ -381,7 +381,7 @@ def update_ssh_config_entry(engine_name: str, instance_id: str, username: str):
     new_entry = f"""
 Host {engine_name} {SSH_MANAGED_COMMENT}
     HostName {instance_id}
-    User ec2-user
+    User {ssh_user}
     ProxyCommand sh -c "aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'"
 """
 
@@ -808,8 +808,13 @@ def terminate_engine(
 @engine_app.command("ssh")
 def ssh_engine(
     name_or_id: str = typer.Argument(help="Engine name or instance ID"),
+    admin: bool = typer.Option(False, "--admin", help="Connect as ec2-user instead of the engine owner user"),
 ):
-    """Connect to an engine via SSH."""
+    """Connect to an engine via SSH.
+
+    By default the CLI connects using the engine's owner username (the same one stored in the `User` tag).
+    Pass `--admin` to connect with the underlying [`ec2-user`] account for break-glass or debugging.
+    """
     username = check_aws_sso()
 
     # Get all engines to resolve name
@@ -825,9 +830,12 @@ def ssh_engine(
         console.print(f"[red]❌ Engine is not running (state: {engine['state']})[/red]")
         raise typer.Exit(1)
 
+    # Choose SSH user
+    ssh_user = "ec2-user" if admin else engine["user"]
+
     # Update SSH config
-    console.print(f"Updating SSH config for [cyan]{engine['name']}[/cyan]...")
-    update_ssh_config_entry(engine["name"], engine["instance_id"], username)
+    console.print(f"Updating SSH config for [cyan]{engine['name']}[/cyan] (user: {ssh_user})...")
+    update_ssh_config_entry(engine["name"], engine["instance_id"], ssh_user)
 
     # Connect
     console.print(f"[green]✓ Connecting to {engine['name']}...[/green]")
@@ -840,6 +848,7 @@ def config_ssh(
     all_engines: bool = typer.Option(
         False, "--all", "-a", help="Include all engines from all users"
     ),
+    admin: bool = typer.Option(False, "--admin", help="Generate entries that use ec2-user instead of per-engine owner user"),
 ):
     """Update SSH config with available engines."""
     username = check_aws_sso()
@@ -898,12 +907,14 @@ def config_ssh(
     # Add new entries if not cleaning
     if not clean:
         for engine in running_engines:
+            # Determine ssh user based on --admin flag
+            ssh_user = 'ec2-user' if admin else engine['user']
             new_lines.extend(
                 [
                     "",
                     f"Host {engine['name']} {SSH_MANAGED_COMMENT}",
                     f"    HostName {engine['instance_id']}",
-                    f"    User ec2-user",
+                    f"    User {ssh_user}",
                     f"    ProxyCommand sh -c \"aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'\"",
                 ]
             )

{dayhoff_tools-1.3.20 → dayhoff_tools-1.3.22}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "dayhoff-tools"
-version = "1.3.20"
+version = "1.3.22"
 description = "Common tools for all the repos at Dayhoff Labs"
 authors = [
     {name = "Daniel Martin-Alarcon", email = "dma@dayhofflabs.com"}