aws-bootstrap-g4dn 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

aws_bootstrap/cli.py

@@ -5,6 +5,7 @@ from datetime import UTC, datetime
 from pathlib import Path
 
 import boto3
+import botocore.exceptions
 import click
 
 from .config import LaunchConfig
@@ -56,7 +57,39 @@ def warn(msg: str) -> None:
     click.secho(f"  WARNING: {msg}", fg="yellow", err=True)
 
 
-@click.group()
+class _AWSGroup(click.Group):
+    """Click group that catches common AWS credential/auth errors."""
+
+    def invoke(self, ctx):
+        try:
+            return super().invoke(ctx)
+        except botocore.exceptions.NoCredentialsError:
+            raise CLIError(
+                "Unable to locate AWS credentials.\n\n"
+                "  Make sure you have configured AWS credentials using one of:\n"
+                "    - Set the AWS_PROFILE environment variable:  export AWS_PROFILE=<profile-name>\n"
+                "    - Pass --profile to the command:  aws-bootstrap <command> --profile <profile-name>\n"
+                "    - Configure a default profile:  aws configure\n\n"
+                "  See: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html"
+            ) from None
+        except botocore.exceptions.ProfileNotFound as e:
+            raise CLIError(f"{e}\n\n  List available profiles with:  aws configure list-profiles") from None
+        except botocore.exceptions.PartialCredentialsError as e:
+            raise CLIError(
+                f"Incomplete AWS credentials: {e}\n\n  Check your AWS configuration with:  aws configure list"
+            ) from None
+        except botocore.exceptions.ClientError as e:
+            code = e.response["Error"]["Code"]
+            if code in ("AuthFailure", "UnauthorizedOperation", "ExpiredTokenException", "ExpiredToken"):
+                raise CLIError(
+                    f"AWS authorization failed: {e.response['Error']['Message']}\n\n"
+                    "  Your credentials may be expired or lack the required permissions.\n"
+                    "  Check your AWS configuration with:  aws configure list"
+                ) from None
+            raise
+
+
+@click.group(cls=_AWSGroup)
 @click.version_option(package_name="aws-bootstrap-g4dn")
 def main():
     """Bootstrap AWS EC2 GPU instances for hybrid local-remote development."""

aws_bootstrap/tests/test_cli.py

@@ -5,6 +5,7 @@ from datetime import UTC, datetime
 from pathlib import Path
 from unittest.mock import patch
 
+import botocore.exceptions
 from click.testing import CliRunner
 
 from aws_bootstrap.cli import main
@@ -526,3 +527,112 @@ def test_status_without_gpu_flag_no_ssh(mock_find, mock_spot, mock_session, mock
     assert result.exit_code == 0
     mock_gpu.assert_not_called()
     mock_details.assert_not_called()
+
+
+# ---------------------------------------------------------------------------
+# AWS credential / auth error handling tests
+# ---------------------------------------------------------------------------
+
+
+@patch("aws_bootstrap.cli.find_tagged_instances")
+@patch("aws_bootstrap.cli.boto3.Session")
+def test_no_credentials_shows_friendly_error(mock_session, mock_find):
+    """NoCredentialsError should show a helpful message, not a raw traceback."""
+    mock_find.side_effect = botocore.exceptions.NoCredentialsError()
+    runner = CliRunner()
+    result = runner.invoke(main, ["status"])
+    assert result.exit_code != 0
+    assert "Unable to locate AWS credentials" in result.output
+    assert "AWS_PROFILE" in result.output
+    assert "--profile" in result.output
+    assert "aws configure" in result.output
+
+
+@patch("aws_bootstrap.cli.boto3.Session")
+def test_profile_not_found_shows_friendly_error(mock_session):
+    """ProfileNotFound should show the missing profile name and list command."""
+    mock_session.side_effect = botocore.exceptions.ProfileNotFound(profile="nonexistent")
+    runner = CliRunner()
+    result = runner.invoke(main, ["status", "--profile", "nonexistent"])
+    assert result.exit_code != 0
+    assert "nonexistent" in result.output
+    assert "aws configure list-profiles" in result.output
+
+
+@patch("aws_bootstrap.cli.find_tagged_instances")
+@patch("aws_bootstrap.cli.boto3.Session")
+def test_partial_credentials_shows_friendly_error(mock_session, mock_find):
+    """PartialCredentialsError should mention incomplete credentials."""
+    mock_find.side_effect = botocore.exceptions.PartialCredentialsError(
+        provider="env", cred_var="AWS_SECRET_ACCESS_KEY"
+    )
+    runner = CliRunner()
+    result = runner.invoke(main, ["status"])
+    assert result.exit_code != 0
+    assert "Incomplete AWS credentials" in result.output
+    assert "aws configure list" in result.output
+
+
+@patch("aws_bootstrap.cli.find_tagged_instances")
+@patch("aws_bootstrap.cli.boto3.Session")
+def test_expired_token_shows_friendly_error(mock_session, mock_find):
+    """ExpiredTokenException should show authorization failure with context."""
+    mock_find.side_effect = botocore.exceptions.ClientError(
+        {"Error": {"Code": "ExpiredTokenException", "Message": "The security token is expired"}},
+        "DescribeInstances",
+    )
+    runner = CliRunner()
+    result = runner.invoke(main, ["status"])
+    assert result.exit_code != 0
+    assert "AWS authorization failed" in result.output
+    assert "expired" in result.output.lower()
+
+
+@patch("aws_bootstrap.cli.find_tagged_instances")
+@patch("aws_bootstrap.cli.boto3.Session")
+def test_auth_failure_shows_friendly_error(mock_session, mock_find):
+    """AuthFailure ClientError should show authorization failure message."""
+    mock_find.side_effect = botocore.exceptions.ClientError(
+        {"Error": {"Code": "AuthFailure", "Message": "credentials are invalid"}},
+        "DescribeInstances",
+    )
+    runner = CliRunner()
+    result = runner.invoke(main, ["status"])
+    assert result.exit_code != 0
+    assert "AWS authorization failed" in result.output
+
+
+@patch("aws_bootstrap.cli.find_tagged_instances")
+@patch("aws_bootstrap.cli.boto3.Session")
+def test_unhandled_client_error_propagates(mock_session, mock_find):
+    """Non-auth ClientErrors should propagate without being caught."""
+    mock_find.side_effect = botocore.exceptions.ClientError(
+        {"Error": {"Code": "UnknownError", "Message": "something else"}},
+        "DescribeInstances",
+    )
+    runner = CliRunner()
+    result = runner.invoke(main, ["status"])
+    assert result.exit_code != 0
+    assert isinstance(result.exception, botocore.exceptions.ClientError)
+
+
+@patch("aws_bootstrap.cli.find_tagged_instances")
+@patch("aws_bootstrap.cli.boto3.Session")
+def test_no_credentials_caught_on_terminate(mock_session, mock_find):
+    """Credential errors are caught for all subcommands, not just status."""
+    mock_find.side_effect = botocore.exceptions.NoCredentialsError()
+    runner = CliRunner()
+    result = runner.invoke(main, ["terminate"])
+    assert result.exit_code != 0
+    assert "Unable to locate AWS credentials" in result.output
+
+
+@patch("aws_bootstrap.cli.list_instance_types")
+@patch("aws_bootstrap.cli.boto3.Session")
+def test_no_credentials_caught_on_list(mock_session, mock_list):
+    """Credential errors are caught for nested subcommands (list instance-types)."""
+    mock_list.side_effect = botocore.exceptions.NoCredentialsError()
+    runner = CliRunner()
+    result = runner.invoke(main, ["list", "instance-types"])
+    assert result.exit_code != 0
+    assert "Unable to locate AWS credentials" in result.output

{aws_bootstrap_g4dn-0.1.0.dist-info → aws_bootstrap_g4dn-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-bootstrap-g4dn
-Version: 0.1.0
+Version: 0.2.0
 Summary: Bootstrap AWS EC2 GPU instances for hybrid local-remote development
 Author: Adam Ever-Hadani
 License-Expression: MIT
@@ -66,6 +66,16 @@ ssh aws-gpu1                  # You're in, venv activated, PyTorch works
 pip install aws-bootstrap-g4dn
 ```
 
+### With uvx (no install needed)
+
+[uvx](https://docs.astral.sh/uv/guides/tools/) runs the CLI directly in a temporary environment — no global install required:
+
+```bash
+uvx --from aws-bootstrap-g4dn aws-bootstrap launch
+uvx --from aws-bootstrap-g4dn aws-bootstrap status
+uvx --from aws-bootstrap-g4dn aws-bootstrap terminate
+```
+
 ### From source (development)
 
 ```bash
@@ -75,7 +85,7 @@ uv venv
 uv sync
 ```
 
-Both methods install the `aws-bootstrap` CLI.
+All methods install the `aws-bootstrap` CLI.
 
 ## SSH Key Setup
 

{aws_bootstrap_g4dn-0.1.0.dist-info → aws_bootstrap_g4dn-0.2.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 aws_bootstrap/__init__.py,sha256=kl_jvrunGyIyizdRqAP6ROb5P1BBrXX5PTq5gq1ipU0,82
-aws_bootstrap/cli.py,sha256=UVMCBOfTm1q7RxVDot5d3a8SSjLj9zevbvGgWamQDQQ,16134
+aws_bootstrap/cli.py,sha256=3PWGU4djqCvABNpLvYTk473Nmmmrad3JQ3iQtg5YmnE,17917
 aws_bootstrap/config.py,sha256=bOADtpujEacED0pu9m7D781UFlMhZrmtHQ7eqI6ySjk,834
 aws_bootstrap/ec2.py,sha256=-yEyGMCycY4ccsmbgqHnLK2FRFWX2kr7nLfYWXSKeaY,12242
 aws_bootstrap/ssh.py,sha256=-8F0PAkl7CCY1b9n46ZhWJ6faIMlSvA26BleeIp-rMA,17533
@@ -9,14 +9,14 @@ aws_bootstrap/resources/gpu_smoke_test.ipynb,sha256=XvAOEIPa5H9ri5mRZqOdknmwOwKN
 aws_bootstrap/resources/remote_setup.sh,sha256=FzpXEw-LvlXROi-PmO72yEyDWWi-3Tul6D7-vFDubXQ,5460
 aws_bootstrap/resources/requirements.txt,sha256=gpYl1MFCfWXiAhbIUgAjuTHONz3MKci25msIyOkMmUk,75
 aws_bootstrap/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aws_bootstrap/tests/test_cli.py,sha256=4lvv1YqiaJ9_KnWqbDVWh2aH03by0liYvz6tx-hLj7k,18923
+aws_bootstrap/tests/test_cli.py,sha256=xGCC07aPZMc5pExo__qz7X1Tm2v9Z1Xn4K99JocESas,23627
 aws_bootstrap/tests/test_config.py,sha256=arvET6KNl4Vqsz0zFrSdhciXGU688bfsvCr3dSpziN0,1050
 aws_bootstrap/tests/test_ec2.py,sha256=Jmqsjv973hxXbZWfGgECtm6aa2156Lzji227sYMBuMg,10547
 aws_bootstrap/tests/test_ssh_config.py,sha256=Rt3e7B22d8kK0PzFgXB4gwpF4HvIseiqzcpouCwMo5M,10333
 aws_bootstrap/tests/test_ssh_gpu.py,sha256=W6GQzILCy_qPrvWQlCC8Ris-vuTzTGiyNXEyMzwD1kM,5154
-aws_bootstrap_g4dn-0.1.0.dist-info/licenses/LICENSE,sha256=Hen77Mt8sazSQJ9DgrmZuAvDwo2vc5JAkR_avuFV-CM,1067
-aws_bootstrap_g4dn-0.1.0.dist-info/METADATA,sha256=FT4d1jH8ANZ_Kfc_5VXt6jMEFIHsIJ2PzeyU3UnXHA0,11596
-aws_bootstrap_g4dn-0.1.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-aws_bootstrap_g4dn-0.1.0.dist-info/entry_points.txt,sha256=T8FXfOgmLEvFi8DHaFJ3tCzId9J3_d2Y6qT98OXxCjA,57
-aws_bootstrap_g4dn-0.1.0.dist-info/top_level.txt,sha256=mix9gZRs8JUv0OMSB_rwdGcRnTKzsKgHrE5fyAn5zJw,14
-aws_bootstrap_g4dn-0.1.0.dist-info/RECORD,,
+aws_bootstrap_g4dn-0.2.0.dist-info/licenses/LICENSE,sha256=Hen77Mt8sazSQJ9DgrmZuAvDwo2vc5JAkR_avuFV-CM,1067
+aws_bootstrap_g4dn-0.2.0.dist-info/METADATA,sha256=XqtBIr0EdnRvsy83usvZ5n-B9WNpfLCGoVaVR9_1eaI,11927
+aws_bootstrap_g4dn-0.2.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+aws_bootstrap_g4dn-0.2.0.dist-info/entry_points.txt,sha256=T8FXfOgmLEvFi8DHaFJ3tCzId9J3_d2Y6qT98OXxCjA,57
+aws_bootstrap_g4dn-0.2.0.dist-info/top_level.txt,sha256=mix9gZRs8JUv0OMSB_rwdGcRnTKzsKgHrE5fyAn5zJw,14
+aws_bootstrap_g4dn-0.2.0.dist-info/RECORD,,