aws-bootstrap-g4dn 0.4.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

aws_bootstrap/cli.py

@@ -29,6 +29,7 @@ from .ssh import (
     private_key_path,
     query_gpu_info,
     remove_ssh_host,
+    resolve_instance_id,
     run_remote_setup,
     wait_for_ssh,
 )
@@ -288,7 +289,7 @@ def launch(
 
     click.echo()
     click.secho("  Terminate:", fg="cyan")
-    click.secho(f"    aws-bootstrap terminate {instance_id} --region {config.region}", bold=True)
+    click.secho(f"    aws-bootstrap terminate {alias} --region {config.region}", bold=True)
     click.echo()
 
 
@@ -419,7 +420,8 @@ def status(region, profile, gpu, instructions):
 
     click.echo()
     first_id = instances[0]["InstanceId"]
-    click.echo("  To terminate:  " + click.style(f"aws-bootstrap terminate {first_id}", bold=True))
+    first_ref = ssh_hosts.get(first_id, first_id)
+    click.echo("  To terminate:  " + click.style(f"aws-bootstrap terminate {first_ref}", bold=True))
     click.echo()
 
 
@@ -427,18 +429,28 @@ def status(region, profile, gpu, instructions):
 @click.option("--region", default="us-west-2", show_default=True, help="AWS region.")
 @click.option("--profile", default=None, help="AWS profile override.")
 @click.option("--yes", "-y", is_flag=True, default=False, help="Skip confirmation prompt.")
-@click.argument("instance_ids", nargs=-1)
+@click.argument("instance_ids", nargs=-1, metavar="[INSTANCE_ID_OR_ALIAS]...")
 def terminate(region, profile, yes, instance_ids):
     """Terminate instances created by aws-bootstrap.
 
-    Pass specific instance IDs to terminate, or omit to terminate all
-    aws-bootstrap instances in the region.
+    Pass specific instance IDs or SSH aliases (e.g. aws-gpu1) to terminate,
+    or omit to terminate all aws-bootstrap instances in the region.
     """
     session = boto3.Session(profile_name=profile, region_name=region)
     ec2 = session.client("ec2")
 
     if instance_ids:
-        targets = list(instance_ids)
+        targets = []
+        for value in instance_ids:
+            resolved = resolve_instance_id(value)
+            if resolved is None:
+                raise CLIError(
+                    f"Could not resolve '{value}' to an instance ID.\n\n"
+                    "  It is not a valid instance ID or a known SSH alias."
+                )
+            if resolved != value:
+                info(f"Resolved alias '{value}' -> {resolved}")
+            targets.append(resolved)
     else:
         instances = find_tagged_instances(ec2, "aws-bootstrap-g4dn")
         if not instances:

aws_bootstrap/ssh.py

@@ -374,6 +374,34 @@ def list_ssh_hosts(config_path: Path | None = None) -> dict[str, str]:
     return result
 
 
+_INSTANCE_ID_RE = re.compile(r"^i-[0-9a-f]{8,17}$")
+
+
+def _is_instance_id(value: str) -> bool:
+    """Return ``True`` if *value* looks like an EC2 instance ID (``i-`` + hex)."""
+    return _INSTANCE_ID_RE.match(value) is not None
+
+
+def resolve_instance_id(value: str, config_path: Path | None = None) -> str | None:
+    """Resolve *value* to an EC2 instance ID.
+
+    If *value* already looks like an instance ID (``i-`` prefix followed by hex
+    digits) it is returned as-is.  Otherwise it is treated as an SSH host alias
+    and looked up in the managed SSH config blocks.
+
+    Returns the instance ID on success, or ``None`` if the alias was not found.
+    """
+    if _is_instance_id(value):
+        return value
+
+    hosts = list_ssh_hosts(config_path)
+    # Reverse lookup: alias -> instance_id
+    for iid, alias in hosts.items():
+        if alias == value:
+            return iid
+    return None
+
+
 @dataclass
 class SSHHostDetails:
     """Connection details parsed from an SSH config stanza."""

aws_bootstrap/tests/test_cli.py

@@ -170,6 +170,58 @@ def test_terminate_with_confirm(mock_terminate, mock_find, mock_session, mock_re
     assert mock_terminate.call_args[0][1] == ["i-abc123"]
 
 
+@patch("aws_bootstrap.cli.remove_ssh_host", return_value=None)
+@patch("aws_bootstrap.cli.boto3.Session")
+@patch("aws_bootstrap.cli.terminate_tagged_instances")
+@patch("aws_bootstrap.cli.resolve_instance_id", return_value="i-abc123")
+def test_terminate_by_alias(mock_resolve, mock_terminate, mock_session, mock_remove_ssh):
+    mock_terminate.return_value = [
+        {
+            "InstanceId": "i-abc123",
+            "PreviousState": {"Name": "running"},
+            "CurrentState": {"Name": "shutting-down"},
+        }
+    ]
+    runner = CliRunner()
+    result = runner.invoke(main, ["terminate", "--yes", "aws-gpu1"])
+    assert result.exit_code == 0
+    assert "Resolved alias 'aws-gpu1' -> i-abc123" in result.output
+    assert "Terminated 1" in result.output
+    mock_resolve.assert_called_once_with("aws-gpu1")
+    mock_terminate.assert_called_once()
+    assert mock_terminate.call_args[0][1] == ["i-abc123"]
+
+
+@patch("aws_bootstrap.cli.boto3.Session")
+@patch("aws_bootstrap.cli.resolve_instance_id", return_value=None)
+def test_terminate_unknown_alias_errors(mock_resolve, mock_session):
+    runner = CliRunner()
+    result = runner.invoke(main, ["terminate", "--yes", "aws-gpu99"])
+    assert result.exit_code != 0
+    assert "Could not resolve 'aws-gpu99'" in result.output
+
+
+@patch("aws_bootstrap.cli.remove_ssh_host", return_value=None)
+@patch("aws_bootstrap.cli.boto3.Session")
+@patch("aws_bootstrap.cli.terminate_tagged_instances")
+@patch("aws_bootstrap.cli.resolve_instance_id", return_value="i-abc123")
+def test_terminate_by_instance_id_passthrough(mock_resolve, mock_terminate, mock_session, mock_remove_ssh):
+    """Instance IDs are passed through without resolution message."""
+    mock_resolve.return_value = "i-abc123"
+    mock_terminate.return_value = [
+        {
+            "InstanceId": "i-abc123",
+            "PreviousState": {"Name": "running"},
+            "CurrentState": {"Name": "shutting-down"},
+        }
+    ]
+    runner = CliRunner()
+    result = runner.invoke(main, ["terminate", "--yes", "i-abc123"])
+    assert result.exit_code == 0
+    assert "Resolved alias" not in result.output
+    assert "Terminated 1" in result.output
+
+
 @patch("aws_bootstrap.cli.boto3.Session")
 @patch("aws_bootstrap.cli.find_tagged_instances")
 def test_terminate_cancelled(mock_find, mock_session):

aws_bootstrap/tests/test_ssh_config.py

@@ -6,6 +6,7 @@ import stat
 from pathlib import Path
 
 from aws_bootstrap.ssh import (
+    _is_instance_id,
     _next_alias,
     _read_ssh_config,
     add_ssh_host,
@@ -13,6 +14,7 @@ from aws_bootstrap.ssh import (
     get_ssh_host_details,
     list_ssh_hosts,
     remove_ssh_host,
+    resolve_instance_id,
 )
 
 
@@ -331,3 +333,77 @@ def test_get_ssh_host_details_default_port(tmp_path):
     details = get_ssh_host_details("i-abc123", config_path=cfg)
     assert details is not None
     assert details.port == 22
+
+
+# ---------------------------------------------------------------------------
+# Instance ID detection
+# ---------------------------------------------------------------------------
+
+
+def test_is_instance_id_valid_short():
+    assert _is_instance_id("i-abcdef01") is True
+
+
+def test_is_instance_id_valid_long():
+    assert _is_instance_id("i-0123456789abcdef0") is True
+
+
+def test_is_instance_id_rejects_alias():
+    assert _is_instance_id("aws-gpu1") is False
+
+
+def test_is_instance_id_rejects_empty():
+    assert _is_instance_id("") is False
+
+
+def test_is_instance_id_rejects_prefix_only():
+    assert _is_instance_id("i-") is False
+
+
+def test_is_instance_id_rejects_uppercase():
+    assert _is_instance_id("i-ABCDEF01") is False
+
+
+def test_is_instance_id_rejects_too_short():
+    assert _is_instance_id("i-abc") is False
+
+
+# ---------------------------------------------------------------------------
+# resolve_instance_id
+# ---------------------------------------------------------------------------
+
+
+def test_resolve_passthrough_instance_id(tmp_path):
+    """Instance IDs are returned as-is without consulting SSH config."""
+    cfg = _config_path(tmp_path)
+    cfg.parent.mkdir(parents=True, exist_ok=True)
+    cfg.write_text("")
+    result = resolve_instance_id("i-0123456789abcdef0", config_path=cfg)
+    assert result == "i-0123456789abcdef0"
+
+
+def test_resolve_alias_to_instance_id(tmp_path):
+    cfg = _config_path(tmp_path)
+    add_ssh_host("i-abc12345", "1.2.3.4", "ubuntu", KEY_PATH, config_path=cfg)
+    result = resolve_instance_id("aws-gpu1", config_path=cfg)
+    assert result == "i-abc12345"
+
+
+def test_resolve_alias_multiple_hosts(tmp_path):
+    cfg = _config_path(tmp_path)
+    add_ssh_host("i-111aaa11", "1.1.1.1", "ubuntu", KEY_PATH, config_path=cfg)
+    add_ssh_host("i-222bbb22", "2.2.2.2", "ubuntu", KEY_PATH, config_path=cfg)
+    assert resolve_instance_id("aws-gpu1", config_path=cfg) == "i-111aaa11"
+    assert resolve_instance_id("aws-gpu2", config_path=cfg) == "i-222bbb22"
+
+
+def test_resolve_unknown_alias_returns_none(tmp_path):
+    cfg = _config_path(tmp_path)
+    cfg.parent.mkdir(parents=True, exist_ok=True)
+    cfg.write_text("")
+    assert resolve_instance_id("aws-gpu99", config_path=cfg) is None
+
+
+def test_resolve_nonexistent_config_returns_none(tmp_path):
+    cfg = tmp_path / "no_such_file"
+    assert resolve_instance_id("aws-gpu1", config_path=cfg) is None

{aws_bootstrap_g4dn-0.4.0.dist-info → aws_bootstrap_g4dn-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-bootstrap-g4dn
-Version: 0.4.0
+Version: 0.5.0
 Summary: Bootstrap AWS EC2 GPU instances for hybrid local-remote development
 Author: Adam Ever-Hadani
 License-Expression: MIT
@@ -261,8 +261,14 @@ aws-bootstrap status --region us-east-1
 # Terminate all aws-bootstrap instances (with confirmation prompt)
 aws-bootstrap terminate
 
-# Terminate specific instances
-aws-bootstrap terminate i-abc123 i-def456
+# Terminate by SSH alias (resolved via ~/.ssh/config)
+aws-bootstrap terminate aws-gpu1
+
+# Terminate by instance ID
+aws-bootstrap terminate i-abc123
+
+# Mix aliases and instance IDs
+aws-bootstrap terminate aws-gpu1 i-def456
 
 # Skip confirmation prompt
 aws-bootstrap terminate --yes
@@ -274,7 +280,7 @@ aws-bootstrap terminate --yes
 CUDA: 12.8 (driver supports up to 13.0)
 ```
 
-SSH aliases are managed automatically — they're created on `launch`, shown in `status`, and cleaned up on `terminate`. Aliases use sequential numbering (`aws-gpu1`, `aws-gpu2`, etc.) and never reuse numbers from previous instances.
+SSH aliases are managed automatically — they're created on `launch`, shown in `status`, and cleaned up on `terminate`. Aliases use sequential numbering (`aws-gpu1`, `aws-gpu2`, etc.) and never reuse numbers from previous instances. You can use aliases anywhere you'd use an instance ID, e.g. `aws-bootstrap terminate aws-gpu1`.
 
 ## EC2 vCPU Quotas
 

{aws_bootstrap_g4dn-0.4.0.dist-info → aws_bootstrap_g4dn-0.5.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
 aws_bootstrap/__init__.py,sha256=kl_jvrunGyIyizdRqAP6ROb5P1BBrXX5PTq5gq1ipU0,82
-aws_bootstrap/cli.py,sha256=XqCKxyc294krVtggrsqm2cYrHR6DWaqQeuzrRAN5u_c,20501
+aws_bootstrap/cli.py,sha256=N2hT0XEC-4k5Cs3iGfA_xt_onc__NMNmh8fCaV4frgc,21076
 aws_bootstrap/config.py,sha256=TeCOYDlijT-KD5SFIzc-VvBhOqcq9YCgen9NK63rka8,895
 aws_bootstrap/ec2.py,sha256=LHpzW91ayK45gsWV_B4LanSZIhWggqTsL31qHUceiaA,12274
 aws_bootstrap/gpu.py,sha256=WTnHR0s3mQHDlnzqRgqAC6omWz7nT5YtGpcs0Bf88jk,692
-aws_bootstrap/ssh.py,sha256=UFRDgNR8cljV-lwMvCy_BAJQBz7gj4a_cQIulf-2A10,19226
+aws_bootstrap/ssh.py,sha256=0acHNX7IG6PUvp6T72l9kHTwUs5sVXFAyJXvUfA3qnE,20131
 aws_bootstrap/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aws_bootstrap/resources/gpu_benchmark.py,sha256=1eFt_3MXvoLhs9HahrRPhbxvtdjFaXG2Ty3GEg7Gud0,29366
 aws_bootstrap/resources/gpu_smoke_test.ipynb,sha256=XvAOEIPa5H9ri5mRZqOdknmwOwKNvCME6DzBGuhRYfg,10698
@@ -13,15 +13,15 @@ aws_bootstrap/resources/requirements.txt,sha256=gpYl1MFCfWXiAhbIUgAjuTHONz3MKci2
 aws_bootstrap/resources/saxpy.cu,sha256=1BSESEwGGCx3KWx9ZJ8jiPHQ42KzQN6i2aP0I28bPsA,1178
 aws_bootstrap/resources/tasks.json,sha256=6U8pB1N8YIWgUCfFet4ne3nYnI92tWv5D5kPiQG3Zlg,1576
 aws_bootstrap/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aws_bootstrap/tests/test_cli.py,sha256=Lwzpdovq_iJFB6qZ8NuySqzHFkQ_2Q8AAGXdITXi1Vo,32564
+aws_bootstrap/tests/test_cli.py,sha256=m_4tIX0xYZ8BxDkHPGAWiPAKo4vETaTSKSJbyn3K1Cg,34731
 aws_bootstrap/tests/test_config.py,sha256=arvET6KNl4Vqsz0zFrSdhciXGU688bfsvCr3dSpziN0,1050
 aws_bootstrap/tests/test_ec2.py,sha256=Jmqsjv973hxXbZWfGgECtm6aa2156Lzji227sYMBuMg,10547
 aws_bootstrap/tests/test_gpu.py,sha256=rbMuda_sIVbaCzkWXoLv9YIfnWztgRoP7NuVL8XHrUY,3871
-aws_bootstrap/tests/test_ssh_config.py,sha256=iQDd3hJ8to-2-QHW26Brtglfl0q0P6sCE6U_itxoNyY,11609
+aws_bootstrap/tests/test_ssh_config.py,sha256=YYtv82zBBLGioTo58iC31_5jUli1s0eoGV9VRCobOgY,14059
 aws_bootstrap/tests/test_ssh_gpu.py,sha256=dRp86Og-8GqiATSff3rxhu83mBZdGgqI4UOnoC00Ln0,1454
-aws_bootstrap_g4dn-0.4.0.dist-info/licenses/LICENSE,sha256=Hen77Mt8sazSQJ9DgrmZuAvDwo2vc5JAkR_avuFV-CM,1067
-aws_bootstrap_g4dn-0.4.0.dist-info/METADATA,sha256=0OQsG5kVwsbfT7dfaZoNrkOlfNRUrKr9NwljtLBKj1I,13483
-aws_bootstrap_g4dn-0.4.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-aws_bootstrap_g4dn-0.4.0.dist-info/entry_points.txt,sha256=T8FXfOgmLEvFi8DHaFJ3tCzId9J3_d2Y6qT98OXxCjA,57
-aws_bootstrap_g4dn-0.4.0.dist-info/top_level.txt,sha256=mix9gZRs8JUv0OMSB_rwdGcRnTKzsKgHrE5fyAn5zJw,14
-aws_bootstrap_g4dn-0.4.0.dist-info/RECORD,,
+aws_bootstrap_g4dn-0.5.0.dist-info/licenses/LICENSE,sha256=Hen77Mt8sazSQJ9DgrmZuAvDwo2vc5JAkR_avuFV-CM,1067
+aws_bootstrap_g4dn-0.5.0.dist-info/METADATA,sha256=t8m53ZodJlZyMffeSu3Wk5bMt-Dm_Jl3q_HTbRLQbYE,13728
+aws_bootstrap_g4dn-0.5.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+aws_bootstrap_g4dn-0.5.0.dist-info/entry_points.txt,sha256=T8FXfOgmLEvFi8DHaFJ3tCzId9J3_d2Y6qT98OXxCjA,57
+aws_bootstrap_g4dn-0.5.0.dist-info/top_level.txt,sha256=mix9gZRs8JUv0OMSB_rwdGcRnTKzsKgHrE5fyAn5zJw,14
+aws_bootstrap_g4dn-0.5.0.dist-info/RECORD,,