cdk-factory 0.8.2__py3-none-any.whl → 0.8.4__py3-none-any.whl

cdk_factory/stack_library/api_gateway/api_gateway_stack.py

@@ -332,6 +332,19 @@ class ApiGatewayStack(IStack, EnhancedSsmParameterMixin):
             api_gateway, route_config, self.stack_config, api_id
         )
 
+    def _get_route_suffix(self, route: dict) -> str:
+        """
+        Calculate a unique suffix for route construct IDs.
+        Uses 'name' field if provided, otherwise includes method + path for uniqueness.
+        """
+        if "name" in route and route["name"]:
+            return route["name"]  # Use the unique name provided in config
+        else:
+            # Include method to ensure uniqueness when same path has multiple methods
+            method = route.get("method", "GET").upper()
+            path_suffix = route["path"].strip("/").replace("/", "-") or "health"
+            return f"{method.lower()}-{path_suffix}"
+    
     def _setup_lambda_routes(self, api_gateway, api_id, routes, authorizer):
         """Setup Lambda routes and integrations"""
         for route in routes:
@@ -352,7 +365,7 @@ class ApiGatewayStack(IStack, EnhancedSsmParameterMixin):
         This is the NEW PATTERN for separating Lambda and API Gateway stacks.
         """
         route_path = route["path"]
-        suffix = route_path.strip("/").replace("/", "-") or "health"
+        suffix = self._get_route_suffix(route)  # Use shared method for consistent suffix calculation
         
         # Get Lambda ARN from SSM Parameter Store
         lambda_arn = self._get_lambda_arn_from_ssm(route)
@@ -436,12 +449,8 @@ class ApiGatewayStack(IStack, EnhancedSsmParameterMixin):
         return None
 
     def _setup_single_lambda_route(self, api_gateway, api_id, route, authorizer):
-        """
-        Setup a single Lambda route with integration and CORS.
-        LEGACY PATTERN: Creates a new Lambda function inline.
-        Prefer _setup_existing_lambda_route for new implementations.
-        """
-        suffix = route["path"].strip("/").replace("/", "-") or "health"
+        """Setup a single Lambda route with integration and CORS"""
+        suffix = self._get_route_suffix(route)  # Use shared method for consistent suffix calculation
         src = route.get("src")
         handler = route.get("handler")
 

cdk_factory/utilities/json_loading_utility.py

@@ -14,16 +14,30 @@ class JsonLoadingUtility:
     """
     JSON Loading Utility
     This class is used to load a JSON file.  We have a special syntax that allows
-    chaining JSON files together using __inherits__
+    chaining JSON files together using __imports__ or __inherits__ (legacy).
+
+    The __imports__ keyword allows you to:
+    - Import from external JSON files: "__imports__": "./base-config.json"
+    - Import from nested sections: "__imports__": "workload.defaults"
+    - Import from directories: "__imports__": "./configs/"
+    - Import multiple sources: "__imports__": ["base.json", "overrides.json"]
 
     Examples:
-     TODO - show some examples
+        # Single file import
+        {"__imports__": "./base-config.json", "name": "override"}
+        
+        # Multiple imports (merged in order)
+        {"__imports__": ["base.json", "env-specific.json"]}
+        
+        # Nested section reference
+        {"__imports__": "workload.defaults.lambda"}
     """
 
     def __init__(self, path) -> None:
         self.path = path
         self.base_path = os.path.dirname(path)
-        self.nested_key = "__inherits__"
+        # Support both __imports__ (preferred) and __inherits__ (legacy)
+        self.import_keys = ["__imports__", "__inherits__"]
 
     def load(self):
         """Load and parse the JSON object for nested resources."""
@@ -60,14 +74,24 @@ class JsonLoadingUtility:
     ):
         """Resolve references in a configuration section."""
         if isinstance(section, dict):
-            if self.nested_key in section:
-                nested_paths = section.pop(self.nested_key)
+            # Check for import keys (try __imports__ first, fall back to __inherits__)
+            import_key = None
+            for key in self.import_keys:
+                if key in section:
+                    import_key = key
+                    break
+            
+            if import_key:
+                nested_paths = section.pop(import_key)
                 
                 # Support both single path (string) and multiple paths (list)
                 if isinstance(nested_paths, str):
                     nested_paths = [nested_paths]
                 elif not isinstance(nested_paths, list):
-                    raise ValueError(f"__inherits__ must be a string or list, got {type(nested_paths)}")
+                    raise ValueError(
+                        f"{import_key} must be a string or list of paths, got {type(nested_paths)}. "
+                        f"Example: '{import_key}': './base.json' or '{import_key}': ['base.json', 'overrides.json']"
+                    )
                 
                 # Process each path and merge results
                 merged_section = None

cdk_factory/utilities/lambda_function_utilities.py

@@ -295,7 +295,20 @@ class LambdaFunctionUtilities:
         if not os.path.exists(lambda_directory):
             raise FileNotFoundError(f"directory not found: {lambda_directory}")
 
-        shutil.copytree(lambda_directory, output_dir, dirs_exist_ok=True)
+        # Copy lambda directory, excluding __pycache__ and other build artifacts
+        def ignore_patterns(directory, files):
+            """Ignore __pycache__, .pyc files, and other build artifacts"""
+            return [
+                f for f in files 
+                if f == '__pycache__' 
+                or f.endswith('.pyc') 
+                or f.endswith('.pyo')
+                or f == '.pytest_cache'
+                or f == '.mypy_cache'
+                or f == '__pycache__'
+            ]
+        
+        shutil.copytree(lambda_directory, output_dir, dirs_exist_ok=True, ignore=ignore_patterns)
 
     def __requirements(
         self,
@@ -377,7 +390,8 @@ class LambdaFunctionUtilities:
                             logger.warning(f"CodeArtifact login failed (continuing): {e}")
                             # Continue with other logins or pip install
 
-                    commands = f"pip install -r {requirement} -t {output_dir}".split()
+                    # Use --upgrade to avoid warnings about existing directories
+                    commands = f"pip install -r {requirement} -t {output_dir} --upgrade".split()
                     subprocess.check_call(commands)
                 else:
                     logger.warning(

cdk_factory/version.py

@@ -1 +1 @@
-__version__ = "0.8.2"
+__version__ = "0.8.4"

{cdk_factory-0.8.2.dist-info → cdk_factory-0.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdk_factory
-Version: 0.8.2
+Version: 0.8.4
 Summary: CDK Factory. A QuickStarter and best practices setup for CDK projects
 Author-email: Eric Wilson <eric.wilson@geekcafe.com>
 License: MIT License

{cdk_factory-0.8.2.dist-info → cdk_factory-0.8.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 cdk_factory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cdk_factory/app.py,sha256=xv863N7O6HPKznB68_t7O4la9JacrkG87t9TjoDUk7s,2827
 cdk_factory/cdk.json,sha256=SKZKhJ2PBpFH78j-F8S3VDYW-lf76--Q2I3ON-ZIQfw,3106
-cdk_factory/version.py,sha256=B7GiO0rd49YwtLYjvPg4lmCZEDlMTonslQKdSImaMJk,22
+cdk_factory/version.py,sha256=jhHEJFZWhkQDemoZMomBYq-RNrKXknYzUaeIU9A6XsI,22
 cdk_factory/builds/README.md,sha256=9BBWd7bXpyKdMU_g2UljhQwrC9i5O_Tvkb6oPvndoZk,90
 cdk_factory/commands/command_loader.py,sha256=QbLquuP_AdxtlxlDy-2IWCQ6D-7qa58aphnDPtp_uTs,3744
 cdk_factory/configurations/base_config.py,sha256=JKjhNsy0RCUZy1s8n5D_aXXI-upR9izaLtCTfKYiV9k,9624
@@ -73,7 +73,7 @@ cdk_factory/stack/stack_module_registry.py,sha256=J14-A75VZESzRQa8p-Fepdap7Z8T7m
 cdk_factory/stack/stack_modules.py,sha256=kgEK-j0smZPozVwTCfM1g1V17EyTBT0TXAQZq4vZz0o,784
 cdk_factory/stack_library/__init__.py,sha256=5Y9TpIe8ZK1688G60PGcuP-hM0RvYEY_3Hl2qJCJJrw,581
 cdk_factory/stack_library/stack_base.py,sha256=tTleSFmlf26DuKVF_ytftf8P7IVWb5iex8cYfYupfvQ,4940
-cdk_factory/stack_library/api_gateway/api_gateway_stack.py,sha256=5rWHwLc6kI99YHUA1xqLtzcEhDmMB4p-xB9gLQ6o8JE,37916
+cdk_factory/stack_library/api_gateway/api_gateway_stack.py,sha256=BWhawbwGHggKQN3QLolZhdECoeTTnTBTrRo2hTJC570,38469
 cdk_factory/stack_library/auto_scaling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cdk_factory/stack_library/auto_scaling/auto_scaling_stack.py,sha256=UsFqUb_3XPJAlmZ6F75nXna3elOggD1KuFmmdmhi0Lg,19070
 cdk_factory/stack_library/aws_lambdas/lambda_stack.py,sha256=SFbBPvvCopbyiuYtq-O5sQkFCf94Wzua6aDUXiFDSB4,26161
@@ -107,12 +107,12 @@ cdk_factory/utilities/docker_utilities.py,sha256=9r8C-lXYpymqEfi3gTeWCQzHldvfjtt
 cdk_factory/utilities/environment_services.py,sha256=cd2T0efJtFPMLa1Fm7MPL-sqUlhKXCB7_XHsR8sfymE,9696
 cdk_factory/utilities/file_operations.py,sha256=HCZevKlmnHNB2wkIEPtdm-g2nJSKT3B9uipLk8Kx_Yk,8946
 cdk_factory/utilities/git_utilities.py,sha256=7Xac8PaThc7Lmk5jtDBHaJOj-fWRT017cgZmgXkVizM,3155
-cdk_factory/utilities/json_loading_utility.py,sha256=Yeqdjkkly0JLa7-V8j7ipmybsPoyPIKdRe7My7JTk3o,9203
-cdk_factory/utilities/lambda_function_utilities.py,sha256=j3tBdv_gC2MdEwBINDwAqYey5vgn7YiQtJ0XZybTsCQ,15197
+cdk_factory/utilities/json_loading_utility.py,sha256=YRgzA1I-B_HwZm1eWJTeQ1JLkebCL4C1gpHOqo6GkCA,10341
+cdk_factory/utilities/lambda_function_utilities.py,sha256=S1GvBsY_q2cyUiaud3HORJMnLhI5cRi31fbeaktY-_Q,15826
 cdk_factory/utilities/os_execute.py,sha256=5Op0LY_8Y-pUm04y1k8MTpNrmQvcLmQHPQITEP7EuSU,1019
 cdk_factory/utils/api_gateway_utilities.py,sha256=If7Xu5s_UxmuV-kL3JkXxPLBdSVUKoLtohm0IUFoiV8,4378
 cdk_factory/workload/workload_factory.py,sha256=yBUDGIuB8-5p_mGcVFxsD2ZoZIziak3yh3LL3JvS0M4,5903
-cdk_factory-0.8.2.dist-info/METADATA,sha256=PbYIaV_hrIj-7YZxLTQvR-GdLk6WErUYjuYP99HsjHA,2450
-cdk_factory-0.8.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cdk_factory-0.8.2.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
-cdk_factory-0.8.2.dist-info/RECORD,,
+cdk_factory-0.8.4.dist-info/METADATA,sha256=572maX0Tw7QqvxXl2uv9m9eL3sFTGU8ecVlQS5SdfLY,2450
+cdk_factory-0.8.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cdk_factory-0.8.4.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
+cdk_factory-0.8.4.dist-info/RECORD,,