dont rely on path to set config defs for plugins (#77659) (#77694)

(cherry picked from commit a3cc6a581e)
pull/78006/head
Brian Coca 2 years ago committed by GitHub
parent f026e3dcf9
commit f02e870b1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- plugin loader will now load config data for plugin by name instead of by file to avoid issues with the same file being loaded under different names (fqcn + short name).

@ -391,7 +391,7 @@ class PluginLoader:
type_name = get_plugin_class(self.class_name) type_name = get_plugin_class(self.class_name)
# if type name != 'module_doc_fragment': # if type name != 'module_doc_fragment':
if type_name in C.CONFIGURABLE_PLUGINS: if type_name in C.CONFIGURABLE_PLUGINS and not C.config.get_configuration_definition(type_name, name):
dstring = AnsibleLoader(getattr(module, 'DOCUMENTATION', ''), file_name=path).get_single_data() dstring = AnsibleLoader(getattr(module, 'DOCUMENTATION', ''), file_name=path).get_single_data()
if dstring: if dstring:
add_fragments(dstring, path, fragment_loader=fragment_loader, is_module=(type_name == 'module')) add_fragments(dstring, path, fragment_loader=fragment_loader, is_module=(type_name == 'module'))
@ -821,10 +821,12 @@ class PluginLoader:
if path not in self._module_cache: if path not in self._module_cache:
self._module_cache[path] = self._load_module_source(name, path) self._module_cache[path] = self._load_module_source(name, path)
self._load_config_defs(name, self._module_cache[path], path)
found_in_cache = False found_in_cache = False
self._load_config_defs(name, self._module_cache[path], path)
obj = getattr(self._module_cache[path], self.class_name) obj = getattr(self._module_cache[path], self.class_name)
if self.base_class: if self.base_class:
# The import path is hardcoded and should be the right place, # The import path is hardcoded and should be the right place,
# so we are not expecting an ImportError. # so we are not expecting an ImportError.
@ -951,15 +953,18 @@ class PluginLoader:
else: else:
full_name = basename full_name = basename
module = self._load_module_source(full_name, path) module = self._load_module_source(full_name, path)
self._load_config_defs(basename, module, path)
except Exception as e: except Exception as e:
display.warning("Skipping plugin (%s) as it seems to be invalid: %s" % (path, to_text(e))) display.warning("Skipping plugin (%s) as it seems to be invalid: %s" % (path, to_text(e)))
continue continue
self._module_cache[path] = module self._module_cache[path] = module
found_in_cache = False found_in_cache = False
else:
module = self._module_cache[path]
self._load_config_defs(basename, module, path)
try: try:
obj = getattr(self._module_cache[path], self.class_name) obj = getattr(module, self.class_name)
except AttributeError as e: except AttributeError as e:
display.warning("Skipping plugin (%s) as it seems to be invalid: %s" % (path, to_text(e))) display.warning("Skipping plugin (%s) as it seems to be invalid: %s" % (path, to_text(e)))
continue continue

@ -31,3 +31,6 @@ do
exit 1 exit 1
fi fi
done done
# test config loading
ansible-playbook use_coll_name.yml -i ../../inventory -e 'ansible_connection=ansible.builtin.ssh' "$@"

@ -0,0 +1,7 @@
- name: ensure configuration is loaded when we use FQCN and have already loaded using 'short namne' (which is case will all builtin connection plugins)
hosts: all
gather_facts: false
tasks:
- name: relies on extra var being passed in with connection and fqcn
ping:
ignore_unreachable: True
Loading…
Cancel
Save