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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dayhoff-tools
-Version: 1.3.21
+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.21 → dayhoff_tools-1.3.22}/dayhoff_tools/cli/engine_commands.py

@@ -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,8 +830,8 @@ def ssh_engine(
         console.print(f"[red]❌ Engine is not running (state: {engine['state']})[/red]")
         raise typer.Exit(1)
 
-    # Determine which SSH user to use (your username for your engines, ec2-user otherwise)
-    ssh_user = username if engine["user"] == username else "ec2-user"
+    # 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] (user: {ssh_user})...")
@@ -843,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()
@@ -901,8 +907,8 @@ def config_ssh(
     # Add new entries if not cleaning
     if not clean:
         for engine in running_engines:
-            # Use engine owner's username when it's your own engine; otherwise default to ec2-user
-            ssh_user = engine['user'] if engine['user'] == username else 'ec2-user'
+            # Determine ssh user based on --admin flag
+            ssh_user = 'ec2-user' if admin else engine['user']
             new_lines.extend(
                 [
                     "",

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

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