mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-06-09 18:15:54 +00:00
Fix all deprecated module_utils imports before ansible-core 2.24 removal
SUMMARY
Fixes all deprecated ansible.module_utils imports across the entire collection that will be removed in ansible-core 2.24.
This PR comprehensively addresses deprecation warnings reported in #686 by updating import statements in 20 files to use the new recommended import paths, and removes 8 unused test utility files that contained deprecated imports.
Deprecated imports replaced:
Deprecated import
Replacement
ansible.module_utils._text
ansible.module_utils.common.text.converters
ansible.module_utils.common._collections_compat
collections.abc
ansible.module_utils.six.moves.shlex_quote
shlex.quote
ansible.module_utils.six.moves.reduce
functools.reduce
ansible.module_utils.six.moves.urllib.parse.urlparse
urllib.parse.urlparse
ansible.module_utils.six.string_types
basestring/str (Python 2/3 compatible)
ansible.module_utils.six.text_type
str
ansible.module_utils.six.PY3
Removed (simplified Python 2/3 conditionals)
ansible.module_utils.six.with_metaclass
Native metaclass= syntax
ansible.module_utils.six.iteritems
dict.items()
Files fixed (20 files, 1 commit per file for easier review):
plugins/action/patch.py
plugins/action/synchronize.py
plugins/callback/cgroup_perf_recap.py
plugins/callback/json.py
plugins/callback/jsonl.py
plugins/callback/profile_roles.py
plugins/callback/profile_tasks.py
plugins/modules/acl.py
plugins/modules/authorized_key.py
plugins/modules/firewalld_info.py
plugins/modules/mount.py
plugins/modules/patch.py
plugins/modules/rhel_rpm_ostree.py
plugins/modules/rpm_ostree_upgrade.py
plugins/modules/seboolean.py
plugins/modules/synchronize.py
plugins/modules/sysctl.py
plugins/shell/csh.py
plugins/shell/fish.py
tests/unit/modules/system/test_mount.py
Files deleted (8 unused test utility files):
These files are dead code - none of them are imported or used anywhere in the test suite or the collection. Removing them also addresses Python 2.7 compatibility concerns raised in code review, as several contained deprecated imports that would be incorrect to fix for Python 2.
tests/unit/compat/builtins.py
tests/unit/mock/loader.py
tests/unit/mock/path.py
tests/unit/mock/procenv.py
tests/unit/mock/vault_helper.py
tests/unit/mock/yaml_helper.py
tests/unit/modules/conftest.py
tests/unit/modules/utils.py
Completeness verified with:
git grep -n -P '_compat|utils._text|utils.six' -- '*.py' | grep -v yml
This command returns no results, confirming all deprecated imports have been replaced.
Notes on Python 2.7 compatibility:
For modules that may run on Python 2.7 managed hosts (e.g., authorized_key.py, synchronize.py, sysctl.py), Python 2/3 compatible fallbacks were used instead of direct Python 3 replacements:
authorized_key.py: try/except ImportError for urllib.parse.urlparse (falls back to urlparse on Python 2)
synchronize.py: try/except ImportError for shlex.quote (falls back to pipes.quote on Python 2)
sysctl.py: uses sys.version_info to set string_types to str on Python 3 (basestring on Python 2)
Also removes corresponding pylint:ansible-bad-import-from entries from tests/sanity/ignore-2.21.txt and tests/sanity/ignore-2.22.txt where applicable.
Fixes #686
ISSUE TYPE
Bugfix Pull Request
ADDITIONAL INFORMATION
Approach:
Each file is fixed in a separate commit for easier code review. The changelog fragment is added in a final commit. Corresponding pylint:ansible-bad-import-from ignore entries in tests/sanity/ignore-2.21.txt and tests/sanity/ignore-2.22.txt are removed in the same commit as the file fix (or the file removal commit).
CI results:
All 59 checks passing (Azure Pipelines sanity, units, lint, Docker, Remote across ansible-core 2.17 through devel, and Zuul ansible/check).
Reviewed-by: Felix Fontein <felix@fontein.de>
Reviewed-by: Pavel Bar
Reviewed-by: Abhijeet Kasurde
(cherry picked from commit 2022c1bd86)
Co-authored-by: centosinfra-prod-github-app[bot] <161850885+centosinfra-prod-github-app[bot]@users.noreply.github.com>
198 lines
6.2 KiB
Python
198 lines
6.2 KiB
Python
# (c) 2016, Matt Martz <matt@sivel.net>
|
|
# (c) 2017 Ansible Project
|
|
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
|
|
|
# Make coding more python3-ish
|
|
from __future__ import (absolute_import, division, print_function)
|
|
__metaclass__ = type
|
|
|
|
DOCUMENTATION = '''
|
|
name: json
|
|
short_description: Ansible screen output as JSON
|
|
description:
|
|
- This callback converts all events into JSON output to stdout
|
|
type: stdout
|
|
requirements:
|
|
- Set as stdout in config
|
|
options:
|
|
show_custom_stats:
|
|
name: Show custom stats
|
|
description: 'This adds the custom stats set via the set_stats plugin to the play recap'
|
|
default: False
|
|
env:
|
|
- name: ANSIBLE_SHOW_CUSTOM_STATS
|
|
ini:
|
|
- key: show_custom_stats
|
|
section: defaults
|
|
type: bool
|
|
json_indent:
|
|
name: Use indenting for the JSON output
|
|
description: 'If specified, use this many spaces for indenting in the JSON output. If <= 0, write to a single line.'
|
|
default: 4
|
|
env:
|
|
- name: ANSIBLE_JSON_INDENT
|
|
ini:
|
|
- key: json_indent
|
|
section: defaults
|
|
type: integer
|
|
notes:
|
|
- When using a strategy such as free, host_pinned, or a custom strategy, host results will
|
|
be added to new task results in ``.plays[].tasks[]``. As such, there will exist duplicate
|
|
task objects indicated by duplicate task IDs at ``.plays[].tasks[].task.id``, each with an
|
|
individual host result for the task.
|
|
'''
|
|
|
|
import datetime
|
|
import json
|
|
|
|
from functools import partial
|
|
|
|
from ansible.inventory.host import Host
|
|
from ansible.module_utils.common.text.converters import to_text
|
|
from ansible.parsing.ajson import AnsibleJSONEncoder
|
|
from ansible.plugins.callback import CallbackBase
|
|
|
|
|
|
LOCKSTEP_CALLBACKS = frozenset(('linear', 'debug'))
|
|
|
|
|
|
def current_time():
|
|
return '%sZ' % datetime.datetime.utcnow().isoformat()
|
|
|
|
|
|
class CallbackModule(CallbackBase):
|
|
CALLBACK_VERSION = 2.0
|
|
CALLBACK_TYPE = 'stdout'
|
|
CALLBACK_NAME = 'ansible.posix.json'
|
|
|
|
def __init__(self, display=None):
|
|
super(CallbackModule, self).__init__(display)
|
|
self.results = []
|
|
self._task_map = {}
|
|
self._is_lockstep = False
|
|
|
|
self.set_options()
|
|
|
|
self._json_indent = self.get_option('json_indent')
|
|
if self._json_indent <= 0:
|
|
self._json_indent = None
|
|
|
|
def _new_play(self, play):
|
|
self._is_lockstep = play.strategy in LOCKSTEP_CALLBACKS
|
|
return {
|
|
'play': {
|
|
'name': play.get_name(),
|
|
'id': to_text(play._uuid),
|
|
'path': to_text(play.get_path()),
|
|
'duration': {
|
|
'start': current_time()
|
|
}
|
|
},
|
|
'tasks': []
|
|
}
|
|
|
|
def _new_task(self, task):
|
|
return {
|
|
'task': {
|
|
'name': task.get_name(),
|
|
'id': to_text(task._uuid),
|
|
'path': to_text(task.get_path()),
|
|
'duration': {
|
|
'start': current_time()
|
|
}
|
|
},
|
|
'hosts': {}
|
|
}
|
|
|
|
def _find_result_task(self, host, task):
|
|
key = (host.get_name(), task._uuid)
|
|
return self._task_map.get(
|
|
key,
|
|
self.results[-1]['tasks'][-1]
|
|
)
|
|
|
|
def v2_playbook_on_play_start(self, play):
|
|
self.results.append(self._new_play(play))
|
|
|
|
def v2_runner_on_start(self, host, task):
|
|
if self._is_lockstep:
|
|
return
|
|
key = (host.get_name(), task._uuid)
|
|
task_result = self._new_task(task)
|
|
self._task_map[key] = task_result
|
|
self.results[-1]['tasks'].append(task_result)
|
|
|
|
def v2_playbook_on_task_start(self, task, is_conditional):
|
|
if not self._is_lockstep:
|
|
return
|
|
self.results[-1]['tasks'].append(self._new_task(task))
|
|
|
|
def v2_playbook_on_handler_task_start(self, task):
|
|
if not self._is_lockstep:
|
|
return
|
|
self.results[-1]['tasks'].append(self._new_task(task))
|
|
|
|
def _convert_host_to_name(self, key):
|
|
if isinstance(key, (Host,)):
|
|
return key.get_name()
|
|
return key
|
|
|
|
def v2_playbook_on_stats(self, stats):
|
|
"""Display info about playbook statistics"""
|
|
|
|
hosts = sorted(stats.processed.keys())
|
|
|
|
summary = {}
|
|
for h in hosts:
|
|
s = stats.summarize(h)
|
|
summary[h] = s
|
|
|
|
custom_stats = {}
|
|
global_custom_stats = {}
|
|
|
|
if self.get_option('show_custom_stats') and stats.custom:
|
|
custom_stats.update(dict((self._convert_host_to_name(k), v) for k, v in stats.custom.items()))
|
|
global_custom_stats.update(custom_stats.pop('_run', {}))
|
|
|
|
output = {
|
|
'plays': self.results,
|
|
'stats': summary,
|
|
'custom_stats': custom_stats,
|
|
'global_custom_stats': global_custom_stats,
|
|
}
|
|
|
|
self._display.display(json.dumps(output, cls=AnsibleJSONEncoder, indent=self._json_indent, sort_keys=True))
|
|
|
|
def _record_task_result(self, on_info, result, **kwargs):
|
|
"""This function is used as a partial to add failed/skipped info in a single method"""
|
|
host = result._host
|
|
task = result._task
|
|
|
|
result_copy = result._result.copy()
|
|
result_copy.update(on_info)
|
|
result_copy['action'] = task.action
|
|
|
|
task_result = self._find_result_task(host, task)
|
|
|
|
task_result['hosts'][host.name] = result_copy
|
|
end_time = current_time()
|
|
task_result['task']['duration']['end'] = end_time
|
|
self.results[-1]['play']['duration']['end'] = end_time
|
|
|
|
if not self._is_lockstep:
|
|
key = (host.get_name(), task._uuid)
|
|
del self._task_map[key]
|
|
|
|
def __getattribute__(self, name):
|
|
"""Return ``_record_task_result`` partial with a dict containing skipped/failed if necessary"""
|
|
if name not in ('v2_runner_on_ok', 'v2_runner_on_failed', 'v2_runner_on_unreachable', 'v2_runner_on_skipped'):
|
|
return object.__getattribute__(self, name)
|
|
|
|
on = name.rsplit('_', 1)[1]
|
|
|
|
on_info = {}
|
|
if on in ('failed', 'skipped'):
|
|
on_info[on] = True
|
|
|
|
return partial(self._record_task_result, on_info)
|