cdk-factory 0.16.15__py3-none-any.whl → 0.20.0__py3-none-any.whl

cdk_factory/stack_library/cognito/cognito_stack.py

@@ -17,7 +17,7 @@ from cdk_factory.configurations.deployment import DeploymentConfig
 from cdk_factory.configurations.resources.cognito import CognitoConfig
 from cdk_factory.configurations.stack import StackConfig
 from cdk_factory.interfaces.istack import IStack
-from cdk_factory.interfaces.enhanced_ssm_parameter_mixin import EnhancedSsmParameterMixin
+from cdk_factory.interfaces.standardized_ssm_mixin import StandardizedSsmMixin
 from cdk_factory.stack.stack_module_registry import register_stack
 from cdk_factory.workload.workload_factory import WorkloadConfig
 
@@ -26,7 +26,7 @@ logger = Logger(__name__)
 
 @register_stack("cognito_library_module")
 @register_stack("cognito_stack")
-class CognitoStack(IStack, EnhancedSsmParameterMixin):
+class CognitoStack(IStack, StandardizedSsmMixin):
     """
     Cognito Stack - Creates a Cognito User Pool with configurable settings.
     """
@@ -40,6 +40,14 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
         self.user_pool: cognito.UserPool | None = None
         self.app_clients: dict = {}  # Store created app clients by name
 
+    def _build_resource_name(self, name: str) -> str:
+        """Build resource name using deployment configuration"""
+        if self.deployment:
+            return self.deployment.build_resource_name(name)
+        else:
+            # Fallback naming pattern
+            return f"{self.cognito_config.user_pool_name or 'cognito'}-{name}"
+
     def build(
         self,
         stack_config: StackConfig,
@@ -50,10 +58,10 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
         self.stack_config = stack_config
         self.deployment = deployment
         self.cognito_config = CognitoConfig(stack_config.dictionary.get("cognito", {}))
-        
+
         # Create user pool with configuration
         self._create_user_pool_with_config()
-        
+
         # Create app clients if configured
         if self.cognito_config.app_clients:
             self._create_app_clients()
@@ -151,7 +159,7 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
 
         self.user_pool = cognito.UserPool(
             self,
-            id=self.deployment.build_resource_name(
+            id=self._build_resource_name(
                 self.cognito_config.user_pool_name
                 or self.cognito_config.user_pool_id
                 or "user-pool"
@@ -166,21 +174,21 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
         """Create app clients for the user pool based on configuration"""
         if not self.user_pool:
             raise ValueError("User pool must be created before app clients")
-        
+
         for client_config in self.cognito_config.app_clients:
             client_name = client_config.get("name")
             if not client_name:
                 raise ValueError("App client name is required")
-            
+
             # Build authentication flows
             auth_flows = self._build_auth_flows(client_config.get("auth_flows", {}))
-            
+
             # Build OAuth settings
             oauth_settings = self._build_oauth_settings(client_config.get("oauth"))
-            
+
             # Build token validity settings
             token_validity = self._build_token_validity(client_config)
-            
+
             # Build app client kwargs
             client_kwargs = {
                 "user_pool": self.user_pool,
@@ -188,68 +196,78 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
                 "generate_secret": client_config.get("generate_secret", False),
                 "auth_flows": auth_flows,
                 "o_auth": oauth_settings,
-                "prevent_user_existence_errors": client_config.get("prevent_user_existence_errors"),
-                "enable_token_revocation": client_config.get("enable_token_revocation", True),
+                "prevent_user_existence_errors": client_config.get(
+                    "prevent_user_existence_errors"
+                ),
+                "enable_token_revocation": client_config.get(
+                    "enable_token_revocation", True
+                ),
                 "access_token_validity": token_validity.get("access_token"),
                 "id_token_validity": token_validity.get("id_token"),
                 "refresh_token_validity": token_validity.get("refresh_token"),
-                "read_attributes": self._build_attributes(client_config.get("read_attributes")),
-                "write_attributes": self._build_attributes(client_config.get("write_attributes")),
+                "read_attributes": self._build_attributes(
+                    client_config.get("read_attributes")
+                ),
+                "write_attributes": self._build_attributes(
+                    client_config.get("write_attributes")
+                ),
                 "supported_identity_providers": self._build_identity_providers(
                     client_config.get("supported_identity_providers")
                 ),
             }
-            
+
             # Remove None values
             client_kwargs = {k: v for k, v in client_kwargs.items() if v is not None}
-            
+
             # Create the app client
             app_client = cognito.UserPoolClient(
                 self,
-                id=self.deployment.build_resource_name(f"{client_name}-client"),
+                id=self._build_resource_name(f"{client_name}-client"),
                 **client_kwargs,
             )
-            
+
             # Store reference
             self.app_clients[client_name] = app_client
             logger.info(f"Created Cognito App Client: {client_name}")
-            
+
             # Store client secret in Secrets Manager if generated
             if client_config.get("generate_secret", False):
                 self._store_client_secret_in_secrets_manager(
                     client_name, app_client, self.user_pool
                 )
-    
+
     def _build_auth_flows(self, auth_flows_config: dict) -> cognito.AuthFlow:
         """
         Build authentication flows from configuration.
-        
+
         Note: CDK automatically adds ALLOW_REFRESH_TOKEN_AUTH to all app clients,
         which is required for token refresh functionality.
         """
         if not auth_flows_config:
             return None
-        
+
         return cognito.AuthFlow(
             user_password=auth_flows_config.get("user_password", False),
             user_srp=auth_flows_config.get("user_srp", False),
             custom=auth_flows_config.get("custom", False),
             admin_user_password=auth_flows_config.get("admin_user_password", False),
         )
-    
+
     def _build_oauth_settings(self, oauth_config: dict) -> cognito.OAuthSettings:
         """Build OAuth settings from configuration"""
         if not oauth_config:
             return None
-        
+
         # Build OAuth flows
         flows_config = oauth_config.get("flows", {})
         flows = cognito.OAuthFlows(
-            authorization_code_grant=flows_config.get("authorization_code_grant", False),
+            authorization_code_grant=flows_config.get(
+                "authorization_code_grant", False
+            ),
             implicit_code_grant=flows_config.get("implicit_code_grant", False),
             client_credentials=flows_config.get("client_credentials", False),
         )
-        
+
         # Build OAuth scopes
         scopes = []
         scope_list = oauth_config.get("scopes", [])
@@ -267,18 +285,18 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
             else:
                 # Custom scope
                 scopes.append(cognito.OAuthScope.custom(scope))
-        
+
         return cognito.OAuthSettings(
             flows=flows,
             scopes=scopes if scopes else None,
             callback_urls=oauth_config.get("callback_urls"),
             logout_urls=oauth_config.get("logout_urls"),
         )
-    
+
     def _build_token_validity(self, client_config: dict) -> dict:
         """Build token validity settings from configuration"""
         result = {}
-        
+
         # Access token validity
         if "access_token_validity" in client_config:
             validity = client_config["access_token_validity"]
@@ -288,7 +306,7 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
                 result["access_token"] = cdk.Duration.hours(validity["hours"])
             elif "days" in validity:
                 result["access_token"] = cdk.Duration.days(validity["days"])
-        
+
         # ID token validity
         if "id_token_validity" in client_config:
             validity = client_config["id_token_validity"]
@@ -298,7 +316,7 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
                 result["id_token"] = cdk.Duration.hours(validity["hours"])
             elif "days" in validity:
                 result["id_token"] = cdk.Duration.days(validity["days"])
-        
+
         # Refresh token validity
         if "refresh_token_validity" in client_config:
             validity = client_config["refresh_token_validity"]
@@ -308,51 +326,89 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
                 result["refresh_token"] = cdk.Duration.hours(validity["hours"])
             elif "days" in validity:
                 result["refresh_token"] = cdk.Duration.days(validity["days"])
-        
+
         return result
-    
+
     def _build_attributes(self, attribute_list: list) -> cognito.ClientAttributes:
         """Build client attributes from configuration"""
         if not attribute_list:
             return None
-        
+
         # Standard attributes mapping
         standard_attrs = {
-            "address": lambda: cognito.ClientAttributes().with_standard_attributes(address=True),
-            "birthdate": lambda: cognito.ClientAttributes().with_standard_attributes(birthdate=True),
-            "email": lambda: cognito.ClientAttributes().with_standard_attributes(email=True),
-            "email_verified": lambda: cognito.ClientAttributes().with_standard_attributes(email_verified=True),
-            "family_name": lambda: cognito.ClientAttributes().with_standard_attributes(family_name=True),
-            "gender": lambda: cognito.ClientAttributes().with_standard_attributes(gender=True),
-            "given_name": lambda: cognito.ClientAttributes().with_standard_attributes(given_name=True),
-            "locale": lambda: cognito.ClientAttributes().with_standard_attributes(locale=True),
-            "middle_name": lambda: cognito.ClientAttributes().with_standard_attributes(middle_name=True),
-            "name": lambda: cognito.ClientAttributes().with_standard_attributes(fullname=True),
-            "nickname": lambda: cognito.ClientAttributes().with_standard_attributes(nickname=True),
-            "phone_number": lambda: cognito.ClientAttributes().with_standard_attributes(phone_number=True),
-            "phone_number_verified": lambda: cognito.ClientAttributes().with_standard_attributes(phone_number_verified=True),
-            "picture": lambda: cognito.ClientAttributes().with_standard_attributes(picture=True),
-            "preferred_username": lambda: cognito.ClientAttributes().with_standard_attributes(preferred_username=True),
-            "profile": lambda: cognito.ClientAttributes().with_standard_attributes(profile=True),
-            "timezone": lambda: cognito.ClientAttributes().with_standard_attributes(timezone=True),
-            "updated_at": lambda: cognito.ClientAttributes().with_standard_attributes(last_update_time=True),
-            "website": lambda: cognito.ClientAttributes().with_standard_attributes(website=True),
+            "address": lambda: cognito.ClientAttributes().with_standard_attributes(
+                address=True
+            ),
+            "birthdate": lambda: cognito.ClientAttributes().with_standard_attributes(
+                birthdate=True
+            ),
+            "email": lambda: cognito.ClientAttributes().with_standard_attributes(
+                email=True
+            ),
+            "email_verified": lambda: cognito.ClientAttributes().with_standard_attributes(
+                email_verified=True
+            ),
+            "family_name": lambda: cognito.ClientAttributes().with_standard_attributes(
+                family_name=True
+            ),
+            "gender": lambda: cognito.ClientAttributes().with_standard_attributes(
+                gender=True
+            ),
+            "given_name": lambda: cognito.ClientAttributes().with_standard_attributes(
+                given_name=True
+            ),
+            "locale": lambda: cognito.ClientAttributes().with_standard_attributes(
+                locale=True
+            ),
+            "middle_name": lambda: cognito.ClientAttributes().with_standard_attributes(
+                middle_name=True
+            ),
+            "name": lambda: cognito.ClientAttributes().with_standard_attributes(
+                fullname=True
+            ),
+            "nickname": lambda: cognito.ClientAttributes().with_standard_attributes(
+                nickname=True
+            ),
+            "phone_number": lambda: cognito.ClientAttributes().with_standard_attributes(
+                phone_number=True
+            ),
+            "phone_number_verified": lambda: cognito.ClientAttributes().with_standard_attributes(
+                phone_number_verified=True
+            ),
+            "picture": lambda: cognito.ClientAttributes().with_standard_attributes(
+                picture=True
+            ),
+            "preferred_username": lambda: cognito.ClientAttributes().with_standard_attributes(
+                preferred_username=True
+            ),
+            "profile": lambda: cognito.ClientAttributes().with_standard_attributes(
+                profile=True
+            ),
+            "timezone": lambda: cognito.ClientAttributes().with_standard_attributes(
+                timezone=True
+            ),
+            "updated_at": lambda: cognito.ClientAttributes().with_standard_attributes(
+                last_update_time=True
+            ),
+            "website": lambda: cognito.ClientAttributes().with_standard_attributes(
+                website=True
+            ),
         }
-        
+
         # Start with empty attributes
         attrs = cognito.ClientAttributes()
-        
+
         # Build standard attributes
         standard_dict = {}
         custom_list = []
-        
+
         for attr in attribute_list:
             if attr in standard_attrs:
                 standard_dict[attr] = True
             else:
                 # Custom attribute
                 custom_list.append(attr)
-        
+
         # Apply standard attributes if any
         if standard_dict:
             # Map attribute names to CDK parameter names
@@ -377,22 +433,22 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
                 "updated_at": "last_update_time",
                 "website": "website",
             }
-            
+
             # Convert to CDK parameter names
             cdk_attrs = {attr_mapping.get(k, k): v for k, v in standard_dict.items()}
             attrs = attrs.with_standard_attributes(**cdk_attrs)
-        
+
         # Add custom attributes if any
         if custom_list:
             attrs = attrs.with_custom_attributes(*custom_list)
-        
+
         return attrs
-    
+
     def _build_identity_providers(self, providers: list) -> list:
         """Build identity provider list from configuration"""
         if not providers:
             return None
-        
+
         result = []
         for provider in providers:
             if isinstance(provider, str):
@@ -408,15 +464,17 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
                     result.append(cognito.UserPoolClientIdentityProvider.APPLE)
                 else:
                     # Custom provider
-                    result.append(cognito.UserPoolClientIdentityProvider.custom(provider))
-        
+                    result.append(
+                        cognito.UserPoolClientIdentityProvider.custom(provider)
+                    )
+
         return result if result else None
 
     def _store_client_secret_in_secrets_manager(
         self,
         client_name: str,
         app_client: cognito.UserPoolClient,
-        user_pool: cognito.UserPool
+        user_pool: cognito.UserPool,
     ):
         """
         Store Cognito app client secret in AWS Secrets Manager.
@@ -438,37 +496,37 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
                     f"{client_name}-secret-{app_client.user_pool_client_id}"
                 ),
             ),
-            policy=cr.AwsCustomResourcePolicy.from_statements([
-                iam.PolicyStatement(
-                    actions=["cognito-idp:DescribeUserPoolClient"],
-                    resources=[user_pool.user_pool_arn],
-                )
-            ]),
+            policy=cr.AwsCustomResourcePolicy.from_statements(
+                [
+                    iam.PolicyStatement(
+                        actions=["cognito-idp:DescribeUserPoolClient"],
+                        resources=[user_pool.user_pool_arn],
+                    )
+                ]
+            ),
         )
-        
+
         # Get the client secret from the custom resource response
         client_secret = get_client_secret.get_response_field(
             "UserPoolClient.ClientSecret"
         )
-        
+
         # Create secret in Secrets Manager
         secret = secretsmanager.Secret(
             self,
             f"{client_name}-client-secret",
-            secret_name=self.deployment.build_resource_name(
+            secret_name=self._build_resource_name(
                 f"cognito/{client_name}/client-secret"
             ),
             description=f"Cognito app client secret for {client_name}",
             secret_string_value=cdk.SecretValue.unsafe_plain_text(client_secret),
         )
-        
+
         # Also store client ID in the same secret for convenience
         secret_with_metadata = secretsmanager.Secret(
             self,
             f"{client_name}-client-credentials",
-            secret_name=self.deployment.build_resource_name(
-                f"cognito/{client_name}/credentials"
-            ),
+            secret_name=self._build_resource_name(f"cognito/{client_name}/credentials"),
             description=f"Cognito app client credentials for {client_name}",
             secret_object_value={
                 "client_id": cdk.SecretValue.unsafe_plain_text(
@@ -480,18 +538,18 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
                 ),
             },
         )
-        
+
         logger.info(
             f"Stored client secret for {client_name} in Secrets Manager: "
             f"{secret_with_metadata.secret_name}"
         )
-        
+
         # Export secret ARN to SSM for cross-stack reference
         if self.cognito_config.ssm.get("enabled"):
             safe_client_name = client_name.replace("-", "_").replace(" ", "_")
             org = self.cognito_config.ssm.get("organization", "default")
             env = self.cognito_config.ssm.get("environment", "dev")
-            
+
             ssm.StringParameter(
                 self,
                 f"{client_name}-secret-arn-param",
@@ -502,37 +560,39 @@ class CognitoStack(IStack, EnhancedSsmParameterMixin):
 
     def _export_ssm_parameters(self, user_pool: cognito.UserPool):
         """Export Cognito resources to SSM using enhanced SSM parameter mixin"""
-        
+
         # Setup enhanced SSM integration with proper resource type and name
         # Use "user-pool" as resource identifier for SSM paths, not the full pool name
-        
-        self.setup_enhanced_ssm_integration(
+
+        self.setup_ssm_integration(
             scope=self,
             config=self.stack_config.dictionary.get("cognito", {}),
             resource_type="cognito",
-            resource_name="user-pool"
+            resource_name="user-pool",
         )
-        
+
         # Prepare resource values for export
         resource_values = {
             "user_pool_id": user_pool.user_pool_id,
             "user_pool_name": self.cognito_config.user_pool_name,
             "user_pool_arn": user_pool.user_pool_arn,
         }
-        
+
         # Add app client IDs to export
         for client_name, app_client in self.app_clients.items():
             # Export client ID
             safe_client_name = client_name.replace("-", "_").replace(" ", "_")
-            resource_values[f"app_client_{safe_client_name}_id"] = app_client.user_pool_client_id
-            
+            resource_values[f"app_client_{safe_client_name}_id"] = (
+                app_client.user_pool_client_id
+            )
+
             # Note: Client secrets cannot be exported via SSM as they are only available
             # at creation time and CDK doesn't expose them. Use AWS Secrets Manager
             # or retrieve via AWS Console/CLI if needed.
-        
+
         # Use enhanced SSM parameter export
-        exported_params = self.auto_export_resources(resource_values)
-        
+        exported_params = self.export_ssm_parameters(resource_values)
+
         if exported_params:
             logger.info(f"Exported {len(exported_params)} Cognito parameters to SSM")
         else:

cdk_factory/stack_library/dynamodb/dynamodb_stack.py

@@ -9,7 +9,7 @@ import aws_cdk as cdk
 from aws_cdk import aws_dynamodb as dynamodb
 from constructs import Construct
 from cdk_factory.interfaces.istack import IStack
-from cdk_factory.interfaces.enhanced_ssm_parameter_mixin import EnhancedSsmParameterMixin
+from cdk_factory.interfaces.standardized_ssm_mixin import StandardizedSsmMixin
 from aws_lambda_powertools import Logger
 from cdk_factory.stack.stack_module_registry import register_stack
 from typing import List, Dict, Any, Optional
@@ -23,7 +23,7 @@ logger = Logger(service="DynamoDBStack")
 
 @register_stack("dynamodb_stack")
 @register_stack("dynamodb_library_module")
-class DynamoDBStack(IStack, EnhancedSsmParameterMixin):
+class DynamoDBStack(IStack, StandardizedSsmMixin):
     """
     Reusable stack for AWS DynamoDB tables.
     Supports all major DynamoDB table parameters.
@@ -103,7 +103,7 @@ class DynamoDBStack(IStack, EnhancedSsmParameterMixin):
         self._configure_gsi()
         # add replicas if configured
         self._configure_replicas()
-        
+
         # Export SSM parameters
         self._export_ssm_parameters()
 
@@ -148,34 +148,38 @@ class DynamoDBStack(IStack, EnhancedSsmParameterMixin):
         """Export DynamoDB resources to SSM using enhanced SSM parameter mixin"""
         if not self.table:
             return
-            
+
         # Setup enhanced SSM integration with proper resource type and name
         # Use "app-table" as resource identifier for SSM paths, not the full table name
-        
-        self.setup_enhanced_ssm_integration(
+
+        self.setup_ssm_integration(
             scope=self,
             config=self.stack_config.dictionary.get("dynamodb", {}),
             resource_type="dynamodb",
-            resource_name="app-table"
+            resource_name="app-table",
         )
-        
+
         # Prepare resource values for export
         resource_values = {
             "table_name": self.table.table_name,
             "table_arn": self.table.table_arn,
-            "table_stream_arn": self.table.table_stream_arn if hasattr(self.table, 'table_stream_arn') else None,
+            "table_stream_arn": (
+                self.table.table_stream_arn
+                if hasattr(self.table, "table_stream_arn")
+                else None
+            ),
         }
-        
+
         # Add GSI names if available
-        if hasattr(self, '_gsi_names') and self._gsi_names:
+        if hasattr(self, "_gsi_names") and self._gsi_names:
             resource_values["gsi_names"] = ",".join(self._gsi_names)
-        
+
         # Filter out None values
         resource_values = {k: v for k, v in resource_values.items() if v is not None}
-        
+
         # Use enhanced SSM parameter export
-        exported_params = self.auto_export_resources(resource_values)
-        
+        exported_params = self.export_ssm_parameters(resource_values)
+
         if exported_params:
             logger.info(f"Exported {len(exported_params)} DynamoDB parameters to SSM")
         else:

cdk_factory/stack_library/ecr/ecr_stack.py

@@ -12,7 +12,7 @@ from cdk_factory.configurations.resources.ecr import ECRConfig
 from cdk_factory.configurations.stack import StackConfig
 from cdk_factory.constructs.ecr.ecr_construct import ECRConstruct
 from cdk_factory.interfaces.istack import IStack
-from cdk_factory.interfaces.enhanced_ssm_parameter_mixin import EnhancedSsmParameterMixin
+from cdk_factory.interfaces.standardized_ssm_mixin import StandardizedSsmMixin
 from cdk_factory.stack.stack_module_registry import register_stack
 from cdk_factory.workload.workload_factory import WorkloadConfig
 
@@ -21,7 +21,7 @@ logger = Logger(__name__)
 
 @register_stack("ecr_library_module")
 @register_stack("ecr_stack")
-class ECRStack(IStack, EnhancedSsmParameterMixin):
+class ECRStack(IStack, StandardizedSsmMixin):
     """
     A CloudFormation Stack for an ECR
 

cdk_factory/stack_library/ecs/__init__.py

@@ -6,9 +6,7 @@ ECS clusters, services, and related resources.
 """
 
 from .ecs_cluster_stack import EcsClusterStack
-from .ecs_service_stack import EcsServiceStack
 
 __all__ = [
-    "EcsClusterStack",
-    "EcsServiceStack"
+    "EcsClusterStack"
 ]