centralcloud/oncall-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update regex to jinja route conversion to correctly escape double quotes (#4705)

Browse source 
Related to this
[thread](https://raintank-corp.slack.com/archives/C0229FD3CE9/p1721309907422709).
This commit is contained in:
Matias Bordese 2024-07-19 08:56:22 -03:00 • committed by GitHub
parent 87d7982250
commit 1491e28226
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
engine/apps/api/serializers/channel_filter.py
View file

@ -147,7 +147,8 @@ class ChannelFilterSerializer(EagerLoadingMixin, serializers.ModelSerializer):
elif obj.filtering_term_type == ChannelFilter.FILTERING_TERM_TYPE_REGEX:
# Four curly braces will result in two curly braces in the final string
# rf"..." is a raw f string, to keep original filtering_term
return rf'{{{{ payload | json_dumps | regex_search("{obj.filtering_term}") }}}}'
escaped_quotes = obj.filtering_term.replace('"', '\\"') if obj.filtering_term else ""
return rf'{{{{ payload | json_dumps | regex_search("{escaped_quotes}") }}}}'
elif obj.filtering_labels and obj.filtering_term_type == ChannelFilter.FILTERING_TERM_TYPE_LABELS:
# required labels
labels = [

6
engine/apps/api/tests/test_channel_filter.py
View file

@ -509,8 +509,10 @@ def test_channel_filter_convert_from_regex_to_jinja2(
make_channel_filter(alert_receive_channel, is_default=True)
# r"..." used to keep this string as raw string
regex_filtering_term = r"\".*\": \"This alert was sent by user for demonstration purposes\""
# regex as set by Terraform/API (not a raw string, but a string with escaped characters)
# see ChannelFilterSerializer in apps.public_api.serializers.routes.py
regex_filtering_term = '".*": "This alert was sent by user for demonstration purposes"'
# r"..." to define the expected jinja2 template translation
final_filtering_term = r'{{ payload | json_dumps | regex_search("\".*\": \"This alert was sent by user for demonstration purposes\"") }}'
payload = {"description": "This alert was sent by user for demonstration purposes"}