ansible-core 2.19.0b4__py3-none-any.whl → 2.19.0b6__py3-none-any.whl

ansible/module_utils/connection.py

@@ -33,7 +33,6 @@ import json
 import pickle
 import socket
 import struct
-import traceback
 import uuid
 
 from functools import partial
@@ -136,12 +135,11 @@ class Connection(object):
 
         try:
             out = self.send(data)
-        except socket.error as e:
+        except OSError as ex:
             raise ConnectionError(
-                'unable to connect to socket %s. See Troubleshooting socket path issues '
-                'in the Network Debug and Troubleshooting Guide' % self.socket_path,
-                err=to_text(e, errors='surrogate_then_replace'), exception=traceback.format_exc()
-            )
+                f'Unable to connect to socket {self.socket_path!r}. See Troubleshooting socket path issues '
+                'in the Network Debug and Troubleshooting Guide.'
+            ) from ex
 
         try:
             response = json.loads(out)
@@ -192,13 +190,12 @@ class Connection(object):
             send_data(sf, to_bytes(data))
             response = recv_data(sf)
 
-        except socket.error as e:
+        except OSError as ex:
             sf.close()
             raise ConnectionError(
-                'unable to connect to socket %s. See the socket path issue category in '
-                'Network Debug and Troubleshooting Guide' % self.socket_path,
-                err=to_text(e, errors='surrogate_then_replace'), exception=traceback.format_exc()
-            )
+                f'Unable to connect to socket {self.socket_path!r}. See the socket path issue category in '
+                'Network Debug and Troubleshooting Guide.',
+            ) from ex
 
         sf.close()
 

ansible/module_utils/datatag.py

@@ -3,13 +3,15 @@ from __future__ import annotations as _annotations
 
 import typing as _t
 
-from ._internal import _datatag, _deprecator
+from ._internal import _datatag, _deprecator, _traceback, _messages
 from ._internal._datatag import _tags
-from .common import messages as _messages
 
 _T = _t.TypeVar('_T')
 
 
+deprecator_from_collection_name = _deprecator.deprecator_from_collection_name
+
+
 def deprecate_value(
     value: _T,
     msg: str,
@@ -36,6 +38,7 @@ def deprecate_value(
         date=date,
         version=version,
         deprecator=_deprecator.get_best_deprecator(deprecator=deprecator, collection_name=collection_name),
+        formatted_traceback=_traceback.maybe_capture_traceback(msg, _traceback.TracebackEvent.DEPRECATED_VALUE),
     )
 
     return deprecated.tag(value)

ansible/module_utils/facts/hardware/linux.py

@@ -182,7 +182,7 @@ class LinuxHardware(Hardware):
                         xen = True
                     # Only interested in the first line
                     break
-        except IOError:
+        except OSError:
             pass
 
         if not os.access("/proc/cpuinfo", os.R_OK):

ansible/module_utils/facts/sysctl.py

@@ -17,8 +17,6 @@ from __future__ import annotations
 
 import re
 
-from ansible.module_utils.common.text.converters import to_text
-
 
 def get_sysctl(module, prefixes):
 
@@ -31,8 +29,8 @@ def get_sysctl(module, prefixes):
 
         try:
             rc, out, err = module.run_command(cmd)
-        except (IOError, OSError) as e:
-            module.warn('Unable to read sysctl: %s' % to_text(e))
+        except OSError as ex:
+            module.error_as_warning('Unable to read sysctl.', exception=ex)
             rc = 1
 
         if rc == 0:
@@ -54,8 +52,8 @@ def get_sysctl(module, prefixes):
 
                 try:
                     (key, value) = re.split(r'\s?=\s?|: ', line, maxsplit=1)
-                except Exception as e:
-                    module.warn('Unable to split sysctl line (%s): %s' % (to_text(line), to_text(e)))
+                except Exception as ex:
+                    module.error_as_warning(f'Unable to split sysctl line {line!r}.', exception=ex)
 
             if key:
                 sysctl[key] = value.strip()

ansible/module_utils/facts/system/caps.py

@@ -38,8 +38,8 @@ class SystemCapabilitiesFactCollector(BaseFactCollector):
                 # NOTE: -> get_caps_data()/parse_caps_data() for easier mocking -akl
                 try:
                     rc, out, err = module.run_command([capsh_path, "--print"], errors='surrogate_then_replace', handle_exceptions=False)
-                except (IOError, OSError) as e:
-                    module.warn('Could not query system capabilities: %s' % str(e))
+                except OSError as ex:
+                    module.error_as_warning('Could not query system capabilities.', exception=ex)
 
             if rc == 0:
                 enforced_caps = []

ansible/module_utils/facts/system/distribution.py

@@ -310,9 +310,22 @@ class DistributionFiles:
                         suse_facts['distribution_release'] = release.group(1)
                         suse_facts['distribution_version'] = collected_facts['distribution_version'] + '.' + release.group(1)
 
-        # See https://www.suse.com/support/kb/doc/?id=000019341 for SLES for SAP
-        if os.path.islink('/etc/products.d/baseproduct') and os.path.realpath('/etc/products.d/baseproduct').endswith('SLES_SAP.prod'):
-            suse_facts['distribution'] = 'SLES_SAP'
+        # Check VARIANT_ID first for SLES4SAP or SL-Micro
+        variant_id_match = re.search(r'^VARIANT_ID="?([^"\n]*)"?', data, re.MULTILINE)
+        if variant_id_match:
+            variant_id = variant_id_match.group(1)
+            if variant_id in ('server-sap', 'sles-sap'):
+                suse_facts['distribution'] = 'SLES_SAP'
+            elif variant_id == 'transactional':
+                suse_facts['distribution'] = 'SL-Micro'
+        else:
+            # Fallback for older SLES 15 using baseproduct symlink
+            if os.path.islink('/etc/products.d/baseproduct'):
+                resolved = os.path.realpath('/etc/products.d/baseproduct')
+                if resolved.endswith('SLES_SAP.prod'):
+                    suse_facts['distribution'] = 'SLES_SAP'
+                elif resolved.endswith('SL-Micro.prod'):
+                    suse_facts['distribution'] = 'SL-Micro'
 
         return True, suse_facts
 

ansible/module_utils/facts/system/local.py

@@ -50,7 +50,7 @@ class LocalFactCollector(BaseFactCollector):
                     rc, out, err = module.run_command(fn)
                     if rc != 0:
                         failed = 'Failure executing fact script (%s), rc: %s, err: %s' % (fn, rc, err)
-                except (IOError, OSError) as e:
+                except OSError as e:
                     failed = 'Could not execute fact script (%s): %s' % (fn, to_text(e))
 
                 if failed is not None:

ansible/module_utils/facts/virtual/linux.py

@@ -129,7 +129,7 @@ class LinuxVirtual(Virtual):
                 for line in get_file_lines('/proc/xen/capabilities'):
                     if "control_d" in line:
                         is_xen_host = True
-            except IOError:
+            except OSError:
                 pass
 
             if is_xen_host:
@@ -201,7 +201,7 @@ class LinuxVirtual(Virtual):
                 virtual_facts['virtualization_type'] = 'virtualbox'
                 found_virt = True
 
-        if bios_vendor in ('Amazon EC2', 'DigitalOcean', 'Hetzner'):
+        if bios_vendor in ('Amazon EC2', 'DigitalOcean', 'Hetzner', 'Linode'):
             guest_tech.add('kvm')
             if not found_virt:
                 virtual_facts['virtualization_type'] = 'kvm'

ansible/module_utils/service.py

@@ -36,7 +36,7 @@ import select
 import shlex
 import subprocess
 
-from ansible.module_utils.six import PY2, b
+from ansible.module_utils.six import b
 from ansible.module_utils.common.text.converters import to_bytes, to_text
 
 
@@ -187,12 +187,8 @@ def daemonize(module, cmd):
     if pid == 0:
         os.close(pipe[0])
 
-        # if command is string deal with  py2 vs py3 conversions for shlex
         if not isinstance(cmd, list):
-            if PY2:
-                cmd = shlex.split(to_bytes(cmd, errors=errors))
-            else:
-                cmd = shlex.split(to_text(cmd, errors=errors))
+            cmd = shlex.split(to_text(cmd, errors=errors))
 
         # make sure we always use byte strings
         run_cmd = []
@@ -247,9 +243,6 @@ def daemonize(module, cmd):
                     break
                 return_data += to_bytes(data, errors=errors)
 
-        # Note: no need to specify encoding on py3 as this module sends the
-        # pickle to itself (thus same python interpreter so we aren't mixing
-        # py2 and py3)
         return pickle.loads(to_bytes(return_data, errors=errors))
 
 
@@ -293,7 +286,7 @@ def is_systemd_managed(module):
             with open('/proc/1/comm', 'r') as init_proc:
                 init = init_proc.readline().strip()
                 return init == 'systemd'
-        except IOError:
+        except OSError:
             # If comm doesn't exist, old kernel, no systemd
             return False
 

ansible/module_utils/urls.py

@@ -580,7 +580,7 @@ def get_ca_certs(cafile=None, capath=None):
                             cadata[b_der] = None
                     except Exception:
                         continue
-                except (OSError, IOError):
+                except OSError:
                     pass
 
     # paths_checked isn't used any more, but is kept just for ease of debugging
@@ -694,7 +694,7 @@ def _configure_auth(url, url_username, url_password, use_gssapi, force_basic_aut
         try:
             rc = netrc.netrc(os.environ.get('NETRC'))
             login = rc.authenticators(parsed.hostname)
-        except IOError:
+        except OSError:
             login = None
 
         if login:
@@ -1303,8 +1303,8 @@ def fetch_url(module, url, data=None, headers=None, method=None,
     except urllib.error.URLError as e:
         code = int(getattr(e, 'code', -1))
         info.update(dict(msg="Request failed: %s" % to_native(e), status=code))
-    except socket.error as e:
-        info.update(dict(msg="Connection failure: %s" % to_native(e), status=-1))
+    except OSError as ex:
+        info.update(dict(msg=f"Connection failure: {ex}", status=-1))
     except http.client.BadStatusLine as e:
         info.update(dict(msg="Connection failure: connection was closed before a valid response was received: %s" % to_native(e.line), status=-1))
     except Exception as ex:

ansible/modules/apt_repository.py

@@ -88,8 +88,8 @@ options:
         description:
             - Whether to automatically try to install the Python apt library or not, if it is not already installed.
               Without this library, the module does not work.
-            - Runs C(apt-get install python-apt) for Python 2, and C(apt-get install python3-apt) for Python 3.
-            - Only works with the system Python 2 or Python 3. If you are using a Python on the remote that is not
+            - Runs C(apt-get install python3-apt).
+            - Only works with the system Python. If you are using a Python on the remote that is not
               the system Python, set O(install_python_apt=false) and ensure that the Python apt library
               for your Python version is installed some other way.
         type: bool
@@ -98,8 +98,7 @@ author:
 - Alexander Saltanov (@sashka)
 version_added: "0.7"
 requirements:
-   - python-apt (python 2)
-   - python3-apt (python 3)
+   - python3-apt
    - apt-key or gpg
 """
 
@@ -232,14 +231,15 @@ class SourcesList(object):
         self.files_mapping = {}  # internal DS for tracking symlinks
         # Repositories that we're adding -- used to implement mode param
         self.new_repos = set()
-        self.default_file = self._apt_cfg_file('Dir::Etc::sourcelist')
+        self.default_file = apt_pkg.config.find_file('Dir::Etc::sourcelist')
 
         # read sources.list if it exists
         if os.path.isfile(self.default_file):
             self.load(self.default_file)
 
         # read sources.list.d
-        for file in glob.iglob('%s/*.list' % self._apt_cfg_dir('Dir::Etc::sourceparts')):
+        self.sources_dir = apt_pkg.config.find_dir('Dir::Etc::sourceparts')
+        for file in glob.iglob(f'{self.sources_dir}/*.list'):
             if os.path.islink(file):
                 self.files_mapping[file] = os.readlink(file)
             self.load(file)
@@ -255,7 +255,7 @@ class SourcesList(object):
         if '/' in filename:
             return filename
         else:
-            return os.path.abspath(os.path.join(self._apt_cfg_dir('Dir::Etc::sourceparts'), filename))
+            return os.path.abspath(os.path.join(self.sources_dir, filename))
 
     def _suggest_filename(self, line):
         def _cleanup_filename(s):
@@ -313,28 +313,6 @@ class SourcesList(object):
 
         return valid, enabled, source, comment
 
-    @staticmethod
-    def _apt_cfg_file(filespec):
-        """
-        Wrapper for `apt_pkg` module for running with Python 2.5
-        """
-        try:
-            result = apt_pkg.config.find_file(filespec)
-        except AttributeError:
-            result = apt_pkg.Config.FindFile(filespec)
-        return result
-
-    @staticmethod
-    def _apt_cfg_dir(dirspec):
-        """
-        Wrapper for `apt_pkg` module for running with Python 2.5
-        """
-        try:
-            result = apt_pkg.config.find_dir(dirspec)
-        except AttributeError:
-            result = apt_pkg.Config.FindDir(dirspec)
-        return result
-
     def load(self, file):
         group = []
         f = open(file, 'r')
@@ -355,8 +333,8 @@ class SourcesList(object):
 
                 try:
                     fd, tmp_path = tempfile.mkstemp(prefix=".%s-" % fn, dir=d)
-                except (OSError, IOError) as e:
-                    self.module.fail_json(msg='Unable to create temp file at "%s" for apt source: %s' % (d, to_native(e)))
+                except OSError as ex:
+                    raise Exception(f'Unable to create temp file at {d!r} for apt source.') from ex
 
                 f = os.fdopen(fd, 'w')
                 for n, valid, enabled, source, comment in sources:
@@ -372,8 +350,8 @@ class SourcesList(object):
 
                     try:
                         f.write(line)
-                    except IOError as ex:
-                        self.module.fail_json(msg="Failed to write to file %s: %s" % (tmp_path, to_native(ex)))
+                    except OSError as ex:
+                        raise Exception(f"Failed to write to file {tmp_path!r}.") from ex
                 if filename in self.files_mapping:
                     # Write to symlink target instead of replacing symlink as a normal file
                     self.module.atomic_move(tmp_path, self.files_mapping[filename])
@@ -529,8 +507,8 @@ class UbuntuSourcesList(SourcesList):
             if os.path.exists(key_file):
                 try:
                     rc, out, err = self.module.run_command([self.gpg_bin, '--list-packets', key_file])
-                except (IOError, OSError) as e:
-                    self.debug("Could check key against file %s: %s" % (key_file, to_native(e)))
+                except OSError as ex:
+                    self.debug(f"Could check key against file {key_file!r}: {ex}")
                     continue
 
                 if key_fingerprint in out:
@@ -579,8 +557,8 @@ class UbuntuSourcesList(SourcesList):
                             with open(keyfile, 'wb') as f:
                                 f.write(stdout)
                             self.module.log('Added repo key "%s" for apt to file "%s"' % (info['signing_key_fingerprint'], keyfile))
-                        except (OSError, IOError) as e:
-                            self.module.fail_json(msg='Unable to add required signing key for%s ', rc=rc, stderr=stderr, error=to_native(e))
+                        except OSError as ex:
+                            self.module.fail_json(msg='Unable to add required signing key.', rc=rc, stderr=stderr, error=str(ex), exception=ex)
 
             # apt source file
             file = file or self._suggest_filename('%s_%s' % (line, self.codename))
@@ -774,9 +752,9 @@ def main():
                     )
                     module.fail_json(msg=msg)
 
-        except (OSError, IOError) as ex:
+        except OSError as ex:
             revert_sources_list(sources_before, sources_after, sourceslist_before)
-            module.fail_json(msg=to_native(ex))
+            raise
 
     module.exit_json(changed=changed, repo=repo, sources_added=sources_added, sources_removed=sources_removed, state=state, diff=diff)
 

ansible/modules/assemble.py

@@ -186,10 +186,10 @@ def cleanup(module, path, result=None):
     if os.path.exists(path):
         try:
             os.remove(path)
-        except (IOError, OSError) as e:
+        except OSError as ex:
             # don't error on possible race conditions, but keep warning
             if result is not None:
-                module.warn('Unable to remove temp file (%s): %s' % (path, to_native(e)))
+                module.error_as_warning(f'Unable to remove temp file {path!r}.', exception=ex)
 
 
 def main():

ansible/modules/async_status.py

@@ -28,6 +28,8 @@ options:
     type: str
     choices: [ cleanup, status ]
     default: status
+notes:
+  - The RV(started) and RV(finished) return values were updated to return V(True) or V(False) instead of V(1) or V(0) in ansible-core 2.19.
 extends_documentation_fragment:
 - action_common_attributes
 - action_common_attributes.flow
@@ -85,15 +87,15 @@ ansible_job_id:
   type: str
   sample: '360874038559.4169'
 finished:
-  description: Whether the asynchronous job has finished (V(1)) or not (V(0))
+  description: Whether the asynchronous job has finished or not
   returned: always
-  type: int
-  sample: 1
+  type: bool
+  sample: true
 started:
-  description: Whether the asynchronous job has started (V(1)) or not (V(0))
+  description: Whether the asynchronous job has started or not
   returned: always
-  type: int
-  sample: 1
+  type: bool
+  sample: true
 stdout:
   description: Any output returned by async_wrapper
   returned: always
@@ -134,7 +136,7 @@ def main():
     log_path = os.path.join(async_dir, jid)
 
     if not os.path.exists(log_path):
-        module.fail_json(msg="could not find job", ansible_job_id=jid, started=1, finished=1)
+        module.fail_json(msg="could not find job", ansible_job_id=jid, started=True, finished=True)
 
     if mode == 'cleanup':
         os.unlink(log_path)
@@ -151,16 +153,16 @@ def main():
     except Exception:
         if not data:
             # file not written yet?  That means it is running
-            module.exit_json(results_file=log_path, ansible_job_id=jid, started=1, finished=0)
+            module.exit_json(results_file=log_path, ansible_job_id=jid, started=True, finished=False)
         else:
             module.fail_json(ansible_job_id=jid, results_file=log_path,
-                             msg="Could not parse job output: %s" % data, started=1, finished=1)
+                             msg="Could not parse job output: %s" % data, started=True, finished=True)
 
     if 'started' not in data:
-        data['finished'] = 1
+        data['finished'] = True
         data['ansible_job_id'] = jid
     elif 'finished' not in data:
-        data['finished'] = 0
+        data['finished'] = False
 
     # just write the module output directly to stdout and exit; bypass other processing done by exit_json since it's already been done
     print(f"\n{json.dumps(data)}")  # pylint: disable=ansible-bad-function

ansible/modules/async_wrapper.py

@@ -6,7 +6,6 @@
 from __future__ import annotations
 
 
-import errno
 import json
 import shlex
 import shutil
@@ -122,24 +121,14 @@ def _get_interpreter(module_path):
         return head[2:head.index(b'\n')].strip().split(b' ')
 
 
-def _make_temp_dir(path):
-    # TODO: Add checks for permissions on path.
-    try:
-        os.makedirs(path)
-    except OSError as e:
-        if e.errno != errno.EEXIST:
-            raise
-
-
 def jwrite(info):
-
     jobfile = job_path + ".tmp"
     tjob = open(jobfile, "w")
     try:
         tjob.write(json.dumps(info))
-    except (IOError, OSError) as e:
-        notice('failed to write to %s: %s' % (jobfile, str(e)))
-        raise e
+    except OSError as ex:
+        notice(f'failed to write to {jobfile!r}: {ex}')
+        raise
     finally:
         tjob.close()
         os.rename(jobfile, job_path)
@@ -149,7 +138,7 @@ def _run_module(wrapped_cmd, jid):
 
     # DTFIX-FUTURE: needs rework for serialization profiles
 
-    jwrite({"started": 1, "finished": 0, "ansible_job_id": jid})
+    jwrite({"started": True, "finished": False, "ansible_job_id": jid})
 
     result = {}
 
@@ -200,10 +189,10 @@ def _run_module(wrapped_cmd, jid):
             result['stderr'] = stderr
         jwrite(result)
 
-    except (OSError, IOError):
+    except OSError:
         e = sys.exc_info()[1]
         result = {
-            "failed": 1,
+            "failed": True,
             "cmd": wrapped_cmd,
             "msg": to_text(e),
             "outdata": outdata,  # temporary notice only
@@ -212,9 +201,9 @@ def _run_module(wrapped_cmd, jid):
         result['ansible_job_id'] = jid
         jwrite(result)
 
-    except (ValueError, Exception):
+    except Exception:
         result = {
-            "failed": 1,
+            "failed": True,
             "cmd": wrapped_cmd,
             "data": outdata,  # temporary notice only
             "stderr": stderr,
@@ -257,10 +246,11 @@ def main():
     job_path = os.path.join(jobdir, jid)
 
     try:
-        _make_temp_dir(jobdir)
+        # TODO: Add checks for permissions on path.
+        os.makedirs(jobdir, exist_ok=True)
     except Exception as e:
         end({
-            "failed": 1,
+            "failed": True,
             "msg": "could not create directory: %s - %s" % (jobdir, to_text(e)),
             "exception": to_text(traceback.format_exc()),  # NB: task executor compat will coerce to the correct dataclass type
         }, 1)
@@ -293,7 +283,7 @@ def main():
                     continue
 
             notice("Return async_wrapper task started.")
-            end({"failed": 0, "started": 1, "finished": 0, "ansible_job_id": jid, "results_file": job_path,
+            end({"failed": False, "started": True, "finished": False, "ansible_job_id": jid, "results_file": job_path,
                  "_ansible_suppress_tmpdir_delete": (not preserve_tmp)}, 0)
         else:
             # The actual wrapper process

ansible/modules/command.py

@@ -299,9 +299,9 @@ def main():
 
         try:
             os.chdir(chdir)
-        except (IOError, OSError) as e:
-            r['msg'] = 'Unable to change directory before execution: %s' % to_text(e)
-            module.fail_json(**r)
+        except OSError as ex:
+            r['msg'] = 'Unable to change directory before execution.'
+            module.fail_json(**r, exception=ex)
 
     # check_mode partial support, since it only really works in checking creates/removes
     if module.check_mode:

ansible/modules/copy.py

@@ -522,8 +522,8 @@ def main():
     if os.path.isfile(src):
         try:
             checksum_src = module.sha1(src)
-        except (OSError, IOError) as e:
-            module.warn("Unable to calculate src checksum, assuming change: %s" % to_native(e))
+        except OSError as ex:
+            module.error_as_warning("Unable to calculate src checksum, assuming change.", exception=ex)
         try:
             # Backwards compat only.  This will be None in FIPS mode
             md5sum_src = module.md5(src)
@@ -636,8 +636,8 @@ def main():
                 # at this point we should always have tmp file
                 module.atomic_move(b_mysrc, dest, unsafe_writes=module.params['unsafe_writes'], keep_dest_attrs=not remote_src)
 
-            except (IOError, OSError):
-                module.fail_json(msg=f"Failed to copy {src!r} to {dest!r}.")
+            except OSError as ex:
+                raise Exception(f"Failed to copy {src!r} to {dest!r}.") from ex
         changed = True
 
     # If neither have checksums, both src and dest are directories.

ansible/modules/cron.py

@@ -271,7 +271,7 @@ class CronTab(object):
                 with open(self.b_cron_file, 'rb') as f:
                     self.n_existing = to_native(f.read(), errors='surrogate_or_strict')
                     self.lines = self.n_existing.splitlines()
-            except IOError:
+            except OSError:
                 # cron file does not exist
                 return
             except Exception: