Merge pull request #130 from epics-containers/dev

allow jinja substitution in db template filenames
epics-containers · Nov 6, 2023 · b21cfa9 · b21cfa9
2 parents 35142e0 + 8383bdb
commit b21cfa9
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 28 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -14,7 +14,7 @@ classifiers = [
 ]
 description = "IOC Builder for EPICS and Kubernetes"
 dependencies = [
-    "pydantic",
+    "pydantic==2.3.0",
     "typer",
     "ruamel.yaml",
     "jinja2",

diff --git a/src/ibek/render_db.py b/src/ibek/render_db.py
@@ -28,6 +28,8 @@ def add_row(self, filename: str, args: Dict[str, Any], entity: Entity) -> None:
         Adding a new template file if it does not already exist.
         Convert all arguments to strings.
         """
+        filename = render_with_utils(dict(entity), filename)
+
         if filename not in self.render_templates:
             # for new filenames create a new RenderDbTemplate entry
             headings = [str(i) for i in list(args.keys())]

diff --git a/tests/samples/outputs/all.ioc.subst b/tests/samples/outputs/all.ioc.subst
@@ -16,6 +16,13 @@ pattern
 	{ "AllObject Two", "Ref1",      "1.0",      "True"    }
 }
 
+file "jinjified1.db" {
+pattern 
+	{ "name"          }
+	{ "AllObject One" }
+	{ "AllObject Two" }
+}
+
 file "test.db" {
 pattern 
 	{ "name",                 "ip",        "value"          }

diff --git a/tests/samples/schemas/multiple.ibek.ioc.schema.json b/tests/samples/schemas/multiple.ibek.ioc.schema.json
@@ -238,16 +238,7 @@
     "entities": {
       "description": "List of entities this IOC instantiates",
       "items": {
-        "discriminator": {
-          "mapping": {
-            "module.AllObject": "#/$defs/module_AllObject",
-            "object_module.Consumer": "#/$defs/object_module_Consumer",
-            "object_module.ConsumerTwo": "#/$defs/object_module_ConsumerTwo",
-            "object_module.RefObject": "#/$defs/object_module_RefObject"
-          },
-          "propertyName": "type"
-        },
-        "oneOf": [
+        "anyOf": [
           {
             "$ref": "#/$defs/object_module_RefObject"
           },

diff --git a/tests/samples/schemas/objects.ibek.ioc.schema.json b/tests/samples/schemas/objects.ibek.ioc.schema.json
@@ -119,15 +119,7 @@
     "entities": {
       "description": "List of entities this IOC instantiates",
       "items": {
-        "discriminator": {
-          "mapping": {
-            "object_module.Consumer": "#/$defs/object_module_Consumer",
-            "object_module.ConsumerTwo": "#/$defs/object_module_ConsumerTwo",
-            "object_module.RefObject": "#/$defs/object_module_RefObject"
-          },
-          "propertyName": "type"
-        },
-        "oneOf": [
+        "anyOf": [
           {
             "$ref": "#/$defs/object_module_RefObject"
           },

diff --git a/tests/samples/schemas/utils.ibek.ioc.schema.json b/tests/samples/schemas/utils.ibek.ioc.schema.json
@@ -82,14 +82,7 @@
     "entities": {
       "description": "List of entities this IOC instantiates",
       "items": {
-        "discriminator": {
-          "mapping": {
-            "epics.InterruptVectorVME": "#/$defs/epics_InterruptVectorVME",
-            "epics.InterruptVectorVME2": "#/$defs/epics_InterruptVectorVME2"
-          },
-          "propertyName": "type"
-        },
-        "oneOf": [
+        "anyOf": [
           {
             "$ref": "#/$defs/epics_InterruptVectorVME"
           },

diff --git a/tests/samples/yaml/all.ibek.support.yaml b/tests/samples/yaml/all.ibek.support.yaml
@@ -115,3 +115,6 @@ defs:
           my_object:
           my_float:
           my_bool:
+      - file: jinjified{{ my_int }}.db
+        args:
+          name: