cdk-factory 0.15.6__tar.gz → 0.15.8__tar.gz

{cdk_factory-0.15.6 → cdk_factory-0.15.8}/PKG-INFO

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

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

{cdk_factory-0.15.6 → cdk_factory-0.15.8}/src/cdk_factory/lambdas/edge/ip_gate/handler.py

@@ -15,7 +15,7 @@ from functools import lru_cache
 ssm = None
 
 @lru_cache(maxsize=128)
-def get_ssm_parameter(parameter_name: str, region: str = 'us-east-1') -> str:
+def get_ssm_parameter(parameter_name: str, region: str = 'us-east-1', default: str = None) -> str:
     """
     Fetch SSM parameter with caching.
     Lambda@Edge cannot use environment variables, so we fetch from SSM.
@@ -25,9 +25,10 @@ def get_ssm_parameter(parameter_name: str, region: str = 'us-east-1') -> str:
     Args:
         parameter_name: Name of the SSM parameter
         region: AWS region (default us-east-1)
+        default: Default value to return if parameter not found (optional)
     
     Returns:
-        Parameter value, or empty string if value is 'NONE'
+        Parameter value, default value if parameter not found, or empty string if value is 'NONE'
     """
     global ssm
     if ssm is None:
@@ -43,8 +44,17 @@ def get_ssm_parameter(parameter_name: str, region: str = 'us-east-1') -> str:
             return ''
         
         return value
+    except ssm.exceptions.ParameterNotFound:
+        if default is not None:
+            print(f"SSM parameter {parameter_name} not found, using default: {default}")
+            return default
+        print(f"SSM parameter {parameter_name} not found and no default provided")
+        raise
     except Exception as e:
         print(f"Error fetching SSM parameter {parameter_name}: {str(e)}")
+        if default is not None:
+            print(f"Returning default value due to error: {default}")
+            return default
         raise
 
 
@@ -103,7 +113,7 @@ def lambda_handler(event, context):
     Configuration (fetched from SSM Parameter Store):
     - GATE_ENABLED: Whether IP gating is enabled (true/false)
     - ALLOW_CIDRS: Comma-separated list of allowed CIDR ranges
-    - MAINT_CF_HOST: CloudFront domain for maintenance/lockout page
+    - DNS_ALIAS: CloudFront domain for backup/lockout page
     
     Runtime configuration is bundled in runtime_config.json by CDK.
     SSM parameter paths are auto-generated by CDK as:
@@ -162,9 +172,9 @@ def lambda_handler(event, context):
             print(f"IP gating is disabled (GATE_ENABLED={gate_enabled or 'NONE'})")
             return request
         
-        # Get allowed CIDRs and maintenance host
+        # Get allowed CIDRs and backup 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')
+        dns_alias = get_ssm_parameter(f'/{env}/{function_name}/dns-alias', 'us-east-1')
         
         # Parse allowed CIDRs (empty string results in empty list)
         allowed_cidrs = [cidr.strip() for cidr in allow_cidrs_str.split(',') if cidr.strip()]
@@ -178,35 +188,35 @@ def lambda_handler(event, context):
             print(f"IP {client_ip} is allowed")
             return request
         
-        # IP not allowed - either redirect or proxy maintenance page
+        # IP not allowed - either redirect or proxy backup page
         # Check response mode from SSM (default: redirect for backward compatibility)
-        response_mode_param = f"/{function_name}/response-mode"
-        response_mode = get_ssm_parameter(response_mode_param, default='redirect')
+        response_mode_param = f"/{env}/{function_name}/response-mode"
+        response_mode = get_ssm_parameter(response_mode_param, 'us-east-1', default='redirect')
         
         if response_mode == 'proxy':
-            # Proxy mode: Fetch and return maintenance content (keeps URL the same)
-            print(f"IP {client_ip} is NOT allowed, proxying content from {maint_cf_host}")
+            # Proxy mode: Fetch and return backup content (keeps URL the same)
+            print(f"IP {client_ip} is NOT allowed, proxying content from {dns_alias}")
             
             try:
                 import urllib3
                 http = urllib3.PoolManager()
                 
-                # Fetch the maintenance page
-                maint_response = http.request(
+                # Fetch the backup page - always request /index.html
+                alias_response = http.request(
                     'GET', 
-                    f'https://{maint_cf_host}',
+                    f'https://{dns_alias}/index.html',
                     headers={'User-Agent': 'CloudFront-IP-Gate-Proxy'},
                     timeout=3.0
                 )
                 
-                # Return the maintenance content
+                # Return the backup content
                 response = {
-                    'status': str(maint_response.status),
-                    'statusDescription': 'OK' if maint_response.status == 200 else 'Service Unavailable',
+                    'status': str(alias_response.status),
+                    'statusDescription': 'OK' if alias_response.status == 200 else 'Service Unavailable',
                     'headers': {
                         'content-type': [{
                             'key': 'Content-Type',
-                            'value': maint_response.headers.get('Content-Type', 'text/html')
+                            'value': alias_response.headers.get('Content-Type', 'text/html')
                         }],
                         'cache-control': [{
                             'key': 'Cache-Control',
@@ -217,20 +227,20 @@ def lambda_handler(event, context):
                             'value': 'proxy'
                         }]
                     },
-                    'body': maint_response.data.decode('utf-8')
+                    'body': alias_response.data.decode('utf-8')
                 }
                 
-                print(f"Successfully proxied maintenance page (status {maint_response.status})")
+                print(f"Successfully proxied backup page (status {alias_response.status})")
                 return response
                 
             except Exception as proxy_error:
-                print(f"Error proxying maintenance content: {str(proxy_error)}")
+                print(f"Error proxying backup content: {str(proxy_error)}")
                 # Fall back to redirect if proxy fails
                 print(f"Falling back to redirect mode")
                 response_mode = 'redirect'
         
-        # Redirect mode (default): HTTP 302 redirect to maintenance site
-        print(f"IP {client_ip} is NOT allowed, redirecting to {maint_cf_host}")
+        # Redirect mode (default): HTTP 302 redirect to backup site
+        print(f"IP {client_ip} is NOT allowed, redirecting to {dns_alias}")
         
         response = {
             'status': '302',
@@ -238,7 +248,7 @@ def lambda_handler(event, context):
             'headers': {
                 'location': [{
                     'key': 'Location',
-                    'value': f'https://{maint_cf_host}'
+                    'value': f'https://{dns_alias}'
                 }],
                 'cache-control': [{
                     'key': 'Cache-Control',

{cdk_factory-0.15.6 → cdk_factory-0.15.8}/src/cdk_factory/stack_library/websites/static_website_stack.py

@@ -261,6 +261,18 @@ class StaticWebSiteStack(IStack):
                 description=f"CloudFront distribution ID for {stack_config.name}",
             )
         
+        # Export DNS alias (first alias) if configured
+        if "dns_alias" in ssm_exports and cloudfront_distribution.aliases:
+            # Export the first alias (primary domain)
+            primary_alias = cloudfront_distribution.aliases[0] if isinstance(cloudfront_distribution.aliases, list) else cloudfront_distribution.aliases
+            self.export_ssm_parameter(
+                scope=self,
+                id="SsmExportDnsAlias",
+                value=primary_alias,
+                parameter_name=ssm_exports["dns_alias"],
+                description=f"Primary DNS alias for {stack_config.name}",
+            )
+        
         logger.info(f"Exported {len(ssm_exports)} SSM parameters for stack {stack_config.name}")
 
     def __get_version_number(self, assets_path: str) -> str:

cdk_factory-0.15.8/src/cdk_factory/version.py

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

cdk_factory-0.15.6/src/cdk_factory/version.py

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