fix: issue with variable brackets inside any string in extra_vars (#868)

* fix: issue with variable brackets inside any string in extra_vars * misc: implement suggested change * Update current_job_templates.j2 Add `multiline=True` to treat multiple lines * Update current_workflow_job_templates.j2 Add `multiline=True` to treat multiple lines --------- Co-authored-by: Przemyslaw Kalitowski <[email protected]> Co-authored-by: Ivan Aragonés Muniesa <[email protected]>
redhat-cop · Jul 23, 2024 · 9f659e6 · 9f659e6
1 parent 6178d4b
commit 9f659e6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/changelogs/fragments/filetree_create_brackets_extra_vars_issue.yml b/changelogs/fragments/filetree_create_brackets_extra_vars_issue.yml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - filetree_create export extra_vars with escaping any variable brackets
+...
diff --git a/roles/filetree_create/templates/current_job_templates.j2 b/roles/filetree_create/templates/current_job_templates.j2
@@ -54,7 +54,7 @@ controller_templates:
 {% endif %}
 {% if current_job_templates_asset_value.extra_vars and current_job_templates_asset_value.extra_vars | length > 3 %}
     extra_vars:
-      {{ current_job_templates_asset_value.extra_vars | from_yaml | to_nice_yaml(indent=2) | indent(width=6, first=False) | replace("'{{", "!unsafe \'{{") }}
+      {{ current_job_templates_asset_value.extra_vars | from_yaml | to_nice_yaml(indent=2) | indent(width=6, first=False) | regex_replace('(^[^:]*): (.*){{', '\1: !unsafe \2{{', multiline=True)}}
 {%- endif %}
     job_tags: "{{ current_job_templates_asset_value.job_tags }}"
     force_handlers: {{ current_job_templates_asset_value.force_handlers | bool | lower }}

diff --git a/roles/filetree_create/templates/current_workflow_job_templates.j2 b/roles/filetree_create/templates/current_workflow_job_templates.j2
@@ -44,7 +44,7 @@ controller_workflows:
     webhook_service: "{{ current_workflow_job_templates_asset_value.webhook_service }}"
 {% if current_workflow_job_templates_asset_value.extra_vars and current_workflow_job_templates_asset_value.extra_vars | length > 3 %}
     extra_vars:
-      {{ current_workflow_job_templates_asset_value.extra_vars | from_yaml | to_nice_yaml(indent=2) | indent(width=6, first=False) | replace("'{{", "!unsafe \'{{") }}
+      {{ current_workflow_job_templates_asset_value.extra_vars | from_yaml | to_nice_yaml(indent=2) | indent(width=6, first=False) | regex_replace('(^[^:]*): (.*){{', '\1: !unsafe \2{{', multiline=True) }}
 {%- endif %}
 {% if query_labels | length > 0 %}
     labels: