fixes for bugs detected during a backport

[ivarmu]

What does this PR do?

Fixes a bug detected during the backport of the latest enhacements. filetree_create job_template and workflow_job_template survey issue when the survey_spec was empty (but defined)

How should this be tested?

Manually tested.

Is there a relevant Issue open for this?

Other Relevant info, PRs, etc

Related to the backport PR redhat-cop/infra.controller_configuration#15

[przemkalit]

Thanks for restoring the change :).

[przemkalit]

Hey, I found a bug related to the survey topic. The choices should be enclosed in double quotes; otherwise, the default directive for multi-choice type questions fails during the import, and as it is really minor change maybe you could add it here :-).

[ivarmu]

Hey, I found a bug related to the survey topic. The choices should be enclosed in double quotes; otherwise, the default directive for multi-choice type questions fails during the import, and as it is really minor change maybe you could add it here :-).

I've checked that and I have no problems importing the generated output (I attach an example generated by filetree_create and imported successfully by filetree_read.

11_Demo Job Template.yaml.txt

[przemkalit]

Hey, I found a bug related to the survey topic. The choices should be enclosed in double quotes; otherwise, the default directive for multi-choice type questions fails during the import, and as it is really minor change maybe you could add it here :-).

I've checked that and I have no problems importing the generated output (I attach an example generated by filetree_create and imported successfully by filetree_read.

11_Demo Job Template.yaml.txt

Hey, did you try to use dispatch to add the object? Becuase it is failing then. Sorry for late response, I am on vacation.

[ivarmu]

Hey, I found a bug related to the survey topic. The choices should be enclosed in double quotes; otherwise, the default directive for multi-choice type questions fails during the import, and as it is really minor change maybe you could add it here :-).

I've checked that and I have no problems importing the generated output (I attach an example generated by filetree_create and imported successfully by filetree_read.

11_Demo Job Template.yaml.txt

Hey, did you try to use dispatch to add the object? Becuase it is failing then. Sorry for late response, I am on vacation.

Yesss... my tests include the filetree_read and the dispatch roles, and I also check that the target instance has been successfully configured.

Enjoy your vacations, we can continue the tests when returned 😇

[djdanielsson]

@ivarmu is this ready to be merged?

[przemkalit]

Okay @ivarmu maybe this works on AAP 2.5, but I have other case with survey, because Today I've noticed that there is an issue when string is not in quotes - one of our JT had : inside the question name.

So check my solution:

{%       if survey_item_content.key | regex_search('question_description|default') %}
{%         set current_content = survey_item_content.key + ': !unsafe "' + (survey_item_content.value | regex_replace("\n", "\\\\n") | regex_replace('"', '\\"')) + '"' %}
{%       elif survey_item_content.key is not match('choices') %}
{%         if survey_item_content.value is string %}
{%           set current_content = survey_item_content.key + ': "' + survey_item_content.value | string + '"' %}
{%         else %}
{%           set current_content = survey_item_content.key + ': ' + survey_item_content.value | string %}
{%         endif %}
{%       endif %}

[ivarmu]

Okay @ivarmu maybe this works on AAP 2.5, but I have other case with survey, because Today I've noticed that there is an issue when string is not in quotes - one of our JT had : inside the question name.

So check my solution:

{%       if survey_item_content.key | regex_search('question_description|default') %}
{%         set current_content = survey_item_content.key + ': !unsafe "' + (survey_item_content.value | regex_replace("\n", "\\\\n") | regex_replace('"', '\\"')) + '"' %}
{%       elif survey_item_content.key is not match('choices') %}
{%         if survey_item_content.value is string %}
{%           set current_content = survey_item_content.key + ': "' + survey_item_content.value | string + '"' %}
{%         else %}
{%           set current_content = survey_item_content.key + ': ' + survey_item_content.value | string %}
{%         endif %}
{%       endif %}

I prefer not having al the strings quoted (or with the !unsafe clause) as it's not needed. I've added the !unsafe clause to the question_name so it can contain any special character without any problem.

[ivarmu]

Improved the PR #64

[ivarmu]

@ivarmu is this ready to be merged?

Yes @djdanielsson , I think so 👍