From b7412de6bbdfc83d1f9675fa61f390fe0c39aa9b Mon Sep 17 00:00:00 2001 From: Przemyslaw Kalitowski Date: Thu, 3 Oct 2024 11:39:44 +0200 Subject: [PATCH 1/3] fix: issue when password is in survey of WF node --- changelogs/fragments/filetree_create_node_survey.yml | 3 +++ .../templates/current_workflow_job_templates.j2 | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/filetree_create_node_survey.yml diff --git a/changelogs/fragments/filetree_create_node_survey.yml b/changelogs/fragments/filetree_create_node_survey.yml new file mode 100644 index 000000000..21d935c18 --- /dev/null +++ b/changelogs/fragments/filetree_create_node_survey.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - filetree_create able export WF nodes without encrypted value in survey diff --git a/roles/filetree_create/templates/current_workflow_job_templates.j2 b/roles/filetree_create/templates/current_workflow_job_templates.j2 index 8b82e9df4..236529b59 100644 --- a/roles/filetree_create/templates/current_workflow_job_templates.j2 +++ b/roles/filetree_create/templates/current_workflow_job_templates.j2 @@ -21,7 +21,7 @@ controller_workflows: all_parents_must_converge: "{{ node.all_parents_must_converge }}" {% if node.extra_data is defined and node.extra_data | length > 0 %} extra_data: - {{ node.extra_data | to_nice_yaml | indent(10) | replace("'{{", "!unsafe \'{{") }} + {{ node.extra_data | to_nice_yaml | indent(10) | replace("'{{", "!unsafe \'{{") }} | replace("$encrypted$", "") {%- endif %} {% if node.success_nodes is defined and node.success_nodes | length > 0 %} success_nodes: From ec6550c784c6f428f1b59d21fa6f37b5d827f7bf Mon Sep 17 00:00:00 2001 From: Przemyslaw Kalitowski Date: Thu, 3 Oct 2024 13:25:01 +0200 Subject: [PATCH 2/3] fix: encrypted for schedules --- changelogs/fragments/filetree_create_node_survey.yml | 3 --- changelogs/fragments/filetree_node_schedule_survey.yml | 3 +++ roles/filetree_create/templates/current_schedules.j2 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 changelogs/fragments/filetree_create_node_survey.yml create mode 100644 changelogs/fragments/filetree_node_schedule_survey.yml diff --git a/changelogs/fragments/filetree_create_node_survey.yml b/changelogs/fragments/filetree_create_node_survey.yml deleted file mode 100644 index 21d935c18..000000000 --- a/changelogs/fragments/filetree_create_node_survey.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -minor_changes: - - filetree_create able export WF nodes without encrypted value in survey diff --git a/changelogs/fragments/filetree_node_schedule_survey.yml b/changelogs/fragments/filetree_node_schedule_survey.yml new file mode 100644 index 000000000..439101e15 --- /dev/null +++ b/changelogs/fragments/filetree_node_schedule_survey.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - filetree_create able export WF/schedule nodes without encrypted value in survey diff --git a/roles/filetree_create/templates/current_schedules.j2 b/roles/filetree_create/templates/current_schedules.j2 index a4d454786..6d2bf87b4 100644 --- a/roles/filetree_create/templates/current_schedules.j2 +++ b/roles/filetree_create/templates/current_schedules.j2 @@ -34,7 +34,7 @@ controller_schedules: {% endif %} {% if current_schedules_asset_value.extra_data is defined %} extra_data: - {{ current_schedules_asset_value.extra_data | from_yaml | to_nice_yaml(indent=2) | indent(width=6, first=False) | replace("'{{", "!unsafe \'{{") }} + {{ current_schedules_asset_value.extra_data | from_yaml | to_nice_yaml(indent=2) | indent(width=6, first=False) | replace("'{{", "!unsafe \'{{") | replace("$encrypted$", "") }} {%- endif -%} {% if query_credentials | length > 0 %} credentials: From 9b8a3a885f045e1db6f99ea1e8c035a0ea59172e Mon Sep 17 00:00:00 2001 From: Przemyslaw Kalitowski Date: Thu, 3 Oct 2024 14:34:36 +0200 Subject: [PATCH 3/3] fix: proper changelog --- changelogs/fragments/filetree_node_schedule_survey.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/fragments/filetree_node_schedule_survey.yml b/changelogs/fragments/filetree_node_schedule_survey.yml index 439101e15..5b35a2883 100644 --- a/changelogs/fragments/filetree_node_schedule_survey.yml +++ b/changelogs/fragments/filetree_node_schedule_survey.yml @@ -1,3 +1,3 @@ --- minor_changes: - - filetree_create able export WF/schedule nodes without encrypted value in survey + - filetree_create able export WF nodes and schedules without encrypted value in survey