v2-lib: fix $ escaping (#759)

* auto add labels from a top level structure * improve message * fix escaping * fix escaping * clean
truenas · Oct 31, 2024 · 5f5cf31 · 5f5cf31
1 parent c3ffb4b
commit 5f5cf31
Show file tree

Hide file tree

Showing 50 changed files with 16 additions and 9 deletions.
diff --git a/library/2.0.4/__init__.py → library/2.0.5/__init__.py b/library/2.0.4/__init__.py → library/2.0.5/__init__.py
diff --git a/library/2.0.4/configs.py → library/2.0.5/configs.py b/library/2.0.4/configs.py → library/2.0.5/configs.py
diff --git a/library/2.0.4/container.py → library/2.0.5/container.py b/library/2.0.4/container.py → library/2.0.5/container.py
diff --git a/library/2.0.4/depends.py → library/2.0.5/depends.py b/library/2.0.4/depends.py → library/2.0.5/depends.py
diff --git a/library/2.0.4/deploy.py → library/2.0.5/deploy.py b/library/2.0.4/deploy.py → library/2.0.5/deploy.py
diff --git a/library/2.0.4/deps.py → library/2.0.5/deps.py b/library/2.0.4/deps.py → library/2.0.5/deps.py
diff --git a/library/2.0.4/device.py → library/2.0.5/device.py b/library/2.0.4/device.py → library/2.0.5/device.py
diff --git a/library/2.0.4/devices.py → library/2.0.5/devices.py b/library/2.0.4/devices.py → library/2.0.5/devices.py
diff --git a/library/2.0.4/dns.py → library/2.0.5/dns.py b/library/2.0.4/dns.py → library/2.0.5/dns.py
diff --git a/library/2.0.4/environment.py → library/2.0.5/environment.py b/library/2.0.4/environment.py → library/2.0.5/environment.py
diff --git a/library/2.0.4/error.py → library/2.0.5/error.py b/library/2.0.4/error.py → library/2.0.5/error.py
diff --git a/library/2.0.4/formatter.py → library/2.0.5/formatter.py b/library/2.0.4/formatter.py → library/2.0.5/formatter.py
@@ -1,15 +1,9 @@
-import re
 import json
 import hashlib
 
 
-# Replaces all single dollar signs with double dollar signs
-# Docker tries to expand shell variables, so we need to
-# escape them in multiple places
-# It will not replace dollar signs that are already escaped
-def escape_dollar(text):
-    # https://regex101.com/r/tdbI7y/1
-    return re.sub(r"(?<!\$)\$(?!\$)", r"$$", text)
+def escape_dollar(text: str) -> str:
+    return text.replace("$", "$$")
 
 
 def get_hashed_name_for_volume(prefix: str, config: dict):

diff --git a/library/2.0.4/functions.py → library/2.0.5/functions.py b/library/2.0.4/functions.py → library/2.0.5/functions.py
diff --git a/library/2.0.4/healthcheck.py → library/2.0.5/healthcheck.py b/library/2.0.4/healthcheck.py → library/2.0.5/healthcheck.py
diff --git a/library/2.0.4/labels.py → library/2.0.5/labels.py b/library/2.0.4/labels.py → library/2.0.5/labels.py
diff --git a/library/2.0.4/notes.py → library/2.0.5/notes.py b/library/2.0.4/notes.py → library/2.0.5/notes.py
diff --git a/library/2.0.4/portal.py → library/2.0.5/portal.py b/library/2.0.4/portal.py → library/2.0.5/portal.py
diff --git a/library/2.0.4/portals.py → library/2.0.5/portals.py b/library/2.0.4/portals.py → library/2.0.5/portals.py
diff --git a/library/2.0.4/ports.py → library/2.0.5/ports.py b/library/2.0.4/ports.py → library/2.0.5/ports.py
diff --git a/library/2.0.4/render.py → library/2.0.5/render.py b/library/2.0.4/render.py → library/2.0.5/render.py
diff --git a/library/2.0.4/resources.py → library/2.0.5/resources.py b/library/2.0.4/resources.py → library/2.0.5/resources.py
diff --git a/library/2.0.4/restart.py → library/2.0.5/restart.py b/library/2.0.4/restart.py → library/2.0.5/restart.py
diff --git a/library/2.0.4/storage.py → library/2.0.5/storage.py b/library/2.0.4/storage.py → library/2.0.5/storage.py
diff --git a/library/2.0.4/tests/__init__.py → library/2.0.5/tests/__init__.py b/library/2.0.4/tests/__init__.py → library/2.0.5/tests/__init__.py
diff --git a/library/2.0.4/tests/test_build_image.py → library/2.0.5/tests/test_build_image.py b/library/2.0.4/tests/test_build_image.py → library/2.0.5/tests/test_build_image.py
diff --git a/library/2.0.4/tests/test_configs.py → library/2.0.5/tests/test_configs.py b/library/2.0.4/tests/test_configs.py → library/2.0.5/tests/test_configs.py
diff --git a/library/2.0.4/tests/test_container.py → library/2.0.5/tests/test_container.py b/library/2.0.4/tests/test_container.py → library/2.0.5/tests/test_container.py
diff --git a/library/2.0.4/tests/test_depends.py → library/2.0.5/tests/test_depends.py b/library/2.0.4/tests/test_depends.py → library/2.0.5/tests/test_depends.py
diff --git a/library/2.0.4/tests/test_deps.py → library/2.0.5/tests/test_deps.py b/library/2.0.4/tests/test_deps.py → library/2.0.5/tests/test_deps.py
diff --git a/library/2.0.4/tests/test_device.py → library/2.0.5/tests/test_device.py b/library/2.0.4/tests/test_device.py → library/2.0.5/tests/test_device.py
diff --git a/library/2.0.4/tests/test_dns.py → library/2.0.5/tests/test_dns.py b/library/2.0.4/tests/test_dns.py → library/2.0.5/tests/test_dns.py
diff --git a/library/2.0.4/tests/test_environment.py → library/2.0.5/tests/test_environment.py b/library/2.0.4/tests/test_environment.py → library/2.0.5/tests/test_environment.py
diff --git a/library/2.0.5/tests/test_formatter.py b/library/2.0.5/tests/test_formatter.py
@@ -0,0 +1,13 @@
+from formatter import escape_dollar
+
+
+def test_escape_dollar():
+    cases = [
+        {"input": "test", "expected": "test"},
+        {"input": "$test", "expected": "$$test"},
+        {"input": "$$test", "expected": "$$$$test"},
+        {"input": "$$$test", "expected": "$$$$$$test"},
+        {"input": "$test$", "expected": "$$test$$"},
+    ]
+    for case in cases:
+        assert escape_dollar(case["input"]) == case["expected"]
diff --git a/library/2.0.4/tests/test_functions.py → library/2.0.5/tests/test_functions.py b/library/2.0.4/tests/test_functions.py → library/2.0.5/tests/test_functions.py
diff --git a/library/2.0.4/tests/test_healthcheck.py → library/2.0.5/tests/test_healthcheck.py b/library/2.0.4/tests/test_healthcheck.py → library/2.0.5/tests/test_healthcheck.py
diff --git a/library/2.0.4/tests/test_labels.py → library/2.0.5/tests/test_labels.py b/library/2.0.4/tests/test_labels.py → library/2.0.5/tests/test_labels.py
diff --git a/library/2.0.4/tests/test_notes.py → library/2.0.5/tests/test_notes.py b/library/2.0.4/tests/test_notes.py → library/2.0.5/tests/test_notes.py
diff --git a/library/2.0.4/tests/test_portal.py → library/2.0.5/tests/test_portal.py b/library/2.0.4/tests/test_portal.py → library/2.0.5/tests/test_portal.py
diff --git a/library/2.0.4/tests/test_ports.py → library/2.0.5/tests/test_ports.py b/library/2.0.4/tests/test_ports.py → library/2.0.5/tests/test_ports.py
diff --git a/library/2.0.4/tests/test_render.py → library/2.0.5/tests/test_render.py b/library/2.0.4/tests/test_render.py → library/2.0.5/tests/test_render.py
diff --git a/library/2.0.4/tests/test_resources.py → library/2.0.5/tests/test_resources.py b/library/2.0.4/tests/test_resources.py → library/2.0.5/tests/test_resources.py
diff --git a/library/2.0.4/tests/test_restart.py → library/2.0.5/tests/test_restart.py b/library/2.0.4/tests/test_restart.py → library/2.0.5/tests/test_restart.py
diff --git a/library/2.0.4/tests/test_volumes.py → library/2.0.5/tests/test_volumes.py b/library/2.0.4/tests/test_volumes.py → library/2.0.5/tests/test_volumes.py
diff --git a/library/2.0.4/validations.py → library/2.0.5/validations.py b/library/2.0.4/validations.py → library/2.0.5/validations.py
diff --git a/library/2.0.4/volume_mount.py → library/2.0.5/volume_mount.py b/library/2.0.4/volume_mount.py → library/2.0.5/volume_mount.py
diff --git a/library/2.0.4/volume_mount_types.py → library/2.0.5/volume_mount_types.py b/library/2.0.4/volume_mount_types.py → library/2.0.5/volume_mount_types.py
diff --git a/library/2.0.4/volume_sources.py → library/2.0.5/volume_sources.py b/library/2.0.4/volume_sources.py → library/2.0.5/volume_sources.py
diff --git a/library/2.0.4/volume_types.py → library/2.0.5/volume_types.py b/library/2.0.4/volume_types.py → library/2.0.5/volume_types.py
diff --git a/library/2.0.4/volumes.py → library/2.0.5/volumes.py b/library/2.0.4/volumes.py → library/2.0.5/volumes.py
diff --git a/library/hashes.yaml b/library/hashes.yaml
@@ -1,3 +1,3 @@
 0.0.1: f074617a82a86d2a6cc78a4c8a4296fc9d168e456f12713e50c696557b302133
 1.1.5: 51332f2b032a0c473693458cd93daa96d56604241878e538c07cb85b8be66727
-2.0.4: 0e79e3390d3ea73649ee2ac05a4af9ed944a02e95289b5c7e2eb047d475a4651
+2.0.5: 0a65beb80aa50e867204d9c6720f8c841047d9e2a0e03d2c949534688c2832e1