ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-03 12:44:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Specify run_command decode error style as arg (#17886)

Browse source 
* Specify run_command decode error style as arg

Instead of getting the stdout/stderr text from
run_command, and then decoding to utf-8 with a
particular error scheme, use the 'errors' arg
to run_command so it does that itself.

* Use 'surrogate_or_replace' instead of 'replace'

For the text decoding error scheme in run_command calls.

* Let the local_facts run_command use default errors

* fix typo
This commit is contained in:
Adrian Likins 2016-10-03 17:10:50 -04:00 • committed by Toshio Kuratomi
commit d0bdfc2abb
1 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/ansible/module_utils/facts.py
View file

@ -261,9 +261,8 @@ class Facts(object):
# try to read it as json first # try to read it as json first
# if that fails read it with ConfigParser # if that fails read it with ConfigParser
# if that fails, skip it # if that fails, skip it
rc, out, err = self.module.run_command(fn)
try: try:
out = out.decode('utf-8', 'strict') rc, out, err = self.module.run_command(fn)
except UnicodeError: except UnicodeError:
fact = 'error loading fact - output of running %s was not utf-8' % fn fact = 'error loading fact - output of running %s was not utf-8' % fn
local[fact_base] = fact local[fact_base] = fact
@ -394,9 +393,8 @@ class Facts(object):
def get_lsb_facts(self): def get_lsb_facts(self):
lsb_path = self.module.get_bin_path('lsb_release') lsb_path = self.module.get_bin_path('lsb_release')
if lsb_path: if lsb_path:
rc, out, err = self.module.run_command([lsb_path, "-a"]) rc, out, err = self.module.run_command([lsb_path, "-a"], errors='surrogate_or_replace')
if rc == 0: if rc == 0:
out = out.decode('utf-8', 'replace')
self.facts['lsb'] = {} self.facts['lsb'] = {}
for line in out.split('\n'): for line in out.split('\n'):
if len(line) < 1 or ':' not in line: if len(line) < 1 or ':' not in line:
@ -466,8 +464,7 @@ class Facts(object):
def get_caps_facts(self): def get_caps_facts(self):
capsh_path = self.module.get_bin_path('capsh') capsh_path = self.module.get_bin_path('capsh')
if capsh_path: if capsh_path:
rc, out, err = self.module.run_command([capsh_path, "--print"]) rc, out, err = self.module.run_command([capsh_path, "--print"], errors='surrogate_or_replace')
out = out.decode('utf-8', 'replace')
enforced_caps = [] enforced_caps = []
enforced = 'NA' enforced = 'NA'
for line in out.split('\n'): for line in out.split('\n'):
@ -1268,7 +1265,7 @@ class LinuxHardware(Hardware):
def _run_findmnt(self, findmnt_path): def _run_findmnt(self, findmnt_path):
args = ['--list', '--noheadings', '--notruncate'] args = ['--list', '--noheadings', '--notruncate']
cmd = [findmnt_path] + args cmd = [findmnt_path] + args
rc, out, err = self.module.run_command(cmd) rc, out, err = self.module.run_command(cmd, errors='surrogate_or_replace')
return rc, out, err return rc, out, err
def _find_bind_mounts(self): def _find_bind_mounts(self):
@ -1280,7 +1277,6 @@ class LinuxHardware(Hardware):
rc, out, err = self._run_findmnt(findmnt_path) rc, out, err = self._run_findmnt(findmnt_path)
if rc != 0: if rc != 0:
return bind_mounts return bind_mounts
out = out.decode('utf-8', 'replace')
# find bind mounts, in case /etc/mtab is a symlink to /proc/mounts # find bind mounts, in case /etc/mtab is a symlink to /proc/mounts
for line in out.splitlines(): for line in out.splitlines():
@ -1359,8 +1355,7 @@ class LinuxHardware(Hardware):
self.facts['devices'] = {} self.facts['devices'] = {}
lspci = self.module.get_bin_path('lspci') lspci = self.module.get_bin_path('lspci')
if lspci: if lspci:
rc, pcidata, err = self.module.run_command([lspci, '-D']) rc, pcidata, err = self.module.run_command([lspci, '-D'], errors='surrogate_or_replace')
pcidata = pcidata.decode('utf-8', 'replace')
else: else:
pcidata = None pcidata = None
@ -2254,8 +2249,7 @@ class LinuxNetwork(Network):
continue continue
if v == 'v6' and not socket.has_ipv6: if v == 'v6' and not socket.has_ipv6:
continue continue
rc, out, err = self.module.run_command(command[v]) rc, out, err = self.module.run_command(command[v], errors='surrogate_or_replace')
out = out.decode('utf-8', 'replace')
if not out: if not out:
# v6 routing may result in # v6 routing may result in
# RTNETLINK answers: Invalid argument # RTNETLINK answers: Invalid argument
@ -2425,12 +2419,10 @@ class LinuxNetwork(Network):
ip_path = self.module.get_bin_path("ip") ip_path = self.module.get_bin_path("ip")
args = [ip_path, 'addr', 'show', 'primary', device] args = [ip_path, 'addr', 'show', 'primary', device]
rc, stdout, stderr = self.module.run_command(args) rc, primary_data, stderr = self.module.run_command(args, errors='surrogate_or_replace')
primary_data = stdout.decode('utf-8', 'replace')
args = [ip_path, 'addr', 'show', 'secondary', device] args = [ip_path, 'addr', 'show', 'secondary', device]
rc, stdout, stderr = self.module.run_command(args) rc, secondary_data, stderr = self.module.run_command(args, errors='surrogate_or_replace')
secondary_data = stdout.decode('utf-8', 'decode')
parse_ip_output(primary_data) parse_ip_output(primary_data)
parse_ip_output(secondary_data, secondary=True) parse_ip_output(secondary_data, secondary=True)
@ -2452,8 +2444,7 @@ class LinuxNetwork(Network):
ethtool_path = self.module.get_bin_path("ethtool") ethtool_path = self.module.get_bin_path("ethtool")
if ethtool_path: if ethtool_path:
args = [ethtool_path, '-k', device] args = [ethtool_path, '-k', device]
rc, stdout, stderr = self.module.run_command(args) rc, stdout, stderr = self.module.run_command(args, errors='surrogate_or_replace')
stdout = stdout.decode('utf-8', 'replace')
if rc == 0: if rc == 0:
for line in stdout.strip().split('\n'): for line in stdout.strip().split('\n'):
if not line or line.endswith(":"): if not line or line.endswith(":"):