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

{aws_cdk_constructs-2.43.0/aws_cdk_constructs.egg-info → aws_cdk_constructs-2.44.0}/PKG-INFO

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

{aws_cdk_constructs-2.43.0 → aws_cdk_constructs-2.44.0}/aws_cdk_constructs/__init__.py

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

{aws_cdk_constructs-2.43.0 → aws_cdk_constructs-2.44.0}/aws_cdk_constructs/ecs/cluster.py

@@ -206,7 +206,7 @@ class ECSCluster(Construct):
 
             user_data = _ec2.UserData.for_linux()
             user_data.add_commands(
-                'yum -y install docker',
+                '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',
                 'sudo yum localinstall -y amazon-ecs-init-latest.x86_64.rpm',
@@ -218,6 +218,8 @@ class ECSCluster(Construct):
                 'yum install -y https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm',
                 'sudo systemctl status amazon-ssm-agent',
                 'ssm-cli get-diagnostics --output table',
+                'systemctl enable --now amazon-ecs-volume-plugin',
+                'pip install botocore',
             )
             machine_image = _ec2.GenericLinuxImage(
                 {'eu-west-1': self._get_ami_id(f'{self.id}-ami-id')}

{aws_cdk_constructs-2.43.0 → aws_cdk_constructs-2.44.0/aws_cdk_constructs.egg-info}/PKG-INFO

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

{aws_cdk_constructs-2.43.0 → aws_cdk_constructs-2.44.0}/tests/test_ecs_cluster.py

@@ -287,6 +287,42 @@ def test_ecs_cluster_listener_rule_priority_stored_param(
     )
 
 
+def test_ecs_cluster_user_data_installs_efs_and_botocore(
+    stack, vpc, hosted_zone, environment_parameters, mocker
+):
+    mocker.patch('aws_cdk.aws_ec2.Vpc.from_lookup', return_value=vpc)
+    mocker.patch(
+        'aws_cdk_constructs.ecs.cluster.ECSCluster._get_ami_id',
+        return_value='ami-123',
+    )
+
+    ECSCluster(
+        scope=stack,
+        id='x',
+        environment='development',
+        environments_parameters=environment_parameters,
+        app_name='testapp',
+        hosted_zone=hosted_zone,
+        ec2_enable=True,
+        ec2_instance_type='t3.medium',
+        ec2_desired_capacity=1,
+        ec2_max_capacity=1,
+    )
+    template = Template.from_stack(stack)
+    launch_templates = template.find_resources('AWS::EC2::LaunchTemplate')
+    launch_template = list(launch_templates.values())[0]
+    user_data_parts = launch_template['Properties']['LaunchTemplateData'][
+        'UserData'
+    ]['Fn::Base64']['Fn::Join'][1]
+    user_data = ''.join(
+        [part for part in user_data_parts if isinstance(part, str)]
+    )
+
+    assert 'yum -y install docker amazon-efs-utils python3-pip' in user_data
+    assert 'systemctl enable --now amazon-ecs-volume-plugin' in user_data
+    assert 'pip install botocore' in user_data
+
+
 def test_ecs_cluster_public_facing(
     stack, vpc, hosted_zone, environment_parameters, mocker
 ):