Merge pull request #29 from minos-framework/0.1.1

0.1.1

microservice/language/python/deploy/docker-compose/deploy/Dockerfile → microservice/language/python/deploy/docker-compose/Dockerfile

@@ -1,6 +1,6 @@
 FROM ghcr.io/clariteia/minos-microservice:0.1.8 as development
 
-COPY ./pyproject.toml ./poetry.lock ./
+COPY ./pyproject.toml ./
 RUN poetry install --no-root
 COPY . .
 CMD ["poetry", "run", "microservice", "start"]

microservice/language/python/init/.build_docker_compose.txt.jinja

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

microservice/language/python/init/_utils.py

@@ -20,5 +20,41 @@ def build_deploy_playbook(path: Path) -> str:
         data = list()
 
     data.append({"name": "Create Database", "import_playbook": "create-database.yaml"})
+    data.append({"name": "Create Query Database", "import_playbook": "create-database.yaml"})
 
     return yaml.dump(data, sort_keys=False)
+
+
+def build_docker_compose(path: Path, microservice_name: str) -> str:
+    """Build Docker Compose file content."""
+
+    if not path.exists():
+        raise ValueError("A base Compose file must exist.")
+
+    with path.open() as file:
+        data = yaml.safe_load(file)
+
+    if "x-microservice-environment" not in data:
+        data["x-microservice-environment"] = {
+            "MINOS_BROKER_QUEUE_HOST": "postgres",
+            "MINOS_BROKER_HOST": "kafka",
+            "MINOS_REPOSITORY_HOST": "postgres",
+            "MINOS_SNAPSHOT_HOST": "postgres",
+            "MINOS_DISCOVERY_HOST": "discovery",
+        }
+    if "x-microservice-depends-on" not in data:
+        data["x-microservice-depends-on"] = ["postgres", "kafka", "discovery"]
+
+    microservice_container = {
+        "restart": "always",
+        "build": {"context": f"microservices/{microservice_name}", "target": "production"},
+        "environment": data["x-microservice-environment"],
+        "depends_on": data["x-microservice-depends-on"],
+    }
+
+    data["services"][f"microservice-{microservice_name}"] = microservice_container
+
+    with path.open("w") as file:
+        yaml.dump(data, file, sort_keys=False)
+
+    return ""

microservice/language/python/init/config.yml.jinja

@@ -32,22 +32,28 @@ broker:
   port: 9092
   queue:
     database: {{ name }}_db
-    user: postgres
-    password: ""
+    user: minos
+    password: min0s
     host: localhost
     port: 5432
     records: 1000
     retry: 2
 repository:
   database: {{ name }}_db
+  user: minos
+  password: min0s
+  host: localhost
+  port: 5432
+query_repository:
+  database: {{ name }}_query_db
   user: postgres
   password: ""
   host: localhost
   port: 5432
 snapshot:
   database: {{ name }}_db
-  user: postgres
-  password: ""
+  user: minos
+  password: min0s
   host: localhost
   port: 5432
 saga:

microservice/language/python/init/copier.yml

@@ -26,7 +26,7 @@ deploy:
   choices:
     - docker-compose
     - kubernetes
-  default: kubernetes
+  default: docker-compose
 
 _envops:
   block_start_string: "{%"
@@ -45,3 +45,4 @@ _exclude:
 
 _functions:
   - "_utils.build_deploy_playbook"
+  - "_utils.build_docker_compose"

microservice/language/python/init/src/__init__.py.jinja

@@ -13,4 +13,5 @@ from .commands import (
 )
 from .queries import (
     {{ aggregate }}QueryService,
+    {{ aggregate }}QueryServiceRepository,
 )

microservice/language/python/init/src/queries/__init__.py.jinja

@@ -1,3 +1,7 @@
 from .services import (
     {{ aggregate }}QueryService,
 )
+
+from .repository import (
+    {{ aggregate }}QueryServiceRepository,
+)

microservice/language/python/init/src/queries/models.py.jinja

@@ -0,0 +1,3 @@
+from sqlalchemy.orm import declarative_base
+
+Base = declarative_base()

microservice/language/python/init/src/queries/repository.py.jinja

@@ -0,0 +1,22 @@
+from minos.common import MinosSetup, MinosConfig
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+from src.queries.models import Base
+
+
+class {{ aggregate }}QueryServiceRepository(MinosSetup):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.engine = create_engine("postgresql+psycopg2://postgres:@localhost:5432/{{ name }}_query_db".format(**kwargs))
+        self.session = sessionmaker(bind=self.engine)
+
+    async def _setup(self) -> None:
+        Base.metadata.create_all(self.engine)
+
+    @classmethod
+    def _from_config(cls, *args, config: MinosConfig, **kwargs) -> {{ aggregate }}QueryRepository:
+        return cls(*args, **(config.query_repository._asdict()) | kwargs)
+
+    @property
+    def session(self):
+        return self.session

microservice/language/python/package-manager/poetry/pyproject.toml.jinja

@@ -15,6 +15,7 @@ minos-microservice-cqrs = "^0.5.0"
 minos-broker-kafka = "^0.5.0"
 minos-discovery-minos = "^0.5.0"
 typer = "^0.3.2"
+SQLAlchemy = "^1.4.32"
 
 [tool.poetry.dev-dependencies]
 black = "^19.10b"

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

@@ -21,7 +21,7 @@ def build_docker_compose(path: Path) -> str:
     container = {
         "restart": "always",
         "build": "external/apigateway",
-        "ports": ["5566"],
+        "ports": ["5566:5566"],
         "depends_on": ["discovery"],
         "environment": {
             "PYTHONPATH": "/api_gateway",

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

@@ -29,7 +29,7 @@ spec:
                   fieldPath: status.podIP
           volumeMounts:
             - name: kafka
-              mountPath: /kafka
+              mountPath: /kafka/kafka-logs
       volumes:
         - name: kafka
           persistentVolumeClaim:

project/deploy/docker-compose/_utils.py

@@ -14,8 +14,6 @@ def build_docker_compose(path: Path) -> str:
 
     data = dict()
     data["version"] = "3.9"
-    data["x-microservice-environment"] = []
-    data["x-microservice-depends-on"] = []
     data["volumes"] = {}
     data["services"] = {}
 

project/init/copier.yml

@@ -9,6 +9,16 @@ project_version:
   type: str
   help: What is the version of the project?
   default: 0.1.0
+project_deploy:
+  type: str
+  link:
+    docker-compose: "{{ template_registry }}/project-deploy-docker-compose.tar.gz"
+    kubernetes: "{{ template_registry }}/project-deploy-kubernetes.tar.gz"
+  help: What deploy system do you want to use?
+  choices:
+    - docker-compose
+    - kubernetes
+  default: docker-compose
 
 _envops:
   block_start_string: "{%"