cdk-factory 0.13.4__tar.gz → 0.13.6__tar.gz

{cdk_factory-0.13.4 → cdk_factory-0.13.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdk_factory
-Version: 0.13.4
+Version: 0.13.6
 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.13.4 → cdk_factory-0.13.6}/pyproject.toml

@@ -33,7 +33,7 @@ markers = [
 [project]
 
 name = "cdk_factory"
-version = "0.13.4"
+version = "0.13.6"
 authors = [
   { name="Eric Wilson", email="eric.wilson@geekcafe.com" }
 ]

{cdk_factory-0.13.4 → cdk_factory-0.13.6}/src/cdk_factory/lambdas/edge/ip_gate/handler.py

@@ -20,12 +20,14 @@ def get_ssm_parameter(parameter_name: str, region: str = 'us-east-1') -> str:
     Fetch SSM parameter with caching.
     Lambda@Edge cannot use environment variables, so we fetch from SSM.
     
+    The sentinel value 'NONE' indicates an explicitly unset/disabled parameter.
+    
     Args:
         parameter_name: Name of the SSM parameter
         region: AWS region (default us-east-1)
     
     Returns:
-        Parameter value
+        Parameter value, or empty string if value is 'NONE'
     """
     global ssm
     if ssm is None:
@@ -33,7 +35,14 @@ def get_ssm_parameter(parameter_name: str, region: str = 'us-east-1') -> str:
     
     try:
         response = ssm.get_parameter(Name=parameter_name, WithDecryption=False)
-        return response['Parameter']['Value']
+        value = response['Parameter']['Value']
+        
+        # Treat 'NONE' sentinel as empty/unset
+        if value == 'NONE':
+            print(f"SSM parameter {parameter_name} is set to 'NONE' (explicitly disabled)")
+            return ''
+        
+        return value
     except Exception as e:
         print(f"Error fetching SSM parameter {parameter_name}: {str(e)}")
         raise
@@ -131,8 +140,16 @@ def lambda_handler(event, context):
         print(f"Fallback: environment={env}, function_name={function_base_name}")
     
     # Full function name for SSM paths
+    # Lambda@Edge replicas prepend region (e.g., "us-east-1.tech-talk-dev-ip-gate")
+    # Strip the region prefix to get the original function name
     function_name = context.function_name
+    if '.' in function_name and function_name.split('.')[0].startswith('us-'):
+        # Strip region prefix (e.g., "us-east-1." -> "tech-talk-dev-ip-gate")
+        function_name = '.'.join(function_name.split('.')[1:])
+        print(f"Stripped region prefix from function name: {function_name}")
+    
     print(f"Lambda function ARN: {context.invoked_function_arn}")
+    print(f"Using function name for SSM lookups: {function_name}")
     
     try:
         # Fetch configuration from SSM Parameter Store
@@ -140,15 +157,16 @@ def lambda_handler(event, context):
         gate_enabled = get_ssm_parameter(f'/{env}/{function_name}/gate-enabled', 'us-east-1')
         
         # If gating is disabled, allow all traffic
-        if gate_enabled.lower() not in ('true', '1', 'yes'):
-            print(f"IP gating is disabled (GATE_ENABLED={gate_enabled})")
+        # Empty string (from 'NONE' sentinel) is treated as disabled
+        if not gate_enabled or gate_enabled.lower() not in ('true', '1', 'yes'):
+            print(f"IP gating is disabled (GATE_ENABLED={gate_enabled or 'NONE'})")
             return request
         
         # Get allowed CIDRs and maintenance host
         allow_cidrs_str = get_ssm_parameter(f'/{env}/{function_name}/allow-cidrs', 'us-east-1')
         maint_cf_host = get_ssm_parameter(f'/{env}/{function_name}/maint-cf-host', 'us-east-1')
         
-        # Parse allowed CIDRs
+        # Parse allowed CIDRs (empty string results in empty list)
         allowed_cidrs = [cidr.strip() for cidr in allow_cidrs_str.split(',') if cidr.strip()]
         
         # Get client IP

{cdk_factory-0.13.4 → cdk_factory-0.13.6}/src/cdk_factory/stack_library/lambda_edge/lambda_edge_stack.py

@@ -368,10 +368,21 @@ class LambdaEdgeStack(IStack, EnhancedSsmParameterMixin):
             resolved_env = self._resolve_environment_variables()
             for env_key, ssm_path in env_ssm_exports.items():
                 if env_key in resolved_env:
+                    env_value = resolved_env[env_key]
+                    
+                    # Handle empty values - SSM doesn't allow empty strings
+                    # Use sentinel value "NONE" to indicate explicitly unset
+                    if not env_value or (isinstance(env_value, str) and env_value.strip() == ""):
+                        env_value = "NONE"
+                        logger.info(
+                            f"Environment variable {env_key} is empty - setting SSM parameter to 'NONE'. "
+                            f"Lambda function should treat 'NONE' as unset/disabled."
+                        )
+                    
                     self.export_ssm_parameter(
                         self,
                         f"env-{env_key}-param",
-                        resolved_env[env_key],
+                        env_value,
                         ssm_path,
                         description=f"Configuration for Lambda@Edge: {env_key}"
                     )

cdk_factory-0.13.6/src/cdk_factory/version.py

@@ -0,0 +1 @@
+__version__ = "0.13.6"

cdk_factory-0.13.4/src/cdk_factory/version.py

@@ -1 +0,0 @@
-__version__ = "0.13.4"