Release 1.0 (#741)

Author: JohnPreston

.cicd/buildspec_pr.yml

@@ -1,14 +1,12 @@
 version: 0.2
 
 env:
-  variables:
-    PY_VERSION: 3.8
   git-credential-helper: yes
 
 phases:
   install:
     runtime-versions:
-      python: "$(echo $PY_VERSION)"
+      python: 3.10
     commands:
       - (pip --version && pip install pip -U)|| curl -s https://bootstrap.pypa.io/get-pip.py | python
       - python -m pip install poetry

.cicd/codebuild_pr.yml

@@ -6,6 +6,9 @@ Metadata:
   Author: https://github.com/johnpreston
 
 Parameters:
+  CodeBuildImage:
+    Type: String
+    Default: aws/codebuild/standard:6.0
   RepositoryOrganization:
     Type: String
 
@@ -128,12 +131,10 @@ Resources:
         Type: NO_ARTIFACTS
       Environment:
         ComputeType: BUILD_GENERAL1_SMALL
-        Image: aws/codebuild/standard:3.0
+        Image:
+          Ref: CodeBuildImage
         Type: LINUX_CONTAINER
         EnvironmentVariables:
-          - Name: PY_VERSION
-            Type: PLAINTEXT
-            Value: 3.8
           - Name: KNOWN_BUCKET
             Type: PLAINTEXT
             Value: !Ref TemplatesBucket

.github/workflows/pre-commit.yml

@@ -2,8 +2,6 @@ name: pre-commit
 
 on:
   pull_request:
-  push:
-    branches: [main]
 
 jobs:
   pre-commit:

.pre-commit-config.yaml

@@ -19,14 +19,14 @@ repos:
       - id: fix-byte-order-marker
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.15.1
     hooks:
       - id: pyupgrade
         exclude: ^tests/
         args: [ "--py39-plus", "--keep-runtime-typing" ]
 
   - repo: https://github.com/psf/black
-    rev: 23.11.0
+    rev: 24.2.0
     hooks:
       - id: black
 
@@ -37,7 +37,7 @@ repos:
         additional_dependencies: [ black ]
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         args: [ "--profile", "black", "--filter-files" ]

AUTHORS.rst

@@ -173,9 +173,11 @@ def define_nodes(self, settings: ComposeXSettings) -> None:
                 node["Port"],
                 self,
                 settings,
-                node[appmesh_params.BACKENDS_KEY]
-                if keyisset(appmesh_params.BACKENDS_KEY, node)
-                else None,
+                (
+                    node[appmesh_params.BACKENDS_KEY]
+                    if keyisset(appmesh_params.BACKENDS_KEY, node)
+                    else None
+                ),
             )
             self.nodes[family.logical_name] = mesh_node
             self.nodes[family.logical_name].get_node_param = GetAtt(

ecs_composex/appmesh/appmesh_mesh.py

@@ -38,15 +38,21 @@
 def define_http_route(route_match, route_nodes, http2: bool):
     route = appmesh.HttpRoute(
         Match=appmesh.HttpRouteMatch(
-            Prefix=route_match[PREFIX_KEY]
-            if keyisset(PREFIX_KEY, route_match)
-            else Ref(AWS_NO_VALUE),
-            Scheme=route_match[SCHEME_KEY].lower()
-            if keyisset(SCHEME_KEY, route_match) and http2
-            else Ref(AWS_NO_VALUE),
-            Method=route_match[METHOD_KEY].upper()
-            if keyisset(METHOD_KEY, route_match)
-            else Ref(AWS_NO_VALUE),
+            Prefix=(
+                route_match[PREFIX_KEY]
+                if keyisset(PREFIX_KEY, route_match)
+                else Ref(AWS_NO_VALUE)
+            ),
+            Scheme=(
+                route_match[SCHEME_KEY].lower()
+                if keyisset(SCHEME_KEY, route_match) and http2
+                else Ref(AWS_NO_VALUE)
+            ),
+            Method=(
+                route_match[METHOD_KEY].upper()
+                if keyisset(METHOD_KEY, route_match)
+                else Ref(AWS_NO_VALUE)
+            ),
         ),
         Action=appmesh.HttpRouteAction(
             WeightedTargets=[
@@ -238,9 +244,11 @@ def handle_tcp_route(self, routes, router, nodes):
                         f"node {node[NAME_KEY]} is not defined as a virtual node."
                     )
             route = appmesh.TcpRoute(
-                Timeout=appmesh.TcpTimeout(Idle=appmesh.Duration(Unit="ms", Value=1))
-                if keyisset("Timeout", route)
-                else Ref(AWS_NO_VALUE),
+                Timeout=(
+                    appmesh.TcpTimeout(Idle=appmesh.Duration(Unit="ms", Value=1))
+                    if keyisset("Timeout", route)
+                    else Ref(AWS_NO_VALUE)
+                ),
                 Action=appmesh.TcpRouteAction(
                     WeightedTargets=[
                         appmesh.WeightedTarget(

ecs_composex/appmesh/appmesh_router.py

@@ -120,18 +120,22 @@ def __init__(
             ),
             Spec=appmesh.VirtualServiceSpec(
                 Provider=appmesh.VirtualServiceProvider(
-                    VirtualNode=appmesh.VirtualNodeServiceProvider(
-                        VirtualNodeName=GetAtt(service_node.node, "VirtualNodeName")
-                    )
-                    if service_node
-                    else Ref(AWS_NO_VALUE),
-                    VirtualRouter=appmesh.VirtualRouterServiceProvider(
-                        VirtualRouterName=GetAtt(
-                            service_router.router, "VirtualRouterName"
+                    VirtualNode=(
+                        appmesh.VirtualNodeServiceProvider(
+                            VirtualNodeName=GetAtt(service_node.node, "VirtualNodeName")
                         )
-                    )
-                    if service_router
-                    else Ref(AWS_NO_VALUE),
+                        if service_node
+                        else Ref(AWS_NO_VALUE)
+                    ),
+                    VirtualRouter=(
+                        appmesh.VirtualRouterServiceProvider(
+                            VirtualRouterName=GetAtt(
+                                service_router.router, "VirtualRouterName"
+                            )
+                        )
+                        if service_router
+                        else Ref(AWS_NO_VALUE)
+                    ),
                 )
             ),
         )

ecs_composex/appmesh/appmesh_service.py

@@ -67,9 +67,11 @@ def __init__(
         self._sd_service = SdService(
             f"{namespace.logical_name}EcsServiceDiscovery{family.logical_name}",
             Description=Sub(f"{self.family.name} service"),
-            NamespaceId=Ref(self.namespace.cfn_resource)
-            if self.namespace.cfn_resource
-            else self.namespace.namespace_id["ImportValue"],
+            NamespaceId=(
+                Ref(self.namespace.cfn_resource)
+                if self.namespace.cfn_resource
+                else self.namespace.namespace_id["ImportValue"]
+            ),
             HealthCheckCustomConfig=HealthCheckCustomConfig(FailureThreshold=1.0),
             DnsConfig=DnsConfig(
                 RoutingPolicy="MULTIVALUE",

ecs_composex/cloudmap/cloudmap_ecs.py

@@ -7,6 +7,7 @@
 
 from __future__ import annotations
 
+import json
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -383,10 +384,10 @@ def set_efs(self) -> None:
                         "Properties": volume.efs_definition,
                         "MacroParameters": volume.parameters,
                         "Lookup": volume.lookup,
-                        "Services": [
-                            {"name": service.name, "access": "RW"}
+                        "Services": {
+                            service.name: {"Access": "RW"}
                             for service in volume.services
-                        ],
+                        },
                         "Settings": {"Subnets": "StorageSubnets"},
                         "Volume": volume,
                     }
@@ -513,13 +514,11 @@ def set_families(self) -> None:
         LOG.debug([self.families[family] for family in self.families])
 
     def set_content(self, kwargs, content=None, fully_load=True):
-        """
-        Method to initialize the compose content
+        """Method to initialize the compose content and validate as per the compose-x specs schemas."""
+        from jsonschema import Draft7Validator
+
+        from ecs_composex.specs import REGISTRY
 
-        :param dict kwargs:
-        :param dict content:
-        :param bool fully_load:
-        """
         files = (
             []
             if not keyisset(self.input_file_arg, kwargs)
@@ -529,16 +528,15 @@ def set_content(self, kwargs, content=None, fully_load=True):
         content_def = ComposeDefinition(files, content)
         self.original_content = content_def.definition
         self.compose_content = deepcopy(content_def.definition)
-        source = pkg_files("ecs_composex").joinpath("specs/compose-spec.json")
-        LOG.info(f"Validating against input schema {source}")
-        resolver = jsonschema.RefResolver(
-            f"file://{path.abspath(path.dirname(source))}/", None
-        )
-        jsonschema.validate(
-            content_def.definition,
-            loads(source.read_text()),
-            resolver=resolver,
-        )
+        source = str(pkg_files("ecs_composex").joinpath("specs/compose-spec.json"))
+        LOG.debug(f"Validating against input schema {source}")
+
+        with open(source) as compose_fd:
+            content = compose_fd.read()
+            schema = json.loads(content)
+
+        _eval = Draft7Validator(schema, registry=REGISTRY)
+        _eval.validate(content_def.definition)
         if fully_load:
             self.set_secrets()
             self.set_volumes()