From bd83348e79384293579ab810d0f94b614a53fddb Mon Sep 17 00:00:00 2001
From: Martin Krizek <martin.krizek@gmail.com>
Date: Fri, 17 Apr 2020 14:59:52 +0200
Subject: [PATCH] native types: literal_eval all the things (#68938)

With https://github.com/pallets/jinja/pull/1190 merged our short-circuit
is no longer valid (has it ever been?) as now data like ' True ' may go
through our ansible_native_concat function as opposed to going through
intermediate call to Jinja2's native_concat before. Now we need to always
send data through literal_eval to ensure native types are returned.

(cherry picked from commit acdc9eb76d23e25ed8b1c7fc4fe8e4f9fd6f49fd)
---
 lib/ansible/template/native_helpers.py              | 13 ++++++++-----
 .../filter_plugins/native_plugins.py                |  8 --------
 .../targets/jinja2_native_types/test_casting.yml    |  6 +++---
 .../jinja2_native_types/test_concatentation.yml     |  2 +-
 test/sanity/ignore.txt                              |  2 --
 5 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 test/integration/targets/jinja2_native_types/filter_plugins/native_plugins.py

diff --git a/lib/ansible/template/native_helpers.py b/lib/ansible/template/native_helpers.py
index 11c14b7fa12d12..c56d0d217fc9ea 100644
--- a/lib/ansible/template/native_helpers.py
+++ b/lib/ansible/template/native_helpers.py
@@ -13,6 +13,9 @@
 from jinja2._compat import text_type
 
 from jinja2.runtime import StrictUndefined
+
+from ansible.module_utils.common.text.converters import container_to_text
+from ansible.module_utils.six import PY2
 from ansible.parsing.yaml.objects import AnsibleVaultEncryptedUnicode
 
 
@@ -48,10 +51,6 @@ def ansible_native_concat(nodes):
             # See https://github.com/ansible/ansible/issues/52158
             # We do that only here because it is taken care of by text_type() in the else block below already.
             str(out)
-
-        # short circuit literal_eval when possible
-        if not isinstance(out, list):
-            return out
     else:
         if isinstance(nodes, types.GeneratorType):
             nodes = chain(head, nodes)
@@ -60,6 +59,10 @@ def ansible_native_concat(nodes):
         out = u''.join([text_type(v) for v in nodes])
 
     try:
-        return literal_eval(out)
+        out = literal_eval(out)
+        if PY2:
+            # ensure bytes are not returned back into Ansible from templating
+            out = container_to_text(out)
+        return out
     except (ValueError, SyntaxError, MemoryError):
         return out
diff --git a/test/integration/targets/jinja2_native_types/filter_plugins/native_plugins.py b/test/integration/targets/jinja2_native_types/filter_plugins/native_plugins.py
deleted file mode 100644
index 24c716c42211b8..00000000000000
--- a/test/integration/targets/jinja2_native_types/filter_plugins/native_plugins.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from ansible.module_utils._text import to_text
-
-
-class FilterModule(object):
-    def filters(self):
-        return {
-            'to_text': to_text,
-        }
diff --git a/test/integration/targets/jinja2_native_types/test_casting.yml b/test/integration/targets/jinja2_native_types/test_casting.yml
index 5b4fe3ac0eb32a..e66489ff5b1148 100644
--- a/test/integration/targets/jinja2_native_types/test_casting.yml
+++ b/test/integration/targets/jinja2_native_types/test_casting.yml
@@ -1,9 +1,9 @@
 - name: cast things to other things
   set_fact:
-      int_to_str: "{{ i_two|to_text }}"
+      int_to_str: "'{{ i_two }}'"
       str_to_int: "{{ s_two|int }}"
-      dict_to_str: "{{ dict_one|to_text }}"
-      list_to_str: "{{ list_one|to_text }}"
+      dict_to_str: "'{{ dict_one }}'"
+      list_to_str: "'{{ list_one }}'"
       int_to_bool: "{{ i_one|bool }}"
       str_true_to_bool: "{{ s_true|bool }}"
       str_false_to_bool: "{{ s_false|bool }}"
diff --git a/test/integration/targets/jinja2_native_types/test_concatentation.yml b/test/integration/targets/jinja2_native_types/test_concatentation.yml
index 478182ab454d99..8a8077b6699725 100644
--- a/test/integration/targets/jinja2_native_types/test_concatentation.yml
+++ b/test/integration/targets/jinja2_native_types/test_concatentation.yml
@@ -18,7 +18,7 @@
 
 - name: concatenate int and string
   set_fact:
-      string_sum: "{{ [(i_one|to_text), s_two]|join('') }}"
+      string_sum: "'{{ [i_one, s_two]|join('') }}'"
 
 - assert:
     that:
diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt
index 672e279dfddd6f..cbd90504def482 100644
--- a/test/sanity/ignore.txt
+++ b/test/sanity/ignore.txt
@@ -5984,8 +5984,6 @@ test/integration/targets/inventory_kubevirt_conformance/inventory_diff.py future
 test/integration/targets/inventory_kubevirt_conformance/inventory_diff.py metaclass-boilerplate
 test/integration/targets/inventory_kubevirt_conformance/server.py future-import-boilerplate
 test/integration/targets/inventory_kubevirt_conformance/server.py metaclass-boilerplate
-test/integration/targets/jinja2_native_types/filter_plugins/native_plugins.py future-import-boilerplate
-test/integration/targets/jinja2_native_types/filter_plugins/native_plugins.py metaclass-boilerplate
 test/integration/targets/lambda_policy/files/mini_http_lambda.py future-import-boilerplate
 test/integration/targets/lambda_policy/files/mini_http_lambda.py metaclass-boilerplate
 test/integration/targets/lookup_properties/lookup-8859-15.ini no-smart-quotes