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

Fix config manager to show errors

Browse source 
If there were fatal bugs in this portion of config, they would never be displayed
because config would fail to load and then every^U (Exageration... only
half of every) other part of the code which depended on config to be
loaded would fail before we ever got around to a section of code that
would process UNABLE.

Remove the try except from here so that we are able to debug this code
This commit is contained in:
Toshio Kuratomi 2018-07-31 17:55:32 -07:00
commit 734384b91d
2 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/cli/__init__.py
View file

@ -180,12 +180,6 @@ class CLI(with_metaclass(ABCMeta, object)):
ver = deprecated[1]['version'] ver = deprecated[1]['version']
display.deprecated("%s option, %s %s" % (name, why, alt), version=ver) display.deprecated("%s option, %s %s" % (name, why, alt), version=ver)
# Errors with configuration entries
if C.config.UNABLE:
for unable in C.config.UNABLE:
display.error("Unable to set correct type for configuration entry for %s: %s" % (unable, C.config.UNABLE[unable]))
raise AnsibleError("Invalid configuration settings")
@staticmethod @staticmethod
def split_vault_id(vault_id): def split_vault_id(vault_id):
# return (before_@, after_@) # return (before_@, after_@)

27
lib/ansible/config/manager.py
View file

@ -4,12 +4,12 @@
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import io
import os import os
import sys import sys
import stat import stat
import tempfile import tempfile
import traceback
import io
from collections import namedtuple from collections import namedtuple
from yaml import load as yaml_load from yaml import load as yaml_load
@ -26,9 +26,9 @@ from ansible.module_utils.six.moves import configparser
from ansible.module_utils._text import to_text, to_bytes, to_native from ansible.module_utils._text import to_text, to_bytes, to_native
from ansible.module_utils.parsing.convert_bool import boolean from ansible.module_utils.parsing.convert_bool import boolean
from ansible.parsing.quoting import unquote from ansible.parsing.quoting import unquote
from ansible.utils import py3compat
from ansible.utils.path import unfrackpath from ansible.utils.path import unfrackpath
from ansible.utils.path import makedirs_safe from ansible.utils.path import makedirs_safe
from ansible.utils import py3compat
Plugin = namedtuple('Plugin', 'name type') Plugin = namedtuple('Plugin', 'name type')
@ -182,7 +182,6 @@ def find_ini_config_file(warnings=None):
class ConfigManager(object): class ConfigManager(object):
UNABLE = {}
DEPRECATED = [] DEPRECATED = []
WARNINGS = set() WARNINGS = set()
@ -311,13 +310,14 @@ class ConfigManager(object):
try: try:
value, _drop = self.get_config_value_and_origin(config, cfile=cfile, plugin_type=plugin_type, plugin_name=plugin_name, value, _drop = self.get_config_value_and_origin(config, cfile=cfile, plugin_type=plugin_type, plugin_name=plugin_name,
keys=keys, variables=variables, direct=direct) keys=keys, variables=variables, direct=direct)
except AnsibleError:
raise
except Exception as e: except Exception as e:
raise AnsibleError("Invalid settings supplied for %s: %s" % (config, to_native(e))) raise AnsibleError("Unhandled exception when retrieving %s:\n%s" % (config, traceback.format_exc()))
return value return value
def get_config_value_and_origin(self, config, cfile=None, plugin_type=None, plugin_name=None, keys=None, variables=None, direct=None): def get_config_value_and_origin(self, config, cfile=None, plugin_type=None, plugin_name=None, keys=None, variables=None, direct=None):
''' Given a config key figure out the actual value and report on the origin of the settings ''' ''' Given a config key figure out the actual value and report on the origin of the settings '''
1/0
if cfile is None: if cfile is None:
# use default config # use default config
cfile = self._config_file cfile = self._config_file
@ -440,10 +440,17 @@ class ConfigManager(object):
try: try:
value, origin = self.get_config_value_and_origin(config, configfile) value, origin = self.get_config_value_and_origin(config, configfile)
except Exception as e: except Exception as e:
# when building constants.py we ignore invalid configs # Printing the problem here because, in the current code:
# CLI takes care of warnings once 'display' is loaded # (1) we can't reach the error handler for AnsibleError before we
self.UNABLE[config] = to_text(e) # hit a different error due to lack of working config.
continue # (2) We don't have access to display yet because display depends on config
# being properly loaded.
#
# If we start getting double errors printed from this section of code, then the
# above problem #1 has been fixed. Revamp this to be more like the try: except
# in get_config_value() at that time.
sys.stderr.write("Unhandled error:\n %s\n\n" % traceback.format_exc())
raise AnsibleError("Invalid settings supplied for %s: %s\n%s" % (config, to_native(e), traceback.format_exc()))
# set the constant # set the constant
self.data.update_setting(Setting(config, value, origin, defs[config].get('type', 'string'))) self.data.update_setting(Setting(config, value, origin, defs[config].get('type', 'string')))