Fixing NLB Eip exception (#176)

* Fixing NLB Eip exception

* Fixing service name

* Fixing output for subnets

* Fixing codesmell

Author: JohnPreston

ecs_composex/ecs/ecs_service.py

@@ -158,7 +158,9 @@ def handle_same_task_services_dependencies(
                 service_config.family_dependents.append(
                     {
                         "ContainerName": dependency,
-                        "Condition": containers_config[dependency]["config"].container_start_condition
+                        "Condition": containers_config[dependency][
+                            "config"
+                        ].container_start_condition
                         if not containers_config[dependency]["config"].healthcheck
                         else "HEALTHY",
                     }
@@ -566,9 +568,17 @@ def add_public_ips(self, azs):
         :rtype: list
         """
         for az in azs:
+            if isinstance(az, dict) and keyisset("ZoneName", az):
+                az_name = NONALPHANUM.sub(
+                    "", az["ZoneName"].title().replace("-", "").strip()
+                )
+            elif isinstance(az, str):
+                az_name = NONALPHANUM.sub("", az)
+            else:
+                raise TypeError("az is neither a dict or a str. Got", type(az))
             self.eips.append(
                 EIP(
-                    f"EipPublicNlb{az.replace('-', '').strip()}{self.service_name}",
+                    f"EipPublicNlb{az_name}{self.service_name}",
                     template=self.template,
                     Domain="vpc",
                 )
@@ -711,15 +721,9 @@ def add_load_balancer(self, settings):
                     Key="load_balancing.cross_zone.enabled", Value="true"
                 )
             ]
-            if self.config.lb_type == "network"
-            else no_value,
-            SecurityGroups=lb_sg,
-            SubnetMappings=public_mapping
-            if self.config.is_public and self.config.use_nlb()
+            if self.config.use_nlb()
             else no_value,
-            Subnets=Ref(PUBLIC_SUBNETS)
-            if self.config.is_public and self.config.use_alb()
-            else Ref(vpc_params.APP_SUBNETS),
+            SecurityGroups=lb_sg if self.config.use_alb() else no_value,
             Type=self.config.lb_type,
             Tags=Tags(
                 {
@@ -729,6 +733,13 @@ def add_load_balancer(self, settings):
                 }
             ),
         )
+        if self.config.is_public and self.config.use_alb():
+            setattr(loadbalancer, "Subnets", Ref(PUBLIC_SUBNETS))
+        elif self.config.is_public and self.config.use_nlb():
+            setattr(loadbalancer, "SubnetMappings", public_mapping)
+            setattr(loadbalancer, "Subnets", Ref(AWS_NO_VALUE))
+        elif not self.config.is_public:
+            setattr(loadbalancer, "Subnets", Ref(vpc_params.APP_SUBNETS))
         if self.config.is_public:
             sd_service = SdService(
                 f"{self.resource_name}PublicDiscoveryService",
@@ -782,7 +793,7 @@ def add_service_load_balancer(self, settings):
                 EcsLoadBalancer(
                     TargetGroupArn=Ref(tgt),
                     ContainerPort=tgt.Port,
-                    ContainerName=self.config.lb_service_name,
+                    ContainerName=NONALPHANUM.sub("", self.config.lb_service_name),
                 )
             )
         return service_lbs, depends_on

ecs_composex/ecs/ecs_service_config.py

@@ -521,15 +521,23 @@ def set_service_deploy(self, definition):
         """
         if not keyisset("deploy", definition):
             return
+        depends_key = "ecs.depends.condition"
         deployment = definition["deploy"]
         if keyisset("resources", deployment):
             self.set_compute_resources(deployment["resources"])
         self.set_deployment_settings(deployment)
-        if keyisset("labels", deployment) and keyisset("ecs.depends.condition", deployment["labels"]):
+        if keyisset("labels", deployment) and keyisset(
+            depends_key, deployment["labels"]
+        ):
             allowed_values = ["START", "COMPLETE", "SUCCESS", "HEALTHY"]
-            if deployment["labels"]["ecs.depends.condition"] not in allowed_values:
-                raise ValueError("Attribute ecs.depends.condition is invalid. Must be one of", allowed_values)
-            self.container_start_condition = deployment["labels"]["ecs.depends.condition"]
+            if deployment["labels"][depends_key] not in allowed_values:
+                raise ValueError(
+                    f"Attribute {depends_key} is invalid. Must be one of",
+                    allowed_values,
+                )
+            self.container_start_condition = deployment["labels"][
+                depends_key
+            ]
 
     def set_xray(self, definition):
         """

ecs_composex/ecs/ecs_template.py

@@ -273,7 +273,7 @@ def handle_families_services(families, cluster_sg, settings):
             service = settings.compose_content[ecs_params.RES_KEY][service_name]
             if keyisset("deploy", service):
                 service["deploy"].update(get_deploy_labels(service))
-                print(service["deploy"])
+                LOG.debug(service["deploy"])
             service_config = ServiceConfig(
                 settings.compose_content,
                 service_name,

ecs_composex/vpc/vpc_template.py

@@ -73,7 +73,7 @@ def add_template_outputs(template, vpc, storage_subnets, public_subnets, app_sub
                 (
                     vpc_params.PUBLIC_SUBNETS_T,
                     vpc_params.PUBLIC_SUBNETS_T,
-                    Join(",", [Ref(subnet) for subnet in storage_subnets]),
+                    Join(",", [Ref(subnet) for subnet in public_subnets]),
                 ),
                 (
                     vpc_params.APP_SUBNETS_T,

features/use-cases/blog-all-features.yml

@@ -87,6 +87,9 @@ services:
     environment:
       LOGLEVEL: DEBUG
     x-configs:
+      network:
+        lb_type: network
+        is_public: True
       use_xray: True
       iam:
         boundary: arn:aws:iam::aws:policy/ViewOnly