From 27ab589ee874cac7aad65cfb3630a5b38082e4b8 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Fri, 7 Oct 2022 12:45:40 -0400 Subject: [PATCH] ansible-config, only subvalues should use yaml shorthand (#79073) * ensure we only use shorthand for assigned values * fix ansible-config std display * split baby * killed offending whitespace * moved to func instead * the revenge of whitespace --- changelogs/fragments/adjust_config_list.yml | 2 ++ lib/ansible/cli/config.py | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/adjust_config_list.yml diff --git a/changelogs/fragments/adjust_config_list.yml b/changelogs/fragments/adjust_config_list.yml new file mode 100644 index 00000000000..73132b288b0 --- /dev/null +++ b/changelogs/fragments/adjust_config_list.yml @@ -0,0 +1,2 @@ +bugfixes: + - ansible-config limit shorthand format to assigned values diff --git a/lib/ansible/cli/config.py b/lib/ansible/cli/config.py index 165be732e8a..490da3e35c5 100755 --- a/lib/ansible/cli/config.py +++ b/lib/ansible/cli/config.py @@ -35,8 +35,12 @@ from ansible.utils.path import unfrackpath display = Display() -def yaml_dump(data, default_flow_style=True): - return yaml.dump(data, Dumper=AnsibleDumper, default_flow_style=default_flow_style, default_style="''") +def yaml_dump(data, default_flow_style=False, default_style=None): + return yaml.dump(data, Dumper=AnsibleDumper, default_flow_style=default_flow_style, default_style=default_style) + + +def yaml_short(data): + return yaml_dump(data, default_flow_style=True, default_style="''") def get_constants(): @@ -305,7 +309,7 @@ class ConfigCLI(CLI): elif subkey == 'vars': if entry.startswith('_ansible_'): continue - data.append(prefix + '%s: %s' % (entry, to_text(yaml_dump(default), errors='surrogate_or_strict'))) + data.append(prefix + '%s: %s' % (entry, to_text(yaml_short(default), errors='surrogate_or_strict'))) data.append('') return data