ansible-core 2.18.7rc1__py3-none-any.whl → 2.19.0__py3-none-any.whl

ansible/module_utils/facts/system/distribution.py

@@ -8,8 +8,7 @@ from __future__ import annotations
 import os
 import platform
 import re
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.common.sys_info import get_distribution, get_distribution_version, \
     get_distribution_codename
@@ -46,7 +45,7 @@ def _file_exists(path, allow_empty=False):
 
 
 class DistributionFiles:
-    '''has-a various distro file parsers (os-release, etc) and logic for finding the right one.'''
+    """has-a various distro file parsers (os-release, etc) and logic for finding the right one."""
     # every distribution name mentioned here, must have one of
     #  - allowempty == True
     #  - be listed in SEARCH_STRING
@@ -101,7 +100,7 @@ class DistributionFiles:
         return get_file_content(path)
 
     def _get_dist_file_content(self, path, allow_empty=False):
-        # cant find that dist file or it is incorrectly empty
+        # can't find that dist file, or it is incorrectly empty
         if not _file_exists(path, allow_empty=allow_empty):
             return False, None
 
@@ -208,7 +207,7 @@ class DistributionFiles:
 
         return dist_file_facts
 
-    # TODO: FIXME: split distro file parsing into its own module or class
+    # FIXME: split distro file parsing into its own module or class
     def parse_distribution_file_Slackware(self, name, data, path, collected_facts):
         slackware_facts = {}
         if 'Slackware' not in data:
@@ -311,15 +310,28 @@ 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
 
     def parse_distribution_file_Debian(self, name, data, path, collected_facts):
         debian_facts = {}
-        if 'Debian' in data or 'Raspbian' in data:
+        if any(distro in data for distro in ('Debian', 'Raspbian')):
             debian_facts['distribution'] = 'Debian'
             release = re.search(r"PRETTY_NAME=[^(]+ \(?([^)]+?)\)", data)
             if release:
@@ -398,6 +410,8 @@ class DistributionFiles:
             if version:
                 debian_facts['distribution_version'] = version.group(1)
                 debian_facts['distribution_major_version'] = version.group(1).split('.')[0]
+        elif 'LMDE' in data:
+            debian_facts['distribution'] = 'Linux Mint Debian Edition'
         else:
             return False, debian_facts
 
@@ -515,9 +529,10 @@ class Distribution(object):
                                 'EuroLinux', 'Kylin Linux Advanced Server', 'MIRACLE'],
                      'Debian': ['Debian', 'Ubuntu', 'Raspbian', 'Neon', 'KDE neon',
                                 'Linux Mint', 'SteamOS', 'Devuan', 'Kali', 'Cumulus Linux',
-                                'Pop!_OS', 'Parrot', 'Pardus GNU/Linux', 'Uos', 'Deepin', 'OSMC'],
+                                'Pop!_OS', 'Parrot', 'Pardus GNU/Linux', 'Uos', 'Deepin', 'OSMC', 'Linux Mint Debian Edition'],
                      'Suse': ['SuSE', 'SLES', 'SLED', 'openSUSE', 'openSUSE Tumbleweed',
-                              'SLES_SAP', 'SUSE_LINUX', 'openSUSE Leap', 'ALP-Dolomite', 'SL-Micro'],
+                              'SLES_SAP', 'SUSE_LINUX', 'openSUSE Leap', 'ALP-Dolomite', 'SL-Micro',
+                              'openSUSE MicroOS'],
                      'Archlinux': ['Archlinux', 'Antergos', 'Manjaro'],
                      'Mandrake': ['Mandrake', 'Mandriva'],
                      'Solaris': ['Solaris', 'Nexenta', 'OmniOS', 'OpenIndiana', 'SmartOS'],
@@ -570,8 +585,7 @@ class Distribution(object):
             distribution_facts.update(dist_file_facts)
 
         distro = distribution_facts['distribution']
-
-        # look for a os family alias for the 'distribution', if there isnt one, use 'distribution'
+        # look for an os family alias for the 'distribution', if there isn't one, use 'distribution'
         distribution_facts['os_family'] = self.OS_FAMILY.get(distro, None) or distro
 
         return distribution_facts

ansible/module_utils/facts/system/dns.py

@@ -15,7 +15,7 @@
 
 from __future__ import annotations
 
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.utils import get_file_content
 

ansible/module_utils/facts/system/env.py

@@ -16,8 +16,7 @@
 from __future__ import annotations
 
 import os
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.six import iteritems
 

ansible/module_utils/facts/system/fips.py

@@ -1,23 +1,10 @@
+# Copyright: Contributors to the Ansible project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 # Determine if a system is in 'fips' mode
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import annotations
 
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.utils import get_file_content
 
@@ -30,9 +17,9 @@ class FipsFactCollector(BaseFactCollector):
 
     def collect(self, module=None, collected_facts=None):
         # NOTE: this is populated even if it is not set
-        fips_facts = {}
-        fips_facts['fips'] = False
-        data = get_file_content('/proc/sys/crypto/fips_enabled')
-        if data and data == '1':
+        fips_facts = {
+            'fips': False
+        }
+        if get_file_content('/proc/sys/crypto/fips_enabled') == '1':
             fips_facts['fips'] = True
         return fips_facts

ansible/module_utils/facts/system/loadavg.py

@@ -4,8 +4,7 @@
 from __future__ import annotations
 
 import os
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.collector import BaseFactCollector
 

ansible/module_utils/facts/system/local.py

@@ -7,8 +7,7 @@ import glob
 import json
 import os
 import stat
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.common.text.converters import to_text
 from ansible.module_utils.facts.utils import get_file_content
@@ -51,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/system/lsb.py

@@ -18,8 +18,7 @@
 from __future__ import annotations
 
 import os
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.utils import get_file_lines
 from ansible.module_utils.facts.collector import BaseFactCollector

ansible/module_utils/facts/system/pkg_mgr.py

@@ -6,8 +6,7 @@ from __future__ import annotations
 
 import os
 import subprocess
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.collector import BaseFactCollector
 

ansible/module_utils/facts/system/platform.py

@@ -18,8 +18,7 @@ from __future__ import annotations
 import re
 import socket
 import platform
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.utils import get_file_content
 

ansible/module_utils/facts/system/python.py

@@ -16,8 +16,7 @@
 from __future__ import annotations
 
 import sys
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.collector import BaseFactCollector
 

ansible/module_utils/facts/system/selinux.py

@@ -17,7 +17,7 @@
 
 from __future__ import annotations
 
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.collector import BaseFactCollector
 

ansible/module_utils/facts/system/service_mgr.py

@@ -20,8 +20,7 @@ from __future__ import annotations
 import os
 import platform
 import re
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.common.text.converters import to_native
 

ansible/module_utils/facts/system/ssh_pub_keys.py

@@ -15,7 +15,7 @@
 
 from __future__ import annotations
 
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.utils import get_file_content
 

ansible/module_utils/facts/system/systemd.py

@@ -17,7 +17,7 @@
 
 from __future__ import annotations
 
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.collector import BaseFactCollector
 from ansible.module_utils.facts.system.service_mgr import ServiceMgrFactCollector

ansible/module_utils/facts/system/user.py

@@ -18,8 +18,7 @@ from __future__ import annotations
 import getpass
 import os
 import pwd
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.collector import BaseFactCollector
 

ansible/module_utils/facts/utils.py

@@ -20,7 +20,7 @@ import os
 
 
 def get_file_content(path, default=None, strip=True):
-    '''
+    """
         Return the contents of a given file path
 
         :args path: path to file to return contents from
@@ -28,7 +28,7 @@ def get_file_content(path, default=None, strip=True):
         :args strip: controls if we strip whitespace from the result or not
 
         :returns: String with file contents (optionally stripped) or 'default' value
-    '''
+    """
     data = default
     if os.path.exists(path) and os.access(path, os.R_OK):
         datafile = None
@@ -62,7 +62,7 @@ def get_file_content(path, default=None, strip=True):
 
 
 def get_file_lines(path, strip=True, line_sep=None):
-    '''get list of lines from file'''
+    """get list of lines from file"""
     data = get_file_content(path, strip=strip)
     if data:
         if line_sep is None:

ansible/module_utils/facts/virtual/base.py

@@ -18,7 +18,7 @@
 
 from __future__ import annotations
 
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.collector import BaseFactCollector
 

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:
@@ -151,7 +151,7 @@ class LinuxVirtual(Virtual):
         sys_vendor = get_file_content('/sys/devices/virtual/dmi/id/sys_vendor')
         product_family = get_file_content('/sys/devices/virtual/dmi/id/product_family')
 
-        if product_name in ('KVM', 'KVM Server', 'Bochs', 'AHV'):
+        if product_name in ('KVM', 'KVM Server', 'Bochs', 'AHV', 'CloudStack KVM Hypervisor'):
             guest_tech.add('kvm')
             if not found_virt:
                 virtual_facts['virtualization_type'] = 'kvm'
@@ -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/facts/virtual/sunos.py

@@ -1,17 +1,5 @@
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright: Contributors to the Ansible project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import annotations
 
@@ -77,7 +65,7 @@ class SunOSVirtual(Virtual):
         if virtinfo:
             # The output of virtinfo is different whether we are on a machine with logical
             # domains ('LDoms') on a T-series or domains ('Domains') on a M-series. Try LDoms first.
-            rc, out, err = self.module.run_command("/usr/sbin/virtinfo -p")
+            rc, out, err = self.module.run_command([virtinfo, '-p'])
             # The output contains multiple lines with different keys like this:
             #   DOMAINROLE|impl=LDoms|control=false|io=false|service=false|root=false
             # The output may also be not formatted and the returncode is set to 0 regardless of the error condition:

ansible/module_utils/facts/virtual/sysctl.py

@@ -1,24 +1,11 @@
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-
+# Copyright: Contributors to the Ansible project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 from __future__ import annotations
 
 import re
 
 
-class VirtualSysctlDetectionMixin(object):
+class VirtualSysctlDetectionMixin:
     def detect_sysctl(self):
         self.sysctl_path = self.module.get_bin_path('sysctl')
 

ansible/module_utils/json_utils.py

@@ -32,13 +32,13 @@ import json  # pylint: disable=unused-import
 # NB: a copy of this function exists in ../../modules/core/async_wrapper.py. Ensure any
 # changes are propagated there.
 def _filter_non_json_lines(data, objects_only=False):
-    '''
+    """
     Used to filter unrelated output around module JSON output, like messages from
     tcagetattr, or where dropbear spews MOTD on every single command (which is nuts).
 
     Filters leading lines before first line-starting occurrence of '{' or '[', and filter all
     trailing lines after matching close character (working from the bottom of output).
-    '''
+    """
     warnings = []
 
     # Filter initial junk

ansible/module_utils/parsing/convert_bool.py

@@ -3,6 +3,8 @@
 
 from __future__ import annotations
 
+import collections.abc as c
+
 from ansible.module_utils.six import binary_type, text_type
 from ansible.module_utils.common.text.converters import to_text
 
@@ -17,12 +19,16 @@ def boolean(value, strict=True):
         return value
 
     normalized_value = value
+
     if isinstance(value, (text_type, binary_type)):
         normalized_value = to_text(value, errors='surrogate_or_strict').lower().strip()
 
+    if not isinstance(value, c.Hashable):
+        normalized_value = None  # prevent unhashable types from bombing, but keep the rest of the existing fallback/error behavior
+
     if normalized_value in BOOLEANS_TRUE:
         return True
     elif normalized_value in BOOLEANS_FALSE or not strict:
         return False
 
-    raise TypeError("The value '%s' is not a valid boolean.  Valid booleans include: %s" % (to_text(value), ', '.join(repr(i) for i in BOOLEANS)))
+    raise TypeError("The value '%s' is not a valid boolean. Valid booleans include: %s" % (to_text(value), ', '.join(repr(i) for i in BOOLEANS)))

ansible/module_utils/powershell/Ansible.ModuleUtils.AddType.psm1

@@ -5,7 +5,7 @@ Function Add-CSharpType {
     <#
     .SYNOPSIS
     Compiles one or more C# scripts similar to Add-Type. This exposes
-    more configuration options that are useable within Ansible and it
+    more configuration options that are usable within Ansible and it
     also allows multiple C# sources to be compiled together.
 
     .PARAMETER References

ansible/module_utils/powershell/Ansible.ModuleUtils.CamelConversion.psm1

@@ -21,7 +21,7 @@ Function Convert-StringToSnakeCase($string) {
     return $string
 }
 
-# used by Convert-DictToSnakeCase to covert list entries from camelCase
+# used by Convert-DictToSnakeCase to convert list entries from camelCase
 # to snake_case
 Function Convert-ListToSnakeCase($list) {
     $snake_list = [System.Collections.ArrayList]@()

ansible/module_utils/powershell/Ansible.ModuleUtils.CommandUtil.psm1

@@ -6,7 +6,7 @@
 Function Get-ExecutablePath {
     <#
     .SYNOPSIS
-    Get's the full path to an executable, will search the directory specified or ones in the PATH env var.
+    Gets the full path to an executable, will search the directory specified or ones in the PATH env var.
 
     .PARAMETER executable
     [String]The executable to search for.

ansible/module_utils/powershell/Ansible.ModuleUtils.WebRequest.psm1

@@ -17,7 +17,7 @@ Function Get-AnsibleWebRequest {
     The protocol method to use, if omitted, will use the default value for the URI protocol specified.
 
     .PARAMETER FollowRedirects
-    Whether to follow redirect reponses. This is only valid when using a HTTP URI.
+    Whether to follow redirect responses. This is only valid when using a HTTP URI.
         all - Will follow all redirects
         none - Will follow no redirects
         safe - Will only follow redirects when GET or HEAD is used as the Method