From 70f9d6f015be8cba00281d555fd6a05954c3452d Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Wed, 5 May 2021 14:08:05 +0900 Subject: [PATCH] Fix to handle parameters with Boolean values correctly * Addresses the issue #10057 Signed-off-by: Hideki Saito --- .../plugins/modules/workflow_job_template.py | 2 +- .../workflow_job_template/tasks/main.yml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/awx_collection/plugins/modules/workflow_job_template.py b/awx_collection/plugins/modules/workflow_job_template.py index 7fc6b66cca..d5686a66aa 100644 --- a/awx_collection/plugins/modules/workflow_job_template.py +++ b/awx_collection/plugins/modules/workflow_job_template.py @@ -751,7 +751,7 @@ def main(): 'webhook_service', ): field_val = module.params.get(field_name) - if field_val: + if field_val is not None: new_fields[field_name] = field_val if 'extra_vars' in new_fields: diff --git a/awx_collection/tests/integration/targets/workflow_job_template/tasks/main.yml b/awx_collection/tests/integration/targets/workflow_job_template/tasks/main.yml index 527481281b..87fd84ab14 100644 --- a/awx_collection/tests/integration/targets/workflow_job_template/tasks/main.yml +++ b/awx_collection/tests/integration/targets/workflow_job_template/tasks/main.yml @@ -159,12 +159,30 @@ extra_vars: {'foo': 'bar', 'another-foo': {'barz': 'bar2'}} labels: - "{{ lab1 }}" + ask_inventory_on_launch: true + ask_scm_branch_on_launch: true + ask_limit_on_launch: true + ask_variables_on_launch: true register: result - assert: that: - "result is changed" +# Turn off ask_ * settings to test that the issue/10057 has been fixed +- name: Turn ask_* settings OFF + tower_workflow_job_template: + name: "{{ wfjt_name }}" + ask_inventory_on_launch: false + ask_scm_branch_on_launch: false + ask_limit_on_launch: false + ask_variables_on_launch: false + state: present + +- assert: + that: + - "result is changed" + # Node actions do what this schema command used to do # schema: [{"success": [{"job_template": "{{ jt1_name }}"}], "job_template": "{{ jt2_name }}"}] - name: Create leaf node