Merge remote-tracking branch 'origin/main' into issue-4-refactor-link…

…-strategy

Makefile

@@ -2,4 +2,4 @@
 
 build:
 	rm -rf .build
-	sh build.sh
+	sh build.sh

build.sh

@@ -81,7 +81,7 @@ tar -czf "$BUILD_DIR/project-deploy-docker-compose.tar.gz" -C "$ROOT_DIR/project
 
 echo "Building Project Discovery Minos Init Template..."
 tar -czf "$BUILD_DIR/project-discovery-minos-init.tar.gz" -C "$ROOT_DIR/project/discovery/minos/init" .
-  
+
 echo "Building Project Discovery Minos Deploy Docker Compose Template..."
 tar -czf "$BUILD_DIR/project-discovery-minos-deploy-docker-compose.tar.gz" -C "$ROOT_DIR/project/discovery/minos/deploy/docker-compose" .
 
@@ -95,4 +95,4 @@ echo "Building Project Deploy Docker Compose Template..."
 tar -czf "$BUILD_DIR/project-deploy-docker-compose.tar.gz" -C "$ROOT_DIR/project/deploy/docker-compose" .
 
 echo "Building Project Deploy Kubernetes Template..."
-tar -czf "$BUILD_DIR/project-deploy-kubernetes.tar.gz" -C "$ROOT_DIR/project/deploy/kubernetes" .
+tar -czf "$BUILD_DIR/project-deploy-kubernetes.tar.gz" -C "$ROOT_DIR/project/deploy/kubernetes" .

microservice/language/python/deploy/docker-compose/.dockerignore

@@ -1,3 +1,3 @@
 .venv
 *.lmdb
-dist/
+dist/

microservice/language/python/deploy/kubernetes/.dockerignore

@@ -1,3 +1,3 @@
 .venv
 *.lmdb
-dist/
+dist/

microservice/language/python/deploy/kubernetes/copier.yml

@@ -28,4 +28,4 @@ _envops:
 _templates_suffix: .jinja
 
 _tasks:
-  - make -s deploy
+  - make -s deploy

microservice/language/python/deploy/kubernetes/deploy/deployment.yaml.jinja

@@ -21,4 +21,4 @@ spec:
             - containerPort: 8080
           envFrom:
             - configMapRef:
-                name: {{ kubernetes_config }}
+                name: {{ kubernetes_config }}

microservice/language/python/deploy/kubernetes/deploy/service.yaml.jinja

@@ -8,4 +8,4 @@ spec:
   ports:
     - port: 8080
   selector:
-   app.kubernetes.io/name: microservice-{{ name }}
+   app.kubernetes.io/name: microservice-{{ name }}

microservice/language/python/init/Makefile.jinja

@@ -20,4 +20,4 @@ coverage:
 	poetry run coverage xml
 
 create-database:
-	$(MAKE) -C ../../external/postgres create-database DB_NAME={{ name }}_db
+	$(MAKE) -C ../../external/postgres create-database DB_NAME={{ name }}_db

microservice/language/python/init/copier.yml

@@ -67,4 +67,4 @@ _envops:
 _templates_suffix: .jinja
 
 _tasks:
-  - make -s create-database
+  - make -s create-database

microservice/language/python/init/src/cli.py

@@ -1,31 +1,28 @@
 import logging
 import sys
 from pathlib import (
-    Path,
-)
+    Path, )
 from typing import (
-    Optional,
-)
+    Optional, )
 
 import typer
-
 from minos.common import (
-    EntrypointLauncher,
-)
+    EntrypointLauncher, )
 
 logging.getLogger("aiohttp.access").setLevel(logging.WARNING)
 
 app = typer.Typer()
 
 
 @app.command("start")
-def start(
-    file_path: Optional[Path] = typer.Argument(
-        "config.yml", help="Microservice configuration file.", envvar="MINOS_CONFIGURATION_FILE_PATH",
-    )
-):
+def start(file_path: Optional[Path] = typer.Argument(
+    "config.yml",
+    help="Microservice configuration file.",
+    envvar="MINOS_CONFIGURATION_FILE_PATH",
+)):
     """Start the microservice."""
-    launcher = EntrypointLauncher.from_config(file_path, external_modules=[sys.modules["src"]])
+    launcher = EntrypointLauncher.from_config(
+        file_path, external_modules=[sys.modules["src"]])
     launcher.launch()
 
 

microservice/language/python/init/tests/utils.py

@@ -1,36 +1,27 @@
 from __future__ import (
-    annotations,
-)
+    annotations, )
 
 from pathlib import (
-    Path,
-)
+    Path, )
 from typing import (
-    Optional,
-)
-from uuid import (
-    UUID,
-    uuid4,
-)
-
-from minos.common import (
-    CommandReply,
-    DependencyInjector,
-    InMemoryRepository,
-    InMemorySnapshot,
-    MinosBroker,
-    MinosConfig,
-    MinosSagaManager,
-    Model,
-)
+    Optional, )
+from uuid import UUID
+from uuid import uuid4
+
+from minos.common import CommandReply
+from minos.common import DependencyInjector
+from minos.common import InMemoryRepository
+from minos.common import InMemorySnapshot
+from minos.common import MinosBroker
+from minos.common import MinosConfig
+from minos.common import MinosSagaManager
+from minos.common import Model
 from minos.networks import (
-    Request,
-)
+    Request, )
 
 
 class _FakeRequest(Request):
     """For testing purposes"""
-
     def __init__(self, content):
         super().__init__()
         self._content = content
@@ -54,14 +45,12 @@ def __repr__(self) -> str:
 
 class _FakeBroker(MinosBroker):
     """For testing purposes."""
-
     async def send(self, items: list[Model], **kwargs) -> None:
         """For testing purposes."""
 
 
 class _FakeSagaManager(MinosSagaManager):
     """For testing purposes."""
-
     async def _run_new(self, name: str, **kwargs) -> UUID:
         """For testing purposes."""
 

microservice/language/python/package-manager/pip/requirements.txt

@@ -3,4 +3,4 @@ minos-microservice-networks~=0.3.2
 minos-microservice-aggregate~=0.2.2
 minos-microservice-saga~=0.3.5
 minos-microservice-cqrs~=0.2.1
-typer~=0.3.2
+typer~=0.3.2

microservice/language/python/package-manager/poetry/copier.yml

@@ -26,4 +26,4 @@ _envops:
 _templates_suffix: .jinja
 
 _tasks:
-  - make -s lock
+  - make -s lock

project/apigateway/minos/deploy/docker-compose/_utils.py

@@ -1,6 +1,8 @@
-from __future__ import annotations
+from __future__ import (
+    annotations, )
 
-from pathlib import Path
+from pathlib import (
+    Path, )
 
 import yaml
 
@@ -17,12 +19,8 @@ def build_docker_compose(path: Path) -> str:
     container = {
         "restart": "always",
         "build": "external/apigateway",
-        "ports": [
-            "5566"
-        ],
-        "depends_on": [
-            "discovery"
-        ],
+        "ports": ["5566"],
+        "depends_on": ["discovery"],
         "environment": {
             "PYTHONPATH": "/api_gateway",
             "DISCOVERY_SERVICE_HOST": "discovery",

project/apigateway/minos/deploy/docker-compose/copier.yml

@@ -14,4 +14,4 @@ _exclude:
   - "_utils.py"
 
 _functions:
-  - "_utils.build_docker_compose"
+  - "_utils.build_docker_compose"

project/apigateway/minos/deploy/docker-compose/docker-compose.yml.jinja

@@ -1 +1 @@
-{{ build_docker_compose(destination / "docker-compose.yml") }}
+{{ build_docker_compose(destination / "docker-compose.yml") }}

project/apigateway/minos/deploy/docker-compose/external/apigateway/Dockerfile

@@ -3,4 +3,4 @@ FROM python
 RUN pip install minos-apigateway==0.1.0
 
 COPY config.yml ./config.yml
-CMD ["api_gateway", "start", "config.yml"]
+CMD ["api_gateway", "start", "config.yml"]

project/apigateway/minos/deploy/docker-compose/external/apigateway/config.yml

@@ -4,10 +4,10 @@ rest:
   cors:
     enabled: true
   auth:
-      host: localhost
-      port: 8092
-      method: POST
-      path: /validate-token
+    host: localhost
+    port: 8092
+    method: POST
+    path: /validate-token
 discovery:
   host: localhost
-  port: 5567
+  port: 5567

project/apigateway/minos/deploy/kubernetes/copier.yml

@@ -14,4 +14,4 @@ _envops:
 _templates_suffix: .jinja
 
 _tasks:
-  - make -s -C external/apigateway deploy
+  - make -s -C external/apigateway deploy

project/apigateway/minos/deploy/kubernetes/external/apigateway/deploy/configmap.yaml.jinja

@@ -9,4 +9,4 @@ data:
   API_GATEWAY_REST_PORT: "5566"
   API_GATEWAY_DISCOVERY_PORT: "5567"
   API_GATEWAY_DISCOVERY_HOST: "minos-discovery.{{ project_name }}.svc.cluster.local"
-  API_GATEWAY_REST_AUTH_ENABLED: "false"
+  API_GATEWAY_REST_AUTH_ENABLED: "false"

project/apigateway/minos/deploy/kubernetes/external/apigateway/deploy/deployment.yaml.jinja

@@ -21,4 +21,4 @@ spec:
             - containerPort: 5566
           envFrom:
             - configMapRef:
-                name: apigateway-config
+                name: apigateway-config

project/apigateway/minos/deploy/kubernetes/external/apigateway/deploy/ingress.yaml.jinja

@@ -15,4 +15,4 @@ spec:
               service:
                 name: minos-apigateway
                 port:
-                  number: 5566
+                  number: 5566

project/apigateway/minos/deploy/kubernetes/external/apigateway/deploy/service.yaml.jinja

@@ -8,4 +8,4 @@ spec:
   ports:
     - port: 5566
   selector:
-   app.kubernetes.io/name: minos-apigateway
+   app.kubernetes.io/name: minos-apigateway

project/apigateway/minos/deploy/remote/copier.yml

@@ -1,4 +1,3 @@
-
 _envops:
   block_start_string: "{%"
   block_end_string: "%}"

project/broker/kafka/deploy/docker-compose/_utils.py

@@ -1,6 +1,8 @@
-from __future__ import annotations
+from __future__ import (
+    annotations, )
 
-from pathlib import Path
+from pathlib import (
+    Path, )
 
 import yaml
 
@@ -24,12 +26,8 @@ def build_docker_compose(path: Path) -> str:
     kafka_container = {
         "restart": "always",
         "image": "wurstmeister/kafka:latest",
-        "ports": [
-            "9092"
-        ],
-        "depends_on": [
-            "zookeeper"
-        ],
+        "ports": ["9092"],
+        "depends_on": ["zookeeper"],
         "volumes": ["kafka_volume:/kafka"],
         "environment": {
             "KAFKA_DELETE_TOPIC_ENABLE": "true",

project/broker/kafka/deploy/docker-compose/copier.yml

@@ -14,4 +14,4 @@ _exclude:
   - "_utils.py"
 
 _functions:
-  - "_utils.build_docker_compose"
+  - "_utils.build_docker_compose"

project/broker/kafka/deploy/docker-compose/docker-compose.yml.jinja

@@ -1 +1 @@
-{{ build_docker_compose(destination / "docker-compose.yml") }}
+{{ build_docker_compose(destination / "docker-compose.yml") }}

project/broker/kafka/deploy/kubernetes/copier.yml

@@ -15,4 +15,4 @@ _templates_suffix: .jinja
 
 _tasks:
   - make -s -C external/zookeeper deploy
-  - make -s -C external/kafka deploy
+  - make -s -C external/kafka deploy

project/broker/kafka/deploy/kubernetes/external/kafka/deploy/configmap.yaml.jinja

@@ -8,4 +8,4 @@ metadata:
 data:
   KAFKA_DELETE_TOPIC_ENABLE: "true"
   KAFKA_PORT: "9092"
-  KAFKA_ZOOKEEPER_CONNECT: "zookeeper.{{ project_name }}.svc.cluster.local:2181"
+  KAFKA_ZOOKEEPER_CONNECT: "zookeeper.{{ project_name }}.svc.cluster.local:2181"

project/broker/kafka/deploy/kubernetes/external/kafka/deploy/deployment.yaml.jinja

@@ -26,4 +26,4 @@ spec:
             - name: KAFKA_ADVERTISED_HOST_NAME
               valueFrom:
                 fieldRef:
-                  fieldPath: status.podIP
+                  fieldPath: status.podIP

project/broker/kafka/deploy/kubernetes/external/kafka/deploy/service.yaml.jinja

@@ -8,4 +8,4 @@ spec:
   ports:
     - port: 9092
   selector:
-    app.kubernetes.io/name: kafka
+    app.kubernetes.io/name: kafka

project/broker/kafka/deploy/kubernetes/external/zookeeper/deploy/deployment.yaml.jinja

@@ -18,4 +18,4 @@ spec:
           image: wurstmeister/zookeeper:latest
           imagePullPolicy: Always
           ports:
-            - containerPort: 2181
+            - containerPort: 2181

project/broker/kafka/deploy/kubernetes/external/zookeeper/deploy/service.yaml.jinja

@@ -8,4 +8,4 @@ spec:
   ports:
     - port: 2181
   selector:
-    app.kubernetes.io/name: zookeeper
+    app.kubernetes.io/name: zookeeper

project/broker/kafka/deploy/remote/copier.yml

@@ -1,4 +1,3 @@
-
 _envops:
   block_start_string: "{%"
   block_end_string: "%}"

project/database/postgres/deploy/docker-compose/_utils.py

@@ -1,6 +1,8 @@
-from __future__ import annotations
+from __future__ import (
+    annotations, )
 
-from pathlib import Path
+from pathlib import (
+    Path, )
 
 import yaml
 
@@ -20,9 +22,7 @@ def build_docker_compose(path: Path) -> str:
         "restart": "always",
         "build": "external/postgres",
         "command": "postgres -c 'max_connections=200'",
-        "ports": [
-            "5432"
-        ],
+        "ports": ["5432"],
         "volumes": [
             "postgres_volume:/var/lib/postgresql",
         ],