refactor: move realm definitions to deployment directory

Author: wakonig

backend/bec_atlas/deployment/realms/developer_machines.yaml

@@ -0,0 +1,63 @@
+# This file defines the deployments for various beamlines at PSI.
+# The structure is as follows:
+#
+# Realm:
+#   xname: <xname> # Optional: xname if available e.g. X12SA
+#   managers: # defining the manager groups
+#     - <access_group>
+#   deployments:
+#     bec-vm-host-00x.psi.ch:
+#       name: <name>
+#       description: <description>
+#       deployment_access: # defining permissions to change the DeploymentAccess and thus the ACLs
+#         - <access_group>
+#       experiment_access: # defining additional groups to retrieve the Experiment info
+#         - <access_group>
+
+BL_wakonig:
+  managers:
+    - wakonig_k
+  deployments:
+    localhost:
+      name: production
+      description: Primary deployment for BL_wakonig
+      deployment_access:
+        - wakonig_k
+      experiment_access:
+        - wakonig_k
+
+BL_appel:
+  managers:
+    - appel_c
+  deployments:
+    localhost:
+      name: production
+      description: Primary deployment for BL_appel
+      deployment_access:
+        - appel_c
+      experiment_access:
+        - appel_c
+
+BL_wyzula:
+  managers:
+    - wyzula_j
+  deployments:
+    localhost:
+      name: production
+      description: Primary deployment for BL_wyzula
+      deployment_access:
+        - wyzula_j
+      experiment_access:
+        - wyzula_j
+
+BL_perl:
+  managers:
+    - perl_d
+  deployments:
+    localhost:
+      name: production
+      description: Primary deployment for BL_perl
+      deployment_access:
+        - perl_d
+      experiment_access:
+        - perl_d

backend/utils/sls_deployments.yaml …s/deployment/realms/sls_deployments.yamlbackend/utils/sls_deployments.yaml renamed to backend/bec_atlas/deployment/realms/sls_deployments.yaml backend/utils/sls_deployments.yaml renamed to backend/bec_atlas/deployment/realms/sls_deployments.yaml

@@ -53,11 +53,15 @@ def _load_deployments(self):
                 )
 
                 # Check if the deployment already exists in the database and insert if not
-                existing_deployment = self.db["deployments"].find_one({"name": deployment.name})
+                existing_deployment = self.db["deployments"].find_one(
+                    {"name": deployment.name, "realm_id": deployment.realm_id}
+                )
                 if existing_deployment is None:
                     print(f"Inserting deployment: {deployment.name}")
                     self.db["deployments"].insert_one(deployment.__dict__)
-                    existing_deployment = self.db["deployments"].find_one({"name": deployment.name})
+                    existing_deployment = self.db["deployments"].find_one(
+                        {"name": deployment.name, "realm_id": deployment.realm_id}
+                    )
                 else:
                     # Update the access groups if necessary
                     if existing_deployment["access_groups"] != deployment.access_groups:
@@ -141,9 +145,12 @@ def _load_deployments(self):
 
 
 if __name__ == "__main__":
+    import glob
 
-    default_path = os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname((__file__)))))
+    default_path = os.path.abspath(os.path.dirname(os.path.dirname((__file__))))
     loader = DeploymentIngestor({"host": "localhost", "port": 27017})
-    with open(os.path.join(default_path, "utils/sls_deployments.yaml"), "r") as file:
-        data = yaml.safe_load(file)
-    loader.load(data)
+    realm_files = glob.glob(os.path.join(default_path, "deployment/realms/*.yaml"))
+    for realm_file in realm_files:
+        with open(realm_file, "r") as file:
+            data = yaml.safe_load(file)
+        loader.load(data)

backend/bec_atlas/ingestor/deployment_ingestor.py

@@ -1,3 +1,4 @@
+import glob
 import os
 
 import typer
@@ -10,19 +11,29 @@
 
 
 @app.command("deployments")
-def update_deployments(file_path: str):
+def update_deployments(file_path: str = typer.Argument(None, help="Path to the YAML file")):
     """
     Update the available realms and deployments using the provided YAML file.
+    If no path is specified, the deployment realms are used (deployment/realms/*.yaml)
     """
-    if not os.path.exists(file_path):
-        typer.echo(f"File not found: {file_path}")
-        raise typer.Exit(code=1)
-
-    with open(file_path, "r") as f:
-        data = yaml.safe_load(f)
-        # Process the YAML data
-        typer.echo(f"Updating deployments with data from {file_path}")
-    DeploymentIngestor({"host": "localhost", "port": 27017}).load(data)
+    if file_path is not None:
+        if not os.path.exists(file_path):
+            typer.echo(f"File not found: {file_path}")
+            raise typer.Exit(code=1)
+        files = [file_path]
+
+    else:
+        base_path = os.path.abspath(os.path.dirname(os.path.dirname((__file__))))
+        realm_path = os.path.join(base_path, "deployment/realms/*.yaml")
+
+        files = glob.glob(realm_path)
+
+    for file in files:
+        with open(file, "r") as f:
+            data = yaml.safe_load(f)
+            # Process the YAML data
+            typer.echo(f"Updating deployments with data from {file}")
+        DeploymentIngestor({"host": "localhost", "port": 27017}).load(data)
 
 
 @app.command("experiments")