From 3f0f991f408c79c533403acdff437c3871a365ca Mon Sep 17 00:00:00 2001 From: Nelson Johnstone Date: Thu, 14 Jul 2022 08:20:28 +1000 Subject: [PATCH] linting and test --- engine/common/jinja_templater/filters.py | 1 + engine/common/jinja_templater/jinja_template_env.py | 2 +- engine/common/tests/test_regex_replace.py | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 engine/common/tests/test_regex_replace.py diff --git a/engine/common/jinja_templater/filters.py b/engine/common/jinja_templater/filters.py index 0ba87024..07557fca 100644 --- a/engine/common/jinja_templater/filters.py +++ b/engine/common/jinja_templater/filters.py @@ -24,6 +24,7 @@ def to_pretty_json(value): except (ValueError, AttributeError, TypeError): return None + def regex_replace(value, find, replace): try: return re.sub(find, replace, value) diff --git a/engine/common/jinja_templater/jinja_template_env.py b/engine/common/jinja_templater/jinja_template_env.py index 7ac86ddc..41e915aa 100644 --- a/engine/common/jinja_templater/jinja_template_env.py +++ b/engine/common/jinja_templater/jinja_template_env.py @@ -2,7 +2,7 @@ from django.utils import timezone from jinja2 import BaseLoader from jinja2.sandbox import SandboxedEnvironment -from .filters import datetimeformat, iso8601_to_time, to_pretty_json, regex_replace +from .filters import datetimeformat, iso8601_to_time, regex_replace, to_pretty_json jinja_template_env = SandboxedEnvironment(loader=BaseLoader()) diff --git a/engine/common/tests/test_regex_replace.py b/engine/common/tests/test_regex_replace.py new file mode 100644 index 00000000..a41c9a28 --- /dev/null +++ b/engine/common/tests/test_regex_replace.py @@ -0,0 +1,7 @@ +from common.jinja_templater.filters import regex_replace + + +def test_regex_replace_drop_field(): + original = "[ var='D0' metric='my_metric' labels={} value=140 ]" + expected = "[ metric='my_metric' labels={} value=140 ]" + assert regex_replace(original, "var=\'[a-zA-Z0-9]+\'", "") == expected