apx-aws-lambda 0.3.1__tar.gz → 0.3.2__tar.gz

{apx_aws_lambda-0.3.1 → apx_aws_lambda-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apx-aws-lambda
-Version: 0.3.1
+Version: 0.3.2
 Summary: AWS Lambda for Action Platform: the aws/lambda deploy target (SAM) with its overlay, and tools to read stacks and functions.
 Author-email: Action Platform <cloud@actionplatform.io>
 License-Expression: Apache-2.0

{apx_aws_lambda-0.3.1 → apx_aws_lambda-0.3.2}/apx_aws_lambda/shell.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import importlib.util
 import json
+import os
 import shutil
 import subprocess
 import sys
@@ -11,6 +12,7 @@ from pathlib import Path
 from typing import Any
 
 from action_platform.core.exception import DeployError
+from action_platform.settings import settings
 
 MODULES = {"aws": "awscli", "sam": "samcli"}
 
@@ -30,11 +32,31 @@ def require(tool: str, hint: str) -> list[str]:
     raise DeployError(f"{tool} is not installed: {hint}")
 
 
+def module_env(args: list[str], env: dict[str, str] | None) -> dict[str, str] | None:
+    """`python -m awscli` in a child process must see the plugins volume the parent added with `site.addsitedir`; PYTHONPATH carries it over."""
+    if args[:1] != [sys.executable] or settings.PLUGINS_DIR is None:
+        return env
+
+    merged = dict(env if env is not None else os.environ)
+    current = merged.get("PYTHONPATH", "")
+    plugins = str(settings.PLUGINS_DIR)
+
+    if plugins not in current.split(os.pathsep):
+        merged["PYTHONPATH"] = os.pathsep.join(p for p in (plugins, current) if p)
+
+    return merged
+
+
 def run(
     args: list[str], cwd: Path | None = None, env: dict[str, str] | None = None
 ) -> str:
     result = subprocess.run(
-        args, cwd=cwd, env=env, capture_output=True, text=True, check=False
+        args,
+        cwd=cwd,
+        env=module_env(args, env),
+        capture_output=True,
+        text=True,
+        check=False,
     )
 
     if result.returncode != 0:

{apx_aws_lambda-0.3.1 → apx_aws_lambda-0.3.2}/apx_aws_lambda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apx-aws-lambda
-Version: 0.3.1
+Version: 0.3.2
 Summary: AWS Lambda for Action Platform: the aws/lambda deploy target (SAM) with its overlay, and tools to read stacks and functions.
 Author-email: Action Platform <cloud@actionplatform.io>
 License-Expression: Apache-2.0

{apx_aws_lambda-0.3.1 → apx_aws_lambda-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "apx-aws-lambda"
-version = "0.3.1"
+version = "0.3.2"
 description = "AWS Lambda for Action Platform: the aws/lambda deploy target (SAM) with its overlay, and tools to read stacks and functions."
 readme = "README.md"
 license = "Apache-2.0"

{apx_aws_lambda-0.3.1 → apx_aws_lambda-0.3.2}/tests/test_targets.py

@@ -1,6 +1,7 @@
 """The target drives `aws` and `sam`; here both are fakes, so what is asserted is the sequence and the answers."""
 
 import json
+import sys
 import unittest
 from pathlib import Path
 from tempfile import TemporaryDirectory
@@ -10,6 +11,7 @@ from action_platform.core.context import Context
 from action_platform.core.exception import DeployError
 from action_platform.core.scaffold.templates import Matrix, with_plugin_clouds
 from action_platform.plugins import Loaded, Plugins, PluginState, registry
+from action_platform.settings import settings
 
 from apx_aws_lambda import AwsLambdaPlugin, shell
 from apx_aws_lambda.lambda_ import LambdaTarget
@@ -191,3 +193,14 @@ class AssumeRoleTest(unittest.TestCase):
                 )
 
         self.assertIn("log in", str(caught.exception))
+
+
+class ModuleEnvTest(unittest.TestCase):
+    def test_the_plugins_volume_reaches_a_python_m_child(self):
+        with mock.patch.object(settings, "PLUGINS_DIR", Path("/data/plugins")):
+            env = shell.module_env([sys.executable, "-m", "awscli"], {"PATH": "/bin"})
+            same = shell.module_env(["/usr/bin/aws"], {"PATH": "/bin"})
+
+        self.assertEqual(env["PYTHONPATH"], "/data/plugins")
+        self.assertEqual(env["PATH"], "/bin")
+        self.assertEqual(same, {"PATH": "/bin"})