cdk-factory 0.16.10__py3-none-any.whl → 0.16.11__py3-none-any.whl

cdk_factory/stack_library/auto_scaling/auto_scaling_stack.py

@@ -248,10 +248,12 @@ class AutoScalingStack(IStack, VPCProviderMixin):
         # Add base commands
         user_data.add_commands("set -euxo pipefail")
 
-        # Add custom commands from config
+        # Add custom commands from config (with variable substitution)
         for command in self.asg_config.user_data_commands:
-            user_data.add_commands(command)
-            self.user_data_commands.append(command)
+            # Perform variable substitution on the command
+            substituted_command = self._substitute_variables(command)
+            user_data.add_commands(substituted_command)
+            self.user_data_commands.append(substituted_command)
 
         # Add user data scripts from files (with variable substitution)
         if self.asg_config.user_data_scripts:
@@ -324,6 +326,49 @@ class AutoScalingStack(IStack, VPCProviderMixin):
             
             logger.info(f"Added user data script from {script_type}: {script_config.get('path', 'inline')}")
 
+    def _substitute_variables(self, command: str) -> str:
+        """
+        Perform variable substitution on a user data command.
+        Uses workload and deployment configuration for substitution.
+        """
+        if not command:
+            return command
+            
+        # Start with the original command
+        substituted_command = command
+        
+        # Define available variables for substitution
+        variables = {}
+        
+        # Add workload variables
+        if self.workload:
+            variables.update({
+                "WORKLOAD_NAME": getattr(self.workload, 'name', ''),
+                "ENVIRONMENT": getattr(self.workload, 'environment', ''),
+                "WORKLOAD": getattr(self.workload, 'name', ''),
+            })
+        
+        # Add deployment variables
+        if self.deployment:
+            variables.update({
+                "DEPLOYMENT_NAME": getattr(self.deployment, 'name', ''),
+                "REGION": getattr(self.deployment, 'region', ''),
+                "ACCOUNT": getattr(self.deployment, 'account', ''),
+            })
+        
+        # Add stack-level variables
+        variables.update({
+            "STACK_NAME": self.stack_name,
+        })
+        
+        # Perform substitution
+        for var_name, var_value in variables.items():
+            if var_value is not None:
+                placeholder = f"{{{{{var_name}}}}}"  # {{VAR_NAME}}
+                substituted_command = substituted_command.replace(placeholder, str(var_value))
+        
+        return substituted_command
+
     def _add_container_user_data(
         self, user_data: ec2.UserData, container_config: Dict[str, Any]
     ) -> None:
@@ -602,7 +647,7 @@ class AutoScalingStack(IStack, VPCProviderMixin):
             return
         
         # Generate cluster name from stack configuration
-        cluster_name = f"{self.deployment.build_resource_name('cluster')}"
+        cluster_name = f"{self.workload.name}-{self.workload.environment}-cluster"
         
         logger.info(f"Creating ECS cluster: {cluster_name}")
         

cdk_factory/version.py

@@ -1 +1 @@
-__version__ = "0.16.10"
+__version__ = "0.16.11"

{cdk_factory-0.16.10.dist-info → cdk_factory-0.16.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdk_factory
-Version: 0.16.10
+Version: 0.16.11
 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.16.10.dist-info → cdk_factory-0.16.11.dist-info}/RECORD

@@ -2,7 +2,7 @@ cdk_factory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cdk_factory/app.py,sha256=RnX0-pwdTAPAdKJK_j13Zl8anf9zYKBwboR0KA8K8xM,10346
 cdk_factory/cdk.json,sha256=SKZKhJ2PBpFH78j-F8S3VDYW-lf76--Q2I3ON-ZIQfw,3106
 cdk_factory/cli.py,sha256=FGbCTS5dYCNsfp-etshzvFlGDCjC28r6rtzYbe7KoHI,6407
-cdk_factory/version.py,sha256=NknKyizQ35lXpGfEv9yE_DF67rv9Zh7Bl_r8O0gDezg,24
+cdk_factory/version.py,sha256=EakrCPGyBoMWg8RWPZfDpree9gtV1Dzj_7yPvePXTLA,24
 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
@@ -86,7 +86,7 @@ cdk_factory/stack_library/acm/__init__.py,sha256=4FNRLykblcKZvq_wieYwvv9N_jgrZnJ
 cdk_factory/stack_library/acm/acm_stack.py,sha256=hflRXyOSjqGeJxBx87EV3Z3MJ5HEX2rnrjJ_E9wwhH8,5862
 cdk_factory/stack_library/api_gateway/api_gateway_stack.py,sha256=l6J5uurBQqbhj9JuvQitV9PiIHS5kqa-dFWifCeA3GM,39347
 cdk_factory/stack_library/auto_scaling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cdk_factory/stack_library/auto_scaling/auto_scaling_stack.py,sha256=B1pzkdYj__ZrUo1ZytKt_DPMTePjAF4ixOylrIg6mTA,29042
+cdk_factory/stack_library/auto_scaling/auto_scaling_stack.py,sha256=5GeQDp0PNULaSI2FPEWLscbSZRK_QjRwk1cyaeD8STI,30787
 cdk_factory/stack_library/aws_lambdas/lambda_stack.py,sha256=SFbBPvvCopbyiuYtq-O5sQkFCf94Wzua6aDUXiFDSB4,26161
 cdk_factory/stack_library/buckets/README.md,sha256=XkK3UNVtRLE7NtUvbhCOBBYUYi8hlrrSaI1s3GJVrqI,78
 cdk_factory/stack_library/buckets/bucket_stack.py,sha256=SLoZqSffAqmeBBEVUQg54D_8Ad5UKdkjEAmKAVgAqQo,1778
@@ -134,8 +134,8 @@ cdk_factory/utilities/lambda_function_utilities.py,sha256=S1GvBsY_q2cyUiaud3HORJ
 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=yDI3cRhVI5ELNDcJPLpk9UY54Uind1xQoV3spzT4z7E,6068
-cdk_factory-0.16.10.dist-info/METADATA,sha256=usURSWXfZdPgEms-jeLvWUxripGPPYWZQRWPBAVBkdw,2452
-cdk_factory-0.16.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cdk_factory-0.16.10.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
-cdk_factory-0.16.10.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
-cdk_factory-0.16.10.dist-info/RECORD,,
+cdk_factory-0.16.11.dist-info/METADATA,sha256=Z14DgOnRweXe38PJbLFn1ZdMUOl13d3nbqRSGyMyQU8,2452
+cdk_factory-0.16.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cdk_factory-0.16.11.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
+cdk_factory-0.16.11.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
+cdk_factory-0.16.11.dist-info/RECORD,,