(cherry picked from commit 9da8801
)
Co-authored-by: Matt Martz <matt@sivel.net>
This commit is contained in:
parent
6d1cc0dede
commit
3f41c76564
2 changed files with 7 additions and 0 deletions
4
changelogs/fragments/71307-toml-dumps-unsafe.yml
Normal file
4
changelogs/fragments/71307-toml-dumps-unsafe.yml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
bugfixes:
|
||||||
|
- TOML inventory - Ensure we register dump functions for ``AnsibleUnsafe`` to support dumping unsafe values.
|
||||||
|
Note that the TOML format has no functionality to mark that the data is unsafe for re-consumption.
|
||||||
|
(https://github.com/ansible/ansible/issues/71307)
|
|
@ -98,6 +98,7 @@ from ansible.module_utils.six import string_types, text_type
|
||||||
from ansible.parsing.yaml.objects import AnsibleSequence, AnsibleUnicode
|
from ansible.parsing.yaml.objects import AnsibleSequence, AnsibleUnicode
|
||||||
from ansible.plugins.inventory import BaseFileInventoryPlugin
|
from ansible.plugins.inventory import BaseFileInventoryPlugin
|
||||||
from ansible.utils.display import Display
|
from ansible.utils.display import Display
|
||||||
|
from ansible.utils.unsafe_proxy import AnsibleUnsafeBytes, AnsibleUnsafeText
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import toml
|
import toml
|
||||||
|
@ -121,6 +122,8 @@ if HAS_TOML and hasattr(toml, 'TomlEncoder'):
|
||||||
self.dump_funcs.update({
|
self.dump_funcs.update({
|
||||||
AnsibleSequence: self.dump_funcs.get(list),
|
AnsibleSequence: self.dump_funcs.get(list),
|
||||||
AnsibleUnicode: self.dump_funcs.get(str),
|
AnsibleUnicode: self.dump_funcs.get(str),
|
||||||
|
AnsibleUnsafeBytes: self.dump_funcs.get(str),
|
||||||
|
AnsibleUnsafeText: self.dump_funcs.get(str),
|
||||||
})
|
})
|
||||||
toml_dumps = partial(toml.dumps, encoder=AnsibleTomlEncoder())
|
toml_dumps = partial(toml.dumps, encoder=AnsibleTomlEncoder())
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in a new issue