[config] coerce more to string when 'type: str' (ansible#72172)

Change: - When a plugin defines `type: str` on a parameter, treat more kinds of input as a string instead of whatever it is parsed as. Test Plan: - New unit tests - CI Signed-off-by: Rick Elrod <[email protected]>
pva · Oct 14, 2020 · 3b40c6f · 3b40c6f
1 parent 6e7a40d
commit 3b40c6f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/changelogs/fragments/more-types-to-string-config.yml b/changelogs/fragments/more-types-to-string-config.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - "config - more types are now automatically coerced to string when ``type: str`` is used and the value is parsed as a different type"
diff --git a/lib/ansible/config/manager.py b/lib/ansible/config/manager.py
@@ -149,7 +149,7 @@ def ensure_type(value, value_type, origin=None):
                 errmsg = 'dictionary'
 
         elif value_type in ('str', 'string'):
-            if isinstance(value, (string_types, AnsibleVaultEncryptedUnicode)):
+            if isinstance(value, (string_types, AnsibleVaultEncryptedUnicode, bool, int, float, complex)):
                 value = unquote(to_text(value, errors='surrogate_or_strict'))
             else:
                 errmsg = 'string'

diff --git a/test/units/config/__init__.py b/test/units/config/__init__.py
diff --git a/test/units/config/test_manager.py b/test/units/config/test_manager.py
@@ -60,6 +60,18 @@
     ('a', 'string', string_types),
     ('Café', 'string', string_types),
     ('', 'string', string_types),
+    ('29', 'str', string_types),
+    ('13.37', 'str', string_types),
+    ('123j', 'string', string_types),
+    ('0x123', 'string', string_types),
+    ('true', 'string', string_types),
+    ('True', 'string', string_types),
+    (0, 'str', string_types),
+    (29, 'str', string_types),
+    (13.37, 'str', string_types),
+    (123j, 'string', string_types),
+    (0x123, 'string', string_types),
+    (True, 'string', string_types),
     ('None', 'none', type(None))
 ]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		minor_changes:
		- "config - more types are now automatically coerced to string when ``type: str`` is used and the value is parsed as a different type"