toast-cli 4.1.2__tar.gz → 4.1.3__tar.gz

{toast_cli-4.1.2 → toast_cli-4.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toast-cli
-Version: 4.1.2
+Version: 4.1.3
 Summary: A Python-based CLI utility with a plugin architecture for AWS, Kubernetes, Git, and more
 Home-page: https://github.com/opspresso/toast-cli
 Author: nalbam
@@ -245,12 +245,14 @@ Environment variables:
 TOAST_ENV_STORE_PROFILE   # default: {username}-admin
 TOAST_ENV_STORE_BUCKET    # default: env-store-{account-id of the profile}
 TOAST_ENV_STORE_KMS_KEY   # default: bucket/account default KMS key
-TOAST_ENV_STORE_REGION    # default: profile's region
+TOAST_ENV_STORE_REGION    # default: profile's region (SSM reads fall back to us-east-1)
 ```
 
 The profile defaults to your OS username + `-admin`, and the bucket defaults to
 `env-store-` + the AWS account id of that profile (looked up via
-`aws sts get-caller-identity`).
+`aws sts get-caller-identity`). The region resolves to the configured value, else
+the profile's region; SSM reads (which require a region) fall back to `us-east-1`
+so a missing parameter is reported as absent rather than failing.
 
 Config file `~/.config/toast/config` (`KEY=VALUE` format). On first run, if it
 is missing, toast prompts for the values and saves them (interactive sessions

{toast_cli-4.1.2 → toast_cli-4.1.3}/README.md

@@ -210,12 +210,14 @@ Environment variables:
 TOAST_ENV_STORE_PROFILE   # default: {username}-admin
 TOAST_ENV_STORE_BUCKET    # default: env-store-{account-id of the profile}
 TOAST_ENV_STORE_KMS_KEY   # default: bucket/account default KMS key
-TOAST_ENV_STORE_REGION    # default: profile's region
+TOAST_ENV_STORE_REGION    # default: profile's region (SSM reads fall back to us-east-1)
 ```
 
 The profile defaults to your OS username + `-admin`, and the bucket defaults to
 `env-store-` + the AWS account id of that profile (looked up via
-`aws sts get-caller-identity`).
+`aws sts get-caller-identity`). The region resolves to the configured value, else
+the profile's region; SSM reads (which require a region) fall back to `us-east-1`
+so a missing parameter is reported as absent rather than failing.
 
 Config file `~/.config/toast/config` (`KEY=VALUE` format). On first run, if it
 is missing, toast prompts for the values and saves them (interactive sessions

toast_cli-4.1.3/VERSION

@@ -0,0 +1 @@
+v4.1.3

{toast_cli-4.1.2 → toast_cli-4.1.3}/tests/test_storage.py

@@ -68,6 +68,12 @@ class DefaultsTests(unittest.TestCase):
 
 
 class ConfigTests(unittest.TestCase):
+    def setUp(self):
+        # Isolate the `aws configure get region` lookup from the environment.
+        p = mock.patch.object(storage, "_profile_region", return_value=None)
+        p.start()
+        self.addCleanup(p.stop)
+
     def test_defaults_no_file(self):
         with tempfile.TemporaryDirectory() as d:
             path = os.path.join(d, "config")
@@ -80,6 +86,15 @@ class ConfigTests(unittest.TestCase):
             self.assertIsNone(c.kms_key)
             self.assertIsNone(c.region)
 
+    def test_region_from_profile(self):
+        with tempfile.TemporaryDirectory() as d:
+            path = os.path.join(d, "config")
+            with mock.patch.dict(os.environ, {}, clear=True), mock.patch.object(
+                storage, "_profile_region", return_value="ap-northeast-2"
+            ), mock.patch.object(storage, "get_account_id", return_value="111122223333"):
+                c = storage.resolve_config(config_path=path, create=False)
+            self.assertEqual(c.region, "ap-northeast-2")
+
     def test_bucket_none_on_sts_failure(self):
         with tempfile.TemporaryDirectory() as d:
             path = os.path.join(d, "config")
@@ -230,6 +245,11 @@ class AwsCommandTests(unittest.TestCase):
         cmd = storage._aws(cfg, ["ssm", "get-parameter"])
         self.assertEqual(cmd[cmd.index("--region") + 1], "us-west-2")
 
+    def test_region_override_takes_precedence(self):
+        cfg = storage.StoreConfig("b", "p", None, None)
+        cmd = storage._aws(cfg, ["ssm", "x"], region="ap-northeast-2")
+        self.assertEqual(cmd[cmd.index("--region") + 1], "ap-northeast-2")
+
     def test_s3_put_uses_kms_server_side_encryption(self):
         cfg = storage.StoreConfig("b", "p", None, None)
         captured = {}
@@ -258,6 +278,26 @@ class AwsCommandTests(unittest.TestCase):
             "/toast/local/o/p/env-local", profile="myprofile", region="eu-west-1"
         )
 
+    def test_ssm_get_falls_back_to_default_region(self):
+        cfg = storage.StoreConfig("b", "myprofile", None, None)
+        with mock.patch.object(
+            storage, "get_ssm_parameter", return_value=("v", "t", None)
+        ) as m:
+            storage.ssm_get(cfg, "/toast/local/o/p/env-local")
+        m.assert_called_once_with(
+            "/toast/local/o/p/env-local",
+            profile="myprofile",
+            region=storage.DEFAULT_REGION,
+        )
+
+    def test_profile_region_lookup(self):
+        ok = mock.Mock(returncode=0, stdout="ap-northeast-2\n", stderr="")
+        with mock.patch.object(storage.subprocess, "run", return_value=ok):
+            self.assertEqual(storage._profile_region("p"), "ap-northeast-2")
+        empty = mock.Mock(returncode=0, stdout="\n", stderr="")
+        with mock.patch.object(storage.subprocess, "run", return_value=empty):
+            self.assertIsNone(storage._profile_region("p"))
+
 
 class StoreReadTests(unittest.TestCase):
     def _cfg(self):

{toast_cli-4.1.2 → toast_cli-4.1.3}/toast/plugins/storage.py

@@ -40,6 +40,11 @@ console = Console()
 PROFILE_SUFFIX = "-admin"
 BUCKET_PREFIX = "env-store-"
 
+# SSM get-parameter requires a region. When none is configured (env/file/profile)
+# this fallback keeps SSM reads from failing with NoRegion; a missing parameter
+# then returns ParameterNotFound (treated as absent) instead of an error.
+DEFAULT_REGION = "us-east-1"
+
 
 class StoreConfig:
     """Resolved env-store configuration."""
@@ -154,6 +159,21 @@ def default_profile():
     return f"{_current_username()}{PROFILE_SUFFIX}"
 
 
+def _profile_region(profile):
+    """Region configured for a profile via `aws configure get region`, or None."""
+    try:
+        result = subprocess.run(
+            ["aws", "configure", "get", "region", "--profile", profile],
+            capture_output=True,
+            text=True,
+        )
+        if result.returncode != 0:
+            return None
+        return result.stdout.strip() or None
+    except Exception:
+        return None
+
+
 def get_account_id(profile, region=None):
     """Return the AWS account id for a profile via STS, or None on failure."""
     cmd = [
@@ -205,7 +225,11 @@ def resolve_config(config_path=None, create=True):
         return os.environ.get(env_key) or file_cfg.get(file_key) or default
 
     profile = pick("TOAST_ENV_STORE_PROFILE", "ENV_STORE_PROFILE", default_profile())
-    region = pick("TOAST_ENV_STORE_REGION", "ENV_STORE_REGION", "") or None
+    region = (
+        pick("TOAST_ENV_STORE_REGION", "ENV_STORE_REGION", "")
+        or _profile_region(profile)
+        or None
+    )
     kms_key = pick("TOAST_ENV_STORE_KMS_KEY", "ENV_STORE_KMS_KEY", "") or None
     bucket = (
         os.environ.get("TOAST_ENV_STORE_BUCKET")
@@ -278,14 +302,24 @@ def parse_timestamp(value):
     return dt.astimezone(timezone.utc)
 
 
-def _aws(config, service_args):
-    """Build an aws CLI command with the env-store profile (and region) applied."""
+def _aws(config, service_args, region=None):
+    """Build an aws CLI command with the env-store profile (and region) applied.
+
+    A `region` override takes precedence over config.region (used for SSM, which
+    requires a region even when none is configured).
+    """
     cmd = ["aws"] + service_args + ["--profile", config.profile]
-    if config.region:
-        cmd += ["--region", config.region]
+    resolved = region or config.region
+    if resolved:
+        cmd += ["--region", resolved]
     return cmd
 
 
+def _ssm_region(config):
+    """Region for SSM calls: configured region, else a safe default."""
+    return config.region or DEFAULT_REGION
+
+
 def s3_get(config, key):
     """Get an object's content and LastModified.
 
@@ -417,7 +451,7 @@ def s3_list(config, prefix="local/"):
 
 def ssm_get(config, path):
     """Get an SSM parameter value and LastModified using the env-store profile."""
-    return get_ssm_parameter(path, profile=config.profile, region=config.region)
+    return get_ssm_parameter(path, profile=config.profile, region=_ssm_region(config))
 
 
 def ssm_list(config, prefix="/toast/local/"):
@@ -438,6 +472,7 @@ def ssm_list(config, prefix="/toast/local/"):
                     "--output",
                     "json",
                 ],
+                region=_ssm_region(config),
             ),
             capture_output=True,
             text=True,

{toast_cli-4.1.2 → toast_cli-4.1.3}/toast_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toast-cli
-Version: 4.1.2
+Version: 4.1.3
 Summary: A Python-based CLI utility with a plugin architecture for AWS, Kubernetes, Git, and more
 Home-page: https://github.com/opspresso/toast-cli
 Author: nalbam
@@ -245,12 +245,14 @@ Environment variables:
 TOAST_ENV_STORE_PROFILE   # default: {username}-admin
 TOAST_ENV_STORE_BUCKET    # default: env-store-{account-id of the profile}
 TOAST_ENV_STORE_KMS_KEY   # default: bucket/account default KMS key
-TOAST_ENV_STORE_REGION    # default: profile's region
+TOAST_ENV_STORE_REGION    # default: profile's region (SSM reads fall back to us-east-1)
 ```
 
 The profile defaults to your OS username + `-admin`, and the bucket defaults to
 `env-store-` + the AWS account id of that profile (looked up via
-`aws sts get-caller-identity`).
+`aws sts get-caller-identity`). The region resolves to the configured value, else
+the profile's region; SSM reads (which require a region) fall back to `us-east-1`
+so a missing parameter is reported as absent rather than failing.
 
 Config file `~/.config/toast/config` (`KEY=VALUE` format). On first run, if it
 is missing, toast prompts for the values and saves them (interactive sessions

toast_cli-4.1.2/VERSION

@@ -1 +0,0 @@
-v4.1.2