velocity-python 0.1.49__tar.gz → 0.1.50__tar.gz

{velocity_python-0.1.49 → velocity_python-0.1.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.1.49
+Version: 0.1.50
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT

{velocity_python-0.1.49 → velocity_python-0.1.50}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "velocity-python"
-version = "0.1.49"
+version = "0.1.50"
 authors = [
   { name="Velocity Team", email="info@codeclubs.org" },
 ]

{velocity_python-0.1.49 → velocity_python-0.1.50}/src/velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.1.49"
+__version__ = version = "0.1.50"
 
 import importlib as _importlib
 

{velocity_python-0.1.49 → velocity_python-0.1.50}/src/velocity/aws/ssm_config.py

@@ -5,6 +5,10 @@ SSM-backed configuration with environment-variable fallback.
 
     /{ProjectName}/{stage}/{key}
 
+and, on a project-scoped miss, then tries::
+
+    /Global/{stage}/{key}
+
 when SSM loading is enabled. An explicit ``VELOCITY_SSM_ENABLED`` environment
 variable still overrides the behavior, but Lambda runtimes now auto-enable SSM
 when they can resolve both project and stage from the runtime environment.
@@ -118,19 +122,37 @@ def _ssm_prefix() -> str | None:
     return None
 
 
-def _fetch(key: str) -> str | None:
-    """Single SSM GetParameter call; returns value or None on any failure."""
+def _ssm_parameter_names(key: str) -> list[str]:
     prefix = _ssm_prefix()
     if prefix is None:
+        return []
+
+    parameter_names = [f'{prefix}/{key}']
+    project = get_project_name()
+    stage = get_stage()
+    if project and stage and project != 'Global':
+        parameter_names.append(f'/Global/{stage}/{key}')
+    return parameter_names
+
+
+def _fetch(key: str) -> str | None:
+    """Resolve one key from project SSM first, then Global fallback."""
+    parameter_names = _ssm_parameter_names(key)
+    if not parameter_names:
         return None
-    param_name = f'{prefix}/{key}'
+
     try:
         import boto3
         ssm = boto3.client('ssm', region_name=get_region('us-east-1'))
-        resp = ssm.get_parameter(Name=param_name, WithDecryption=True)
-        return resp['Parameter']['Value']
+        for param_name in parameter_names:
+            try:
+                resp = ssm.get_parameter(Name=param_name, WithDecryption=True)
+                return resp['Parameter']['Value']
+            except Exception as exc:
+                logger.debug('SSM miss for %s: %s', param_name, exc)
+        return None
     except Exception as exc:
-        logger.debug('SSM miss for %s: %s', param_name, exc)
+        logger.debug('SSM client failure while resolving %s: %s', key, exc)
         return None
 
 

{velocity_python-0.1.49 → velocity_python-0.1.50}/src/velocity_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.1.49
+Version: 0.1.50
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT

{velocity_python-0.1.49 → velocity_python-0.1.50}/tests/test_ssm_config.py

@@ -83,6 +83,61 @@ def test_getenv_auto_enables_ssm_in_lambda_with_inferred_project(monkeypatch):
     client_factory.assert_called_once_with("ssm", region_name="us-west-2")
 
 
+def test_getenv_falls_back_to_global_when_project_key_missing(monkeypatch):
+    ssm_config.clear_cache()
+    monkeypatch.setenv("VELOCITY_SSM_ENABLED", "true")
+    monkeypatch.setenv("ProjectName", "BackOffice")
+    monkeypatch.setenv("ENV", "demo")
+
+    class FakeSSM:
+        def __init__(self):
+            self.calls = []
+
+        def get_parameter(self, Name, WithDecryption):
+            self.calls.append((Name, WithDecryption))
+            if Name == "/BackOffice/demo/DBHost":
+                raise Exception("missing local")
+            if Name == "/Global/demo/DBHost":
+                return {"Parameter": {"Value": "global-host"}}
+            raise AssertionError(Name)
+
+    fake_ssm = FakeSSM()
+
+    with patch("boto3.client", return_value=fake_ssm):
+        assert ssm_config.getenv("DBHost") == "global-host"
+
+    assert fake_ssm.calls == [
+        ("/BackOffice/demo/DBHost", True),
+        ("/Global/demo/DBHost", True),
+    ]
+
+
+def test_getenv_prefers_local_before_global(monkeypatch):
+    ssm_config.clear_cache()
+    monkeypatch.setenv("VELOCITY_SSM_ENABLED", "true")
+    monkeypatch.setenv("ProjectName", "BackOffice")
+    monkeypatch.setenv("ENV", "demo")
+
+    class FakeSSM:
+        def __init__(self):
+            self.calls = []
+
+        def get_parameter(self, Name, WithDecryption):
+            self.calls.append((Name, WithDecryption))
+            if Name == "/BackOffice/demo/DBHost":
+                return {"Parameter": {"Value": "local-host"}}
+            raise AssertionError(Name)
+
+    fake_ssm = FakeSSM()
+
+    with patch("boto3.client", return_value=fake_ssm):
+        assert ssm_config.getenv("DBHost") == "local-host"
+
+    assert fake_ssm.calls == [
+        ("/BackOffice/demo/DBHost", True),
+    ]
+
+
 def test_getenv_raises_on_missing_when_disabled(monkeypatch):
     ssm_config.clear_cache()
     monkeypatch.delenv("VELOCITY_SSM_ENABLED", raising=False)