PyPI - aws-cdk-constructs - Versions diffs - 2.44.0__tar.gz → 2.44.2__tar.gz - Mend

@@ -1620,6 +1620,39 @@ def test_microservice_default_os_distribution(stack, environment_parameters):
     )
+def test_microservice_launchtemplate_has_metadata_tags(
+    stack, environment_parameters
+):
+    main_component_name = 'testmaincomponent'
+    ms = Microservice(
+        scope=stack,
+        id='testms',
+        app_name='testapp',
+        environment='Production',
+        environments_parameters=environment_parameters,
+        main_component_name=main_component_name,
+        will_be_ha=False,
+        will_use_efs='true',
+        additional_variables={},
+        traffic_port='80',
+        ec2_traffic_port='8000',
+        ec2_instance_type='t3.small',
+        ec2_ami_id='LATEST',
+        rubrik_backup='false',
+    )
+    template = Template.from_stack(stack)
+    template.has_resource_properties(
+        'AWS::EC2::LaunchTemplate',
+        {
+            'LaunchTemplateData': {
+                'MetadataOptions': {'InstanceMetadataTags': 'enabled'}
+            }
+        },
+    )
 def test_microservice_default_imdsv2(stack, environment_parameters):
     main_component_name = 'testmaincomponent'
     ms = Microservice(

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws_cdk_constructs
-Version: 2.44.0
+Version: 2.44.2
 Summary: AWS CDK constructs
 Home-page: https://bitbucket.org/cioapps/aws-cdk-constructs
 Author: author

@@ -15,4 +15,4 @@ from .load_balancer import Alb, Nlb
 from .security_group import SecurityGroup
 from .windows_server import WindowsServer
-__version__ = '2.44.0'
+__version__ = '2.44.2'

@@ -186,10 +186,11 @@ class ECSCluster(Construct):
                     start_port=32768, end_port=65535
                 ),
             )
+            path = '_'.join(self.node.path.split('/')[:-1])
             self._ec2_role = _iam.Role(
                 self,
                 'asg_role',
-                description=app_name + '_' + '_ec2_role',
+                description=f'{path}_ec2_role',
                 assumed_by=_iam.ServicePrincipal('ec2.amazonaws.com'),
                 managed_policies=[
                     # AWS managed policy to allow sending logs and custom metrics to CloudWatch
@@ -201,11 +202,14 @@ class ECSCluster(Construct):
                         'AmazonSSMManagedInstanceCore'
                     ),
                 ],
-                role_name=app_name + '_' + '_ec2_role',
+                role_name=f'{path}_ec2_role',
             )
             user_data = _ec2.UserData.for_linux()
             user_data.add_commands(
+                'sudo yum clean all',
+                'sudo rm -rf /var/cache/dnf',
+                'sudo yum makecache',
                 'yum -y install docker amazon-efs-utils python3-pip',
                 'service docker start',
                 'curl -O https://s3.eu-west-1.amazonaws.com/amazon-ecs-agent-eu-west-1/amazon-ecs-init-latest.x86_64.rpm',

@@ -182,7 +182,8 @@ class ECSMicroservice(Construct):
             self.max_buffer_size = None
         super().__init__(scope, name)
-        FargateValidator(cpu=self.cpu, mem=self.memory_limit_mib)
+        if not self.deploy_to_ec2:
+            FargateValidator(cpu=self.cpu, mem=self.memory_limit_mib)
         # Create a dedicated SG if none is provided
         self.security_groups: List[_ec2.ISecurityGroup] = []

@@ -1250,6 +1250,7 @@ class Microservice(Construct):
             security_group=self.ec2_security_group,
             require_imdsv2=use_imdsv2,
             http_tokens=http_tokens,
+            instance_metadata_tags=True,
         )
         min_capacity = (

aws-cdk-constructs 2.44.0__tar.gz → 2.44.2__tar.gz