tfpt: fix dict copy (#1107)

truenas · Dec 5, 2024 · efdebec · efdebec
1 parent bc997c7
commit efdebec
Show file tree

Hide file tree

Showing 54 changed files with 35 additions and 11 deletions.
diff --git a/ix-dev/community/tftpd-hpa/app.yaml b/ix-dev/community/tftpd-hpa/app.yaml
@@ -17,8 +17,8 @@ icon: https://media.sys.truenas.net/apps/tftpd-hpa/icons/icon.png
 keywords:
 - tftp
 - netboot
-lib_version: 2.0.29
-lib_version_hash: 3c2dd83143491fdfc23e5e13de9db0aa79bb7846a2b7c32a76a479e334c54590
+lib_version: 2.0.32
+lib_version_hash: 4a0bf69cccda322e191eab36ab81ca6d0c8e5d64a0b2fa117c609804b55b86c6
 maintainers:
 - email: [email protected]
   name: truenas
@@ -36,4 +36,4 @@ sources:
 - https://hub.docker.com/r/ixsystems/tftpd-hpa
 title: TFTP Server
 train: community
-version: 1.1.0
+version: 1.1.1
diff --git a/ix-dev/community/tftpd-hpa/templates/docker-compose.yaml b/ix-dev/community/tftpd-hpa/templates/docker-compose.yaml
@@ -19,7 +19,11 @@
   {% do c1.ports.add_port(values.network.tftp_port, values.consts.internal_tftp_port) %}
 {% endif %}
 
-{% set tftpboot_store = dict(values.storage.tftpboot, **{"host_path_config": {"auto_permission": True}}) %}
+{% set tftpboot_store = tpl.funcs.copy_dict(values.storage.tftpboot) %}
+{% if values.storage.tftpboot.type == "host_path" %}
+  {% do tftpboot_store.host_path_config.update({"auto_permission": True}) %}
+{% endif %}
+
 {% do c1.add_storage("/tftpboot", tftpboot_store) %}
 {% do perm_container.add_or_skip_action("tftpboot", tftpboot_store, dict(perm_config, **{"chmod": "0757" if values.tftpd.allow_create else "0555"})) %}
 

diff --git a/...emplates/library/base_v2_0_29/__init__.py → ...emplates/library/base_v2_0_32/__init__.py b/...emplates/library/base_v2_0_29/__init__.py → ...emplates/library/base_v2_0_32/__init__.py
diff --git a/...templates/library/base_v2_0_29/configs.py → ...templates/library/base_v2_0_32/configs.py b/...templates/library/base_v2_0_29/configs.py → ...templates/library/base_v2_0_32/configs.py
diff --git a/...mplates/library/base_v2_0_29/container.py → ...mplates/library/base_v2_0_32/container.py b/...mplates/library/base_v2_0_29/container.py → ...mplates/library/base_v2_0_32/container.py
diff --git a/...templates/library/base_v2_0_29/depends.py → ...templates/library/base_v2_0_32/depends.py b/...templates/library/base_v2_0_29/depends.py → ...templates/library/base_v2_0_32/depends.py
diff --git a/.../templates/library/base_v2_0_29/deploy.py → .../templates/library/base_v2_0_32/deploy.py b/.../templates/library/base_v2_0_29/deploy.py → .../templates/library/base_v2_0_32/deploy.py
diff --git a/...pa/templates/library/base_v2_0_29/deps.py → ...pa/templates/library/base_v2_0_32/deps.py b/...pa/templates/library/base_v2_0_29/deps.py → ...pa/templates/library/base_v2_0_32/deps.py
diff --git a/.../templates/library/base_v2_0_29/device.py → .../templates/library/base_v2_0_32/device.py b/.../templates/library/base_v2_0_29/device.py → .../templates/library/base_v2_0_32/device.py
diff --git a/...templates/library/base_v2_0_29/devices.py → ...templates/library/base_v2_0_32/devices.py b/...templates/library/base_v2_0_29/devices.py → ...templates/library/base_v2_0_32/devices.py
diff --git a/...hpa/templates/library/base_v2_0_29/dns.py → ...hpa/templates/library/base_v2_0_32/dns.py b/...hpa/templates/library/base_v2_0_29/dns.py → ...hpa/templates/library/base_v2_0_32/dns.py
diff --git a/...lates/library/base_v2_0_29/environment.py → ...lates/library/base_v2_0_32/environment.py b/...lates/library/base_v2_0_29/environment.py → ...lates/library/base_v2_0_32/environment.py
diff --git a/...a/templates/library/base_v2_0_29/error.py → ...a/templates/library/base_v2_0_32/error.py b/...a/templates/library/base_v2_0_29/error.py → ...a/templates/library/base_v2_0_32/error.py
diff --git a/...mplates/library/base_v2_0_29/formatter.py → ...mplates/library/base_v2_0_32/formatter.py b/...mplates/library/base_v2_0_29/formatter.py → ...mplates/library/base_v2_0_32/formatter.py
diff --git a/...mplates/library/base_v2_0_29/functions.py → ...mplates/library/base_v2_0_32/functions.py b/...mplates/library/base_v2_0_29/functions.py → ...mplates/library/base_v2_0_32/functions.py
@@ -1,4 +1,5 @@
 import re
+import copy
 import bcrypt
 import secrets
 from base64 import b64encode
@@ -79,7 +80,7 @@ def _is_number(self, string):
             return False
 
     def _copy_dict(self, dict):
-        return dict.copy()
+        return copy.deepcopy(dict)
 
     def _merge_dicts(self, *dicts):
         merged_dict = {}
@@ -93,6 +94,16 @@ def _disallow_chars(self, string: str, chars: list[str], key: str):
                 raise RenderError(f"Disallowed character [{char}] in [{key}]")
         return string
 
+    def _or_default(self, value, default):
+        if not value:
+            return default
+        return value
+
+    def _temp_config(self, name):
+        if not name:
+            raise RenderError("Expected [name] to be set when calling [temp_config].")
+        return {"type": "temporary", "volume_config": {"volume_name": name}}
+
     def _get_host_path(self, storage):
         source_type = storage.get("type", "")
         if not source_type:
@@ -133,4 +144,6 @@ def func_map(self):
             "secure_string": self._secure_string,
             "disallow_chars": self._disallow_chars,
             "get_host_path": self._get_host_path,
+            "or_default": self._or_default,
+            "temp_config": self._temp_config,
         }
diff --git a/...lates/library/base_v2_0_29/healthcheck.py → ...lates/library/base_v2_0_32/healthcheck.py b/...lates/library/base_v2_0_29/healthcheck.py → ...lates/library/base_v2_0_32/healthcheck.py
diff --git a/.../templates/library/base_v2_0_29/labels.py → .../templates/library/base_v2_0_32/labels.py b/.../templates/library/base_v2_0_29/labels.py → .../templates/library/base_v2_0_32/labels.py
diff --git a/...a/templates/library/base_v2_0_29/notes.py → ...a/templates/library/base_v2_0_32/notes.py b/...a/templates/library/base_v2_0_29/notes.py → ...a/templates/library/base_v2_0_32/notes.py
diff --git a/.../templates/library/base_v2_0_29/portal.py → .../templates/library/base_v2_0_32/portal.py b/.../templates/library/base_v2_0_29/portal.py → .../templates/library/base_v2_0_32/portal.py
diff --git a/...templates/library/base_v2_0_29/portals.py → ...templates/library/base_v2_0_32/portals.py b/...templates/library/base_v2_0_29/portals.py → ...templates/library/base_v2_0_32/portals.py
diff --git a/...a/templates/library/base_v2_0_29/ports.py → ...a/templates/library/base_v2_0_32/ports.py b/...a/templates/library/base_v2_0_29/ports.py → ...a/templates/library/base_v2_0_32/ports.py
diff --git a/.../templates/library/base_v2_0_29/render.py → .../templates/library/base_v2_0_32/render.py b/.../templates/library/base_v2_0_29/render.py → .../templates/library/base_v2_0_32/render.py
diff --git a/...mplates/library/base_v2_0_29/resources.py → ...mplates/library/base_v2_0_32/resources.py b/...mplates/library/base_v2_0_29/resources.py → ...mplates/library/base_v2_0_32/resources.py
diff --git a/...templates/library/base_v2_0_29/restart.py → ...templates/library/base_v2_0_32/restart.py b/...templates/library/base_v2_0_29/restart.py → ...templates/library/base_v2_0_32/restart.py
diff --git a/...templates/library/base_v2_0_29/storage.py → ...templates/library/base_v2_0_32/storage.py b/...templates/library/base_v2_0_29/storage.py → ...templates/library/base_v2_0_32/storage.py
diff --git a/...templates/library/base_v2_0_29/sysctls.py → ...templates/library/base_v2_0_32/sysctls.py b/...templates/library/base_v2_0_29/sysctls.py → ...templates/library/base_v2_0_32/sysctls.py
diff --git a/...es/library/base_v2_0_29/tests/__init__.py → ...es/library/base_v2_0_32/tests/__init__.py b/...es/library/base_v2_0_29/tests/__init__.py → ...es/library/base_v2_0_32/tests/__init__.py
diff --git a/...ry/base_v2_0_29/tests/test_build_image.py → ...ry/base_v2_0_32/tests/test_build_image.py b/...ry/base_v2_0_29/tests/test_build_image.py → ...ry/base_v2_0_32/tests/test_build_image.py
diff --git a/...ibrary/base_v2_0_29/tests/test_configs.py → ...ibrary/base_v2_0_32/tests/test_configs.py b/...ibrary/base_v2_0_29/tests/test_configs.py → ...ibrary/base_v2_0_32/tests/test_configs.py
diff --git a/...rary/base_v2_0_29/tests/test_container.py → ...rary/base_v2_0_32/tests/test_container.py b/...rary/base_v2_0_29/tests/test_container.py → ...rary/base_v2_0_32/tests/test_container.py
diff --git a/...ibrary/base_v2_0_29/tests/test_depends.py → ...ibrary/base_v2_0_32/tests/test_depends.py b/...ibrary/base_v2_0_29/tests/test_depends.py → ...ibrary/base_v2_0_32/tests/test_depends.py
diff --git a/...s/library/base_v2_0_29/tests/test_deps.py → ...s/library/base_v2_0_32/tests/test_deps.py b/...s/library/base_v2_0_29/tests/test_deps.py → ...s/library/base_v2_0_32/tests/test_deps.py
diff --git a/...library/base_v2_0_29/tests/test_device.py → ...library/base_v2_0_32/tests/test_device.py b/...library/base_v2_0_29/tests/test_device.py → ...library/base_v2_0_32/tests/test_device.py
diff --git a/...es/library/base_v2_0_29/tests/test_dns.py → ...es/library/base_v2_0_32/tests/test_dns.py b/...es/library/base_v2_0_29/tests/test_dns.py → ...es/library/base_v2_0_32/tests/test_dns.py
diff --git a/...ry/base_v2_0_29/tests/test_environment.py → ...ry/base_v2_0_32/tests/test_environment.py b/...ry/base_v2_0_29/tests/test_environment.py → ...ry/base_v2_0_32/tests/test_environment.py
diff --git a/...rary/base_v2_0_29/tests/test_formatter.py → ...rary/base_v2_0_32/tests/test_formatter.py b/...rary/base_v2_0_29/tests/test_formatter.py → ...rary/base_v2_0_32/tests/test_formatter.py
diff --git a/...rary/base_v2_0_29/tests/test_functions.py → ...rary/base_v2_0_32/tests/test_functions.py b/...rary/base_v2_0_29/tests/test_functions.py → ...rary/base_v2_0_32/tests/test_functions.py
@@ -62,6 +62,16 @@ def test_funcs(mock_values):
             "values": [{"type": "ix_volume", "ix_volume_config": {"dataset_name": "test"}}],
             "expected": "/mnt/test123",
         },
+        {"func": "or_default", "values": [None, 1], "expected": 1},
+        {"func": "or_default", "values": [1, None], "expected": 1},
+        {"func": "or_default", "values": [False, 1], "expected": 1},
+        {"func": "or_default", "values": [True, 1], "expected": True},
+        {"func": "temp_config", "values": [""], "expect_raise": True},
+        {
+            "func": "temp_config",
+            "values": ["test"],
+            "expected": {"type": "temporary", "volume_config": {"volume_name": "test"}},
+        },
     ]
 
     for test in tests:

diff --git a/...ry/base_v2_0_29/tests/test_healthcheck.py → ...ry/base_v2_0_32/tests/test_healthcheck.py b/...ry/base_v2_0_29/tests/test_healthcheck.py → ...ry/base_v2_0_32/tests/test_healthcheck.py
diff --git a/...library/base_v2_0_29/tests/test_labels.py → ...library/base_v2_0_32/tests/test_labels.py b/...library/base_v2_0_29/tests/test_labels.py → ...library/base_v2_0_32/tests/test_labels.py
diff --git a/.../library/base_v2_0_29/tests/test_notes.py → .../library/base_v2_0_32/tests/test_notes.py b/.../library/base_v2_0_29/tests/test_notes.py → .../library/base_v2_0_32/tests/test_notes.py
diff --git a/...library/base_v2_0_29/tests/test_portal.py → ...library/base_v2_0_32/tests/test_portal.py b/...library/base_v2_0_29/tests/test_portal.py → ...library/base_v2_0_32/tests/test_portal.py
diff --git a/.../library/base_v2_0_29/tests/test_ports.py → .../library/base_v2_0_32/tests/test_ports.py b/.../library/base_v2_0_29/tests/test_ports.py → .../library/base_v2_0_32/tests/test_ports.py
diff --git a/...library/base_v2_0_29/tests/test_render.py → ...library/base_v2_0_32/tests/test_render.py b/...library/base_v2_0_29/tests/test_render.py → ...library/base_v2_0_32/tests/test_render.py
diff --git a/...rary/base_v2_0_29/tests/test_resources.py → ...rary/base_v2_0_32/tests/test_resources.py b/...rary/base_v2_0_29/tests/test_resources.py → ...rary/base_v2_0_32/tests/test_resources.py
diff --git a/...ibrary/base_v2_0_29/tests/test_restart.py → ...ibrary/base_v2_0_32/tests/test_restart.py b/...ibrary/base_v2_0_29/tests/test_restart.py → ...ibrary/base_v2_0_32/tests/test_restart.py
diff --git a/...ibrary/base_v2_0_29/tests/test_sysctls.py → ...ibrary/base_v2_0_32/tests/test_sysctls.py b/...ibrary/base_v2_0_29/tests/test_sysctls.py → ...ibrary/base_v2_0_32/tests/test_sysctls.py
diff --git a/...ibrary/base_v2_0_29/tests/test_volumes.py → ...ibrary/base_v2_0_32/tests/test_volumes.py b/...ibrary/base_v2_0_29/tests/test_volumes.py → ...ibrary/base_v2_0_32/tests/test_volumes.py
diff --git a/...lates/library/base_v2_0_29/validations.py → ...lates/library/base_v2_0_32/validations.py b/...lates/library/base_v2_0_29/validations.py → ...lates/library/base_v2_0_32/validations.py
diff --git a/...ates/library/base_v2_0_29/volume_mount.py → ...ates/library/base_v2_0_32/volume_mount.py b/...ates/library/base_v2_0_29/volume_mount.py → ...ates/library/base_v2_0_32/volume_mount.py
diff --git a/...ibrary/base_v2_0_29/volume_mount_types.py → ...ibrary/base_v2_0_32/volume_mount_types.py b/...ibrary/base_v2_0_29/volume_mount_types.py → ...ibrary/base_v2_0_32/volume_mount_types.py
diff --git a/...es/library/base_v2_0_29/volume_sources.py → ...es/library/base_v2_0_32/volume_sources.py b/...es/library/base_v2_0_29/volume_sources.py → ...es/library/base_v2_0_32/volume_sources.py
diff --git a/...ates/library/base_v2_0_29/volume_types.py → ...ates/library/base_v2_0_32/volume_types.py b/...ates/library/base_v2_0_29/volume_types.py → ...ates/library/base_v2_0_32/volume_types.py
diff --git a/...templates/library/base_v2_0_29/volumes.py → ...templates/library/base_v2_0_32/volumes.py b/...templates/library/base_v2_0_29/volumes.py → ...templates/library/base_v2_0_32/volumes.py
diff --git a/ix-dev/community/tftpd-hpa/templates/test_values/create-values.yaml b/ix-dev/community/tftpd-hpa/templates/test_values/create-values.yaml
@@ -10,13 +10,10 @@ network:
   host_network: false
   tftp_port: 69
 
-ix_volumes:
-  tftpboot: /opt/tests/mnt/tftpboot
-
 storage:
   tftpboot:
-    type: ix_volume
-    ix_volume_config:
-      dataset_name: tftpboot
+    type: host_path
+    host_path_config:
+      path: /opt/tests/mnt/tftpboot
       create_host_path: true
   additional_storage: []