From 6786e03687168e6e0f365f2058bca61abfa42513 Mon Sep 17 00:00:00 2001 From: Matej Stajduhar Date: Sat, 10 May 2025 17:28:08 +0200 Subject: [PATCH 1/2] Updating-string --- roles/aws/aws_admin_tools/tasks/create_methods.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/roles/aws/aws_admin_tools/tasks/create_methods.yml b/roles/aws/aws_admin_tools/tasks/create_methods.yml index ecd2f0a55..ae459207c 100644 --- a/roles/aws/aws_admin_tools/tasks/create_methods.yml +++ b/roles/aws/aws_admin_tools/tasks/create_methods.yml @@ -77,14 +77,18 @@ --region {{ _aws_region }} when: item.url_params is not defined or item.url_params | length == 0 -- name: Generate template parts for each param - set_fact: - template_parts: "{{ item.url_params | map('regex_replace', '^(.*)$', '\\\"\\1\\\": \\\"$input.params(''\\1'')\\\"') | list }}" +- name: Generate URL parameters string + ansible.builtin.set_fact: + url_params_string: >- + {% for _url in item.url_params %} + {{ '' if loop.first else ', ' }} + "{{ _url }}": "do('{{ _url }}')" + {% endfor %} when: item.url_params is defined and item.url_params | length > 0 - name: Create final template string set_fact: - template_string: "{ \"application/json\": \"{ {{ template_parts | join(',') }} }\" }" + template_string: "{ \"application/json\": \"{ {{ url_params_string }} }\" }" when: item.url_params is defined and item.url_params | length > 0 - name: Write template to file From 17bea3872fbaf028ade4bae3b33b3ee7e838d369 Mon Sep 17 00:00:00 2001 From: Matej Stajduhar Date: Sat, 10 May 2025 19:01:06 +0200 Subject: [PATCH 2/2] Updating-string-3 --- roles/aws/aws_admin_tools/tasks/create_methods.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/aws/aws_admin_tools/tasks/create_methods.yml b/roles/aws/aws_admin_tools/tasks/create_methods.yml index ae459207c..29c444764 100644 --- a/roles/aws/aws_admin_tools/tasks/create_methods.yml +++ b/roles/aws/aws_admin_tools/tasks/create_methods.yml @@ -81,8 +81,8 @@ ansible.builtin.set_fact: url_params_string: >- {% for _url in item.url_params %} - {{ '' if loop.first else ', ' }} - "{{ _url }}": "do('{{ _url }}')" + {{ '' if loop.first else ',' }} + \"{{ _url }}\": \"$input.params('{{ _url }}')\" {% endfor %} when: item.url_params is defined and item.url_params | length > 0