Updating all Python examples for CDK release 0.38 (aws-samples#70)

its-mirus-lu · Jul 8, 2019 · 0ee3a14 · 0ee3a14
1 parent cc71550
commit 0ee3a14
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 28 deletions.
diff --git a/python/ecs/cluster/app.py b/python/ecs/cluster/app.py
@@ -13,7 +13,7 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
 
         vpc = ec2.Vpc(
             self, "MyVpc",
-            max_a_zs=2
+            max_azs=2
         )
 
         asg = autoscaling.AutoScalingGroup(

diff --git a/python/ecs/ecs-load-balanced-service/app.py b/python/ecs/ecs-load-balanced-service/app.py
@@ -13,7 +13,7 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
 
         vpc = ec2.Vpc(
             self, "MyVpc",
-            max_a_zs=2
+            max_azs=2
         )
 
         cluster = ecs.Cluster(
@@ -27,7 +27,7 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
         ecs_service = ecs_patterns.LoadBalancedEc2Service(
             self, "Ec2Service",
             cluster=cluster,
-            memory_limit_mi_b=512,
+            memory_limit_mib=512,
             image=ecs.ContainerImage.from_registry("amazon/amazon-ecs-sample")
         )
 

diff --git a/python/ecs/ecs-service-with-advanced-alb-config/app.py b/python/ecs/ecs-service-with-advanced-alb-config/app.py
@@ -11,29 +11,32 @@
 # Create a cluster
 vpc = ec2.Vpc(
     stack, "MyVpc",
-    max_a_zs=2
+    max_azs=2
 )
 
 cluster = ecs.Cluster(
     stack, 'EcsCluster',
     vpc=vpc
 )
 cluster.add_capacity("DefaultAutoScalingGroup",
-                     instance_type=ec2.InstanceType("t2.micro"))
+                     instance_type=ec2.InstanceType.of(
+                         ec2.InstanceClass.STANDARD5,
+                         ec2.InstanceSize.MICRO))
 
 # Create Task Definition
 task_definition = ecs.Ec2TaskDefinition(
     stack, "TaskDef")
 container = task_definition.add_container(
     "web",
     image=ecs.ContainerImage.from_registry("amazon/amazon-ecs-sample"),
-    memory_limit_mi_b=256
+    memory_limit_mib=256
 )
-container.add_port_mappings(
+port_mapping = ecs.PortMapping(
     container_port=80,
     host_port=8080,
     protocol=ecs.Protocol.TCP
 )
+container.add_port_mappings(port_mapping)
 
 # Create Service
 service = ecs.Ec2Service(
@@ -54,16 +57,18 @@
     open=True
 )
 
+health_check = elbv2.HealthCheck(
+    interval=core.Duration.seconds(60),
+    path="/health",
+    timeout=core.Duration.seconds(5)
+)
+
 # Attach ALB to ECS Service
 listener.add_targets(
     "ECS",
     port=80,
     targets=[service],
-    health_check={
-        "interval_secs": 60,
-        "path": "/health",
-        "timeout_seconds": 5
-    }
+    health_check=health_check,
 )
 
 core.CfnOutput(

diff --git a/python/ecs/ecs-service-with-task-networking/app.py b/python/ecs/ecs-service-with-task-networking/app.py
@@ -2,18 +2,18 @@
     aws_ec2 as ec2,
     aws_ecs as ecs,
     aws_elasticloadbalancingv2 as elbv2,
-    cdk,
+    core,
 )
 
 # Based on https://aws.amazon.com/blogs/compute/introducing-cloud-native-networking-for-ecs-containers/
 
-app = cdk.App()
-stack = cdk.Stack(app, "ec2-service-with-task-networking")
+app = core.App()
+stack = core.Stack(app, "ec2-service-with-task-networking")
 
 # Create a cluster
 vpc = ec2.Vpc(
     stack, "Vpc",
-    max_a_zs=2
+    max_azs=2
 )
 
 cluster = ecs.Cluster(
@@ -26,20 +26,21 @@
 # Create a task definition with its own elastic network interface
 task_definition = ecs.Ec2TaskDefinition(
     stack, "nginx-awsvpc",
-    network_mode=ecs.NetworkMode.AwsVpc
+    network_mode=ecs.NetworkMode.AWS_VPC,
 )
 
 web_container = task_definition.add_container(
     "nginx",
     image=ecs.ContainerImage.from_registry("nginx:latest"),
     cpu=100,
-    memory_limit_mi_b=256,
+    memory_limit_mib=256,
     essential=True
 )
-web_container.add_port_mappings(
+port_mapping = ecs.PortMapping(
     container_port=80,
-    protocol=ecs.Protocol.Tcp
+    protocol=ecs.Protocol.TCP
 )
+web_container.add_port_mappings(port_mapping)
 
 # Create a security group that allows HTTP traffic on port 80 for our
 # containers without modifying the security group on the instance
@@ -49,8 +50,8 @@
     allow_all_outbound=False
 )
 security_group.add_ingress_rule(
-    ec2.AnyIPv4(),
-    ec2.TcpPort(80)
+    ec2.Peer.any_ipv4(),
+    ec2.Port.tcp(80)
 )
 
 # Create the service
@@ -61,4 +62,4 @@
     security_group=security_group
 )
 
-app.run()
+app.synth()
diff --git a/python/ecs/ecs-service-with-task-placement/app.py b/python/ecs/ecs-service-with-task-placement/app.py
@@ -11,7 +11,7 @@
 # Create a cluster
 vpc = ec2.Vpc(
     stack, "Vpc",
-    max_a_zs=2
+    max_azs=2
 )
 
 cluster = ecs.Cluster(
@@ -32,13 +32,14 @@
 container = task_definition.add_container(
     "web",
     image=ecs.ContainerImage.from_registry("nginx:latest"),
-    memory_limit_mi_b=256,
+    memory_limit_mib=256,
 )
-container.add_port_mappings(
+port_mapping = ecs.PortMapping(
     container_port=80,
     host_port=8080,
     protocol=ecs.Protocol.TCP
 )
+container.add_port_mappings(port_mapping)
 
 # Create Service
 service = ecs.Ec2Service(

diff --git a/python/ecs/fargate-load-balanced-service/app.py b/python/ecs/fargate-load-balanced-service/app.py
@@ -15,7 +15,7 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
         # NOTE: Limit AZs to avoid reaching resource quotas
         vpc = ec2.Vpc(
             self, "MyVpc",
-            max_a_zs=2
+            max_azs=2
         )
 
         cluster = ecs.Cluster(

diff --git a/python/ecs/fargate-service-with-autoscaling/app.py b/python/ecs/fargate-service-with-autoscaling/app.py
@@ -14,7 +14,7 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
         # Create a cluster
         vpc = ec2.Vpc(
             self, "Vpc",
-            max_a_zs=2
+            max_azs=2
         )
 
         cluster = ecs.Cluster(