fix: db write

Author: Morriz

lib/data.py

@@ -13,6 +13,16 @@ def get_db() -> Dict[str, List[Dict[str, Any]] | Dict[str, Any]]:
         return yaml.safe_load(f)
 
 
+def write_db(partial: Dict[str, List[Dict[str, Any]] | Dict[str, Any]]) -> None:
+    """Write the db"""
+    # get the db first
+    db = get_db()
+    # merge wwith partial
+    db = {**db, **partial}
+    with open("db.yml", "w", encoding="utf-8") as f:
+        yaml.dump(db, f)
+
+
 def validate_db() -> None:
     """Validate db.yml contents"""
     debug("Validating db.yml")
@@ -67,8 +77,7 @@ def write_projects(projects: List[Project]) -> None:
     """Write the projects to the db"""
     debug(f"Writing {len(projects)} projects to the db")
     projects_dump = [p.model_dump(exclude_defaults=True, exclude_none=True, exclude_unset=True) for p in projects]
-    with open("db.yml", "w", encoding="utf-8") as f:
-        yaml.dump({"projects": projects_dump}, f)
+    write_db({"projects": projects_dump})
 
 
 def get_project(name: str, throw: bool = True) -> Project:

lib/data_test.py

@@ -13,6 +13,7 @@
     get_service,
     upsert_env,
     upsert_project,
+    write_db,
     write_projects,
 )
 from lib.models import Env, Project, Service
@@ -21,21 +22,32 @@
 
 class TestCodeUnderTest(unittest.TestCase):
 
-    # write all projects
+    @mock.patch("lib.data.get_db", return_value=test_db.copy())
     @mock.patch(
         "lib.data.yaml",
         return_value={"dump": mock.Mock()},
     )
     @mock.patch("builtins.open", new_callable=mock.mock_open)
-    def test_write_projects(self, mock_open: Mock, mock_yaml: Mock) -> None:
+    def test_write_db(self, mock_open: Mock, mock_yaml: Mock, _: Mock) -> None:
 
         # Call the function under test
-        write_projects(test_projects)
+        write_db({"projects": test_db["projects"]})
 
         mock_open.assert_called_once_with("db.yml", "w", encoding="utf-8")
 
         # Assert that the mock functions were called correctly
-        mock_yaml.dump.assert_called_once_with({"projects": test_db["projects"]}, mock_open())
+        mock_yaml.dump.assert_called_once_with(
+            {"plugins": test_db["plugins"], "projects": test_db["projects"]}, mock_open()
+        )
+
+    @mock.patch("lib.data.write_db")
+    def test_write_projects(self, mock_write_db: Mock) -> None:
+
+        # Call the function under test
+        write_projects(test_projects)
+
+        # Assert that the mock functions were called correctly
+        mock_write_db.assert_called_once_with({"projects": test_db["projects"]})
 
     # Get projects with filter
     @mock.patch(

lib/test_stubs.py

@@ -1,10 +1,32 @@
 import yaml
 
-from lib.models import Project, Service
+from lib.models import Plugin, Project, Service
 
 with open("db.yml.sample", encoding="utf-8") as f:
     test_db = yaml.safe_load(f)
 
+test_plugins = {
+    "crowdsec": Plugin(
+        **{
+            "enabled": False,
+            "version": "v1.2.0",
+            "options": {
+                "logLevel": "INFO",
+                "updateIntervalSeconds": 60,
+                "defaultDecisionSeconds": 60,
+                "httpTimeoutSeconds": 10,
+                "crowdsecCapiMachineId": "login",
+                "crowdsecCapiPassword": "password",
+                "crowdsecCapiScenarios": [
+                    "crowdsecurity/http-path-traversal-probing",
+                    "crowdsecurity/http-xss-probing",
+                    "crowdsecurity/http-generic-bf",
+                ],
+            },
+        }
+    )
+}
+
 test_projects = [
     Project(
         name="home-assistant",

openapi.yaml

@@ -444,32 +444,49 @@ components:
       description: Project model
     Service:
       properties:
-        name:
+        command:
           type: string
-          title: Name
-        port:
-          type: integer
-          title: Port
-          default: 8080
+          title: Command
+        env:
+          allOf:
+          - $ref: '#/components/schemas/Env'
         image:
           type: string
           title: Image
-        command:
+        labels:
+          items:
+            type: string
+          type: array
+          title: Labels
+          default: []
+        name:
           type: string
-          title: Command
+          title: Name
         passthrough:
           type: boolean
           title: Passthrough
           default: false
+        path_prefix:
+          type: string
+          title: Path Prefix
+        path_remove:
+          type: boolean
+          title: Path Remove
+          default: false
+        port:
+          type: integer
+          title: Port
+          default: 8080
+        proxyprotocol:
+          type: boolean
+          title: Proxyprotocol
+          default: true
         volumes:
           items:
             type: string
           type: array
           title: Volumes
           default: []
-        env:
-          allOf:
-          - $ref: '#/components/schemas/Env'
       type: object
       required:
       - name