Updated ecs-compose-x dependency. Fixed test files

Author: JohnPreston

.pre-commit-config.yaml

@@ -14,11 +14,11 @@ repos:
       - id: pyupgrade
         args: [ "--py38-plus" ]
   - repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 23.1.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/isort
-    rev: 5.11.4
+    rev: 5.12.0
     hooks:
       - id: isort
         args: [ "--profile", "black", "--filter-files" ]

ecs_composex_msk_cluster/msk_cluster_logging.py

@@ -25,41 +25,43 @@ def add_log_group(cluster: MskCluster, template: Template) -> None:
     """
     Creates a new Log Group for the cluster and configures the property for it.
     """
-    param, prop, value = get_nested_property(
+    resource_props_to_update: list = get_nested_property(
         cluster.cfn_resource, "LoggingInfo.BrokerLogs.CloudWatchLogs"
     )
-    if isinstance(value, CloudWatchLogs):
-        LOG.warning(
-            f"{cluster.module.res_key}.{cluster.name} - "
-            "Properties for LoggingInfo.BrokerLogs.CloudWatchLogs already set. Skipping"
-        )
-        return
-    log_group = LogGroup(f"{cluster.logical_name}BrokersLogGroup")
-    add_resource(template, log_group)
-    if value and value is not None:
-        setattr(param, prop, CloudWatchLogs(Enabled=True, LogGroup=Ref(log_group)))
-    else:
-        if not hasattr(cluster.cfn_resource, "LoggingInfo"):
-            setattr(
-                cluster.cfn_resource,
-                "LoggingInfo",
-                LoggingInfo(
-                    BrokerLogs=BrokerLogs(
-                        CloudWatchLogs=CloudWatchLogs(
-                            Enabled=True, LogGroup=Ref(log_group)
-                        )
-                    )
-                ),
+    for _resource_prop_to_update in resource_props_to_update:
+        param, prop, value = _resource_prop_to_update
+        if isinstance(value, CloudWatchLogs):
+            LOG.warning(
+                f"{cluster.module.res_key}.{cluster.name} - "
+                "Properties for LoggingInfo.BrokerLogs.CloudWatchLogs already set. Skipping"
             )
+            return
+        log_group = LogGroup(f"{cluster.logical_name}BrokersLogGroup")
+        add_resource(template, log_group)
+        if value and value is not None:
+            setattr(param, prop, CloudWatchLogs(Enabled=True, LogGroup=Ref(log_group)))
         else:
-            if not hasattr(
-                cluster.cfn_resource.LoggingInfo.BrokerLogs, "CloudWatchLogs"
-            ):
+            if not hasattr(cluster.cfn_resource, "LoggingInfo"):
                 setattr(
-                    cluster.cfn_resource.LoggingInfo,
-                    "CloudWatchLogs",
-                    CloudWatchLogs(Enabled=True, LogGroup=Ref(log_group)),
+                    cluster.cfn_resource,
+                    "LoggingInfo",
+                    LoggingInfo(
+                        BrokerLogs=BrokerLogs(
+                            CloudWatchLogs=CloudWatchLogs(
+                                Enabled=True, LogGroup=Ref(log_group)
+                            )
+                        )
+                    ),
                 )
+            else:
+                if not hasattr(
+                    cluster.cfn_resource.LoggingInfo.BrokerLogs, "CloudWatchLogs"
+                ):
+                    setattr(
+                        cluster.cfn_resource.LoggingInfo,
+                        "CloudWatchLogs",
+                        CloudWatchLogs(Enabled=True, LogGroup=Ref(log_group)),
+                    )
 
 
 def handle_logging(

ecs_composex_msk_cluster/msk_sg_ingress.py

@@ -197,15 +197,17 @@ def handle_msk_auth_parameters(cluster: MskCluster) -> None:
         ),
     ]
     for auth_property in properties:
-        resource, prop, value = get_nested_property(
+        res_props_to_update = get_nested_property(
             cluster.cfn_resource,
             auth_property[0],
         )
-        if prop and value:
-            cluster.stack.Parameters.update(
-                {auth_property[2].title: str(auth_property[1](value))}
-            )
-            setattr(resource, prop, Ref(auth_property[2]))
+        for _prop_to_update in res_props_to_update:
+            resource, prop, value = _prop_to_update
+            if prop and value:
+                cluster.stack.Parameters.update(
+                    {auth_property[2].title: str(auth_property[1](value))}
+                )
+                setattr(resource, prop, Ref(auth_property[2]))
 
 
 def handle_msk_auth_settings(cluster: MskCluster):
@@ -214,10 +216,14 @@ def handle_msk_auth_settings(cluster: MskCluster):
         "SecurityGroupIngress",
         allow_clients_sg_ingress(cluster),
     )
-    resource, prop, value = get_nested_property(
+    resource_props_to_update = get_nested_property(
         cluster.cfn_resource,
         "BrokerNodeGroupInfo.ConnectivityInfo.PublicAccess.Type",
     )
-    if value and value == "SERVICE_PROVIDED_EIPS":
-        cluster.stack.Parameters.update({MSK_CLUSTER_ADDRESSING_TYPE.title: "PUBLIC"})
-    handle_msk_auth_parameters(cluster)
+    for _to_update in resource_props_to_update:
+        resource, prop, value = _to_update
+        if value and value == "SERVICE_PROVIDED_EIPS":
+            cluster.stack.Parameters.update(
+                {MSK_CLUSTER_ADDRESSING_TYPE.title: "PUBLIC"}
+            )
+        handle_msk_auth_parameters(cluster)