cdk-factory 0.19.0__tar.gz → 0.19.7__tar.gz

{cdk_factory-0.19.0 → cdk_factory-0.19.7}/PKG-INFO

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

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

{cdk_factory-0.19.0 → cdk_factory-0.19.7}/src/cdk_factory/configurations/resources/lambda_edge.py

@@ -52,13 +52,13 @@ class LambdaEdgeConfig(EnhancedBaseConfig):
         """Timeout in seconds (max 5 for origin-request)"""
         timeout = int(self._config.get("timeout", 5))
         if timeout > 5:
-            raise ValueError("Lambda@Edge origin-request timeout cannot exceed 5 seconds")
+            raise ValueError("Lambda@Edge origin-request timeout cannot exceed 5 seconds. Value was set to {}".format(timeout))
         return timeout
 
     @property
     def code_path(self) -> str:
         """Path to Lambda function code directory"""
-        return self._config.get("code_path", "./lambdas/edge/ip_gate")
+        return self._config.get("code_path", "./lambdas/cloudfront/ip_gate")
 
     @property
     def environment(self) -> Dict[str, str]:

{cdk_factory-0.19.0 → cdk_factory-0.19.7}/src/cdk_factory/configurations/resources/rds.py

@@ -29,7 +29,7 @@ class RdsConfig(EnhancedBaseConfig):
     @property
     def name(self) -> str:
         """RDS instance name"""
-        return self.__config.get("name", "database")
+        return self.__config.get("name", self.database_name)
     
     @property
     def identifier(self) -> str:

{cdk_factory-0.19.0 → cdk_factory-0.19.7}/src/cdk_factory/configurations/resources/s3.py

@@ -158,7 +158,15 @@ class S3BucketConfig(EnhancedBaseConfig):
             value = self.__config.get("block_public_access")
 
         if value and isinstance(value, str):
-            if value.lower() == "block_acls":
+            if value.lower() == "disabled":
+                # For public website hosting, disable block public access
+                return s3.BlockPublicAccess(
+                    block_public_acls=False,
+                    block_public_policy=False,
+                    ignore_public_acls=False,
+                    restrict_public_buckets=False
+                )
+            elif value.lower() == "block_acls":
                 return s3.BlockPublicAccess.BLOCK_ACLS
             # elif value.lower() == "block_public_acls":
             #     return s3.BlockPublicAccess.block_public_acls

{cdk_factory-0.19.0 → cdk_factory-0.19.7}/src/cdk_factory/constructs/cloudfront/cloudfront_distribution_construct.py

@@ -558,7 +558,7 @@ class CloudFrontDistributionConstruct(Construct):
         """
         bucket_policy = s3.BucketPolicy(
             self,
-            id=f"CloudFrontBucketPolicy-{self.source_bucket.bucket_name}",
+            id="CloudFrontBucketPolicy",
             bucket=self.source_bucket,
         )
 

{cdk_factory-0.19.0 → cdk_factory-0.19.7}/src/cdk_factory/stack_library/cloudfront/cloudfront_stack.py

@@ -14,6 +14,7 @@ from aws_cdk import (
     aws_cloudfront_origins as origins,
     aws_certificatemanager as acm,
     aws_route53 as route53,
+    aws_s3 as s3,
     aws_lambda as _lambda,
     aws_ssm as ssm,
     CfnOutput,
@@ -222,27 +223,27 @@ class CloudFrontStack(IStack):
 
     def _create_custom_origin(self, config: Dict[str, Any]) -> cloudfront.IOrigin:
         """Create custom origin (ALB, API Gateway, etc.)"""
-        domain_name = config.get("domain_name")
+        domain_name = self.resolve_ssm_value(self, config.get("domain_name"), config.get("domain_name"))
         origin_id = config.get("id")
 
         if not domain_name:
             raise ValueError("domain_name is required for custom origin")
 
-        # Check if domain name is a placeholder from ssm_imports
-        if domain_name.startswith("{{") and domain_name.endswith("}}"):
-            placeholder_key = domain_name[2:-2]  # Remove {{ and }}
-            if placeholder_key in self.ssm_imported_values:
-                domain_name = self.ssm_imported_values[placeholder_key]
-                logger.info(f"Resolved domain from SSM import: {placeholder_key}")
-            else:
-                logger.warning(f"Placeholder {domain_name} not found in SSM imports")
-
-        # Legacy support: Check if domain name is an SSM parameter reference
-        elif domain_name.startswith("{{ssm:") and domain_name.endswith("}}"):
-            # Extract SSM parameter name
-            ssm_param = domain_name[6:-2]  # Remove {{ssm: and }}
-            domain_name = ssm.StringParameter.value_from_lookup(self, ssm_param)
-            logger.info(f"Resolved domain from SSM lookup {ssm_param}: {domain_name}")
+        # # Check if domain name is a placeholder from ssm_imports
+        # if domain_name.startswith("{{") and domain_name.endswith("}}"):
+        #     placeholder_key = domain_name[2:-2]  # Remove {{ and }}
+        #     if placeholder_key in self.ssm_imported_values:
+        #         domain_name = self.ssm_imported_values[placeholder_key]
+        #         logger.info(f"Resolved domain from SSM import: {placeholder_key}")
+        #     else:
+        #         logger.warning(f"Placeholder {domain_name} not found in SSM imports")
+
+        # # Legacy support: Check if domain name is an SSM parameter reference
+        # elif domain_name.startswith("{{ssm:") and domain_name.endswith("}}"):
+        #     # Extract SSM parameter name
+        #     ssm_param = domain_name[6:-2]  # Remove {{ssm: and }}
+        #     domain_name = ssm.StringParameter.value_from_lookup(self, ssm_param)
+        #     logger.info(f"Resolved domain from SSM lookup {ssm_param}: {domain_name}")
 
         # Build custom headers (e.g., X-Origin-Secret)
         custom_headers = {}
@@ -296,11 +297,32 @@ class CloudFrontStack(IStack):
 
     def _create_s3_origin(self, config: Dict[str, Any]) -> cloudfront.IOrigin:
         """Create S3 origin"""
-        # S3 origin implementation
-        # This would use origins.S3Origin
-        raise NotImplementedError(
-            "S3 origin support - use existing static_website_stack for S3"
+        bucket_name = self.resolve_ssm_value(self, config.get("bucket_name"), config.get("bucket_name"))
+        
+
+        origin_path = config.get("origin_path", "")
+        
+        if not bucket_name:
+            raise ValueError("S3 origin requires 'bucket_name' configuration")
+        
+        # For S3 origins, we need to import the bucket by name
+        bucket = s3.Bucket.from_bucket_name(
+            self,
+            id=f"S3OriginBucket-{config.get('id', 'unknown')}",
+            bucket_name=bucket_name
+        )
+        
+        # Create S3 origin with OAC (Origin Access Control) for security
+        origin = origins.S3BucketOrigin.with_origin_access_control(
+            bucket,
+            origin_path=origin_path,
+            origin_access_levels=[
+                cloudfront.AccessLevel.READ,
+                cloudfront.AccessLevel.LIST,
+            ],
         )
+        
+        return origin
 
     def _create_distribution(self) -> None:
         """Create CloudFront distribution"""

{cdk_factory-0.19.0 → cdk_factory-0.19.7}/src/cdk_factory/stack_library/lambda_edge/lambda_edge_stack.py

@@ -132,7 +132,7 @@ class LambdaEdgeStack(IStack, StandardizedSsmMixin):
     def _create_lambda_function(self, function_name: str) -> None:
         """Create the Lambda function"""
         
-        # Resolve code path - support package references (e.g., "cdk_factory:lambdas/edge/ip_gate")
+        # Resolve code path - support package references (e.g., "cdk_factory:lambdas/cloudfront/ip_gate")
         code_path_str = self.edge_config.code_path
         
         if ':' in code_path_str:

{cdk_factory-0.19.0 → cdk_factory-0.19.7}/src/cdk_factory/stack_library/websites/static_website_stack.py

@@ -113,12 +113,16 @@ class StaticWebSiteStack(IStack):
         self, stack_config: StackConfig, workload: WorkloadConfig
     ) -> str:
         source = stack_config.dictionary.get("src", {}).get("path")
+        if not source:
+            raise ValueError("Source path is required for static website stack")
         for base in workload.paths:
-            candidate = Path(os.path.join(Path(base), source)).resolve()
+            if base is None:
+                continue
+            candidate = Path(os.path.join(str(Path(base)), source)).resolve()
 
             if candidate.exists():
                 return str(candidate)
-        raise ValueError(f"Could not find the source path: {source}")
+        raise ValueError(f"Could not find the source path for static site: {source}")
 
     def __setup_cloudfront_distribution(
         self,

cdk_factory-0.19.7/src/cdk_factory/version.py

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

cdk_factory-0.19.0/src/cdk_factory/version.py

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