ansible-core 2.18.5rc1__py3-none-any.whl → 2.19.0b2__py3-none-any.whl

ansible/module_utils/facts/collector.py

@@ -31,20 +31,19 @@ from __future__ import annotations
 from collections import defaultdict
 
 import platform
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts import timeout
 
 
 class CycleFoundInFactDeps(Exception):
-    '''Indicates there is a cycle in fact collector deps
+    """Indicates there is a cycle in fact collector deps
 
     If collector-B requires collector-A, and collector-A requires
     collector-B, that is a cycle. In that case, there is no ordering
     that will satisfy B before A and A and before B. That will cause this
     error to be raised.
-    '''
+    """
     pass
 
 
@@ -64,9 +63,9 @@ class BaseFactCollector:
     required_facts = set()  # type: t.Set[str]
 
     def __init__(self, collectors=None, namespace=None):
-        '''Base class for things that collect facts.
+        """Base class for things that collect facts.
 
-        'collectors' is an optional list of other FactCollectors for composing.'''
+        'collectors' is an optional list of other FactCollectors for composing."""
         self.collectors = collectors or []
 
         # self.namespace is a object with a 'transform' method that transforms
@@ -88,7 +87,7 @@ class BaseFactCollector:
         return key_name
 
     def _transform_dict_keys(self, fact_dict):
-        '''update a dicts keys to use new names as transformed by self._transform_name'''
+        """update a dicts keys to use new names as transformed by self._transform_name"""
 
         if fact_dict is None:
             return {}
@@ -107,7 +106,7 @@ class BaseFactCollector:
         return facts_dict
 
     def collect(self, module=None, collected_facts=None):
-        '''do the fact collection
+        """do the fact collection
 
         'collected_facts' is a object (a dict, likely) that holds all previously
           facts. This is intended to be used if a FactCollector needs to reference
@@ -115,7 +114,7 @@ class BaseFactCollector:
 
           Returns a dict of facts.
 
-          '''
+          """
         facts_dict = {}
         return facts_dict
 
@@ -125,12 +124,12 @@ def get_collector_names(valid_subsets=None,
                         gather_subset=None,
                         aliases_map=None,
                         platform_info=None):
-    '''return a set of FactCollector names based on gather_subset spec.
+    """return a set of FactCollector names based on gather_subset spec.
 
     gather_subset is a spec describing which facts to gather.
     valid_subsets is a frozenset of potential matches for gather_subset ('all', 'network') etc
     minimal_gather_subsets is a frozenset of matches to always use, even for gather_subset='!all'
-    '''
+    """
 
     # Retrieve module parameters
     gather_subset = gather_subset or ['all']
@@ -267,11 +266,11 @@ def _get_requires_by_collector_name(collector_name, all_fact_subsets):
 
 
 def find_unresolved_requires(collector_names, all_fact_subsets):
-    '''Find any collector names that have unresolved requires
+    """Find any collector names that have unresolved requires
 
     Returns a list of collector names that correspond to collector
     classes whose .requires_facts() are not in collector_names.
-    '''
+    """
     unresolved = set()
 
     for collector_name in collector_names:
@@ -351,7 +350,7 @@ def collector_classes_from_gather_subset(all_collector_classes=None,
                                          gather_subset=None,
                                          gather_timeout=None,
                                          platform_info=None):
-    '''return a list of collector classes that match the args'''
+    """return a list of collector classes that match the args"""
 
     # use gather_name etc to get the list of collectors
 

ansible/module_utils/facts/compat.py

@@ -34,19 +34,19 @@ from ansible.module_utils.facts import ansible_collector
 
 
 def get_all_facts(module):
-    '''compat api for ansible 2.2/2.3 module_utils.facts.get_all_facts method
+    """compat api for ansible 2.2/2.3 module_utils.facts.get_all_facts method
 
     Expects module to be an instance of AnsibleModule, with a 'gather_subset' param.
 
     returns a dict mapping the bare fact name ('default_ipv4' with no 'ansible_' namespace) to
-    the fact value.'''
+    the fact value."""
 
     gather_subset = module.params['gather_subset']
     return ansible_facts(module, gather_subset=gather_subset)
 
 
 def ansible_facts(module, gather_subset=None):
-    '''Compat api for ansible 2.0/2.2/2.3 module_utils.facts.ansible_facts method
+    """Compat api for ansible 2.0/2.2/2.3 module_utils.facts.ansible_facts method
 
     2.3/2.3 expects a gather_subset arg.
     2.0/2.1 does not except a gather_subset arg
@@ -57,7 +57,7 @@ def ansible_facts(module, gather_subset=None):
 
     returns a dict mapping the bare fact name ('default_ipv4' with no 'ansible_' namespace) to
     the fact value.
-    '''
+    """
 
     gather_subset = gather_subset or module.params.get('gather_subset', ['all'])
     gather_timeout = module.params.get('gather_timeout', 10)

ansible/module_utils/facts/default_collectors.py

@@ -27,7 +27,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/hardware/aix.py

@@ -45,6 +45,7 @@ class AIXHardware(Hardware):
         vgs_facts = self.get_vgs_facts()
         mount_facts = self.get_mount_facts()
         devices_facts = self.get_device_facts()
+        uptime_facts = self.get_uptime_facts()
 
         hardware_facts.update(cpu_facts)
         hardware_facts.update(memory_facts)
@@ -52,6 +53,7 @@ class AIXHardware(Hardware):
         hardware_facts.update(vgs_facts)
         hardware_facts.update(mount_facts)
         hardware_facts.update(devices_facts)
+        hardware_facts.update(uptime_facts)
 
         return hardware_facts
 
@@ -123,6 +125,38 @@ class AIXHardware(Hardware):
 
         return memory_facts
 
+    def get_uptime_facts(self):
+        uptime_facts = {}
+        # On AIX, there are no options to get the uptime directly in seconds.
+        # Your options are to parse the output of "who", "uptime", or "ps".
+        # Only "ps" always provides a field with seconds.
+        ps_bin = self.module.get_bin_path("ps")
+        if ps_bin is None:
+            return uptime_facts
+
+        ps_cmd = [ps_bin, "-p", "1", "-o", "etime="]
+
+        rc, out, err = self.module.run_command(ps_cmd)
+        if rc != 0:
+            return uptime_facts
+
+        # Parse out
+        if out:
+            lines = out.splitlines()
+            data = lines[0].replace(':', '-').split('-')
+            try:
+                days = int(data[0])
+                hours = int(data[1])
+                minutes = int(data[2])
+                seconds = int(data[3])
+            except (IndexError, ValueError):
+                return uptime_facts
+            # Calculate uptime in seconds
+            uptime_seconds = (days * 86400) + (hours * 3600) + (minutes * 60) + seconds
+            uptime_facts['uptime_seconds'] = int(uptime_seconds)
+
+        return uptime_facts
+
     def get_dmi_facts(self):
         dmi_facts = {}
 

ansible/module_utils/facts/hardware/base.py

@@ -28,7 +28,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/hardware/darwin.py

@@ -93,9 +93,7 @@ class DarwinHardware(Hardware):
         }
 
         total_used = 0
-        page_size = 4096
-        if 'hw.pagesize' in self.sysctl:
-            page_size = int(self.sysctl['hw.pagesize'])
+        page_size = int(self.sysctl.get('hw.pagesize', 4096))
 
         vm_stat_command = self.module.get_bin_path('vm_stat')
         if vm_stat_command is None:

ansible/module_utils/facts/hardware/freebsd.py

@@ -224,9 +224,9 @@ class FreeBSDHardware(Hardware):
         return device_facts
 
     def get_dmi_facts(self):
-        ''' learn dmi facts from system
+        """ learn dmi facts from system
 
-        Use dmidecode executable if available'''
+        Use dmidecode executable if available"""
 
         dmi_facts = {}
 

ansible/module_utils/facts/hardware/linux.py

@@ -311,10 +311,10 @@ class LinuxHardware(Hardware):
         return cpu_facts
 
     def get_dmi_facts(self):
-        ''' learn dmi facts from system
+        """ learn dmi facts from system
 
         Try /sys first for dmi related facts.
-        If that is not available, fall back to dmidecode executable '''
+        If that is not available, fall back to dmidecode executable """
 
         dmi_facts = {}
 
@@ -423,13 +423,13 @@ class LinuxHardware(Hardware):
             'NA'
         )
         sysinfo_re = re.compile(
-            r'''
+            r"""
                 ^
                     (?:Manufacturer:\s+(?P<system_vendor>.+))|
                     (?:Type:\s+(?P<product_name>.+))|
                     (?:Sequence\ Code:\s+0+(?P<product_serial>.+))
                 $
-            ''',
+            """,
             re.VERBOSE | re.MULTILINE
         )
         data = get_file_content('/proc/sysinfo')

ansible/module_utils/facts/namespace.py

@@ -33,7 +33,7 @@ class FactNamespace:
         self.namespace_name = namespace_name
 
     def transform(self, name):
-        '''Take a text name, and transforms it as needed (add a namespace prefix, etc)'''
+        """Take a text name, and transforms it as needed (add a namespace prefix, etc)"""
         return name
 
     def _underscore(self, name):

ansible/module_utils/facts/network/base.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.collector import BaseFactCollector
 

ansible/module_utils/facts/network/fc_wwn.py

@@ -19,8 +19,7 @@ from __future__ import annotations
 
 import sys
 import glob
-
-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/network/iscsi.py

@@ -18,8 +18,7 @@
 from __future__ import annotations
 
 import sys
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.utils import get_file_content
 from ansible.module_utils.facts.network.base import NetworkCollector

ansible/module_utils/facts/network/nvme.py

@@ -18,8 +18,7 @@
 from __future__ import annotations
 
 import sys
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.utils import get_file_content
 from ansible.module_utils.facts.network.base import NetworkCollector

ansible/module_utils/facts/other/facter.py

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

ansible/module_utils/facts/other/ohai.py

@@ -16,8 +16,7 @@
 from __future__ import annotations
 
 import json
-
-import ansible.module_utils.compat.typing as t
+import typing as t
 
 from ansible.module_utils.facts.namespace import PrefixFactNamespace
 
@@ -25,7 +24,7 @@ from ansible.module_utils.facts.collector import BaseFactCollector
 
 
 class OhaiFactCollector(BaseFactCollector):
-    '''This is a subclass of Facts for including information gathered from Ohai.'''
+    """This is a subclass of Facts for including information gathered from Ohai."""
     name = 'ohai'
     _fact_ids = set()  # type: t.Set[str]
 

ansible/module_utils/facts/system/apparmor.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.collector import BaseFactCollector
 

ansible/module_utils/facts/system/caps.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/chroot.py

@@ -3,8 +3,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/cmdline.py

@@ -16,8 +16,7 @@
 from __future__ import annotations
 
 import shlex
-
-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/date_time.py

@@ -19,10 +19,9 @@ from __future__ import annotations
 
 import datetime
 import time
+import typing as t
 
-import ansible.module_utils.compat.typing as t
 from ansible.module_utils.facts.collector import BaseFactCollector
-from ansible.module_utils.compat.datetime import utcfromtimestamp
 
 
 class DateTimeFactCollector(BaseFactCollector):
@@ -36,7 +35,10 @@ class DateTimeFactCollector(BaseFactCollector):
         # Store the timestamp once, then get local and UTC versions from that
         epoch_ts = time.time()
         now = datetime.datetime.fromtimestamp(epoch_ts)
-        utcnow = utcfromtimestamp(epoch_ts).replace(tzinfo=None)
+        utcnow = datetime.datetime.fromtimestamp(
+            epoch_ts,
+            tz=datetime.timezone.utc,
+        )
 
         date_time_facts['year'] = now.strftime('%Y')
         date_time_facts['month'] = now.strftime('%m')

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
@@ -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:
@@ -319,7 +318,7 @@ class DistributionFiles:
 
     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 +397,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 +516,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,7 +572,6 @@ 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'
         distribution_facts['os_family'] = self.OS_FAMILY.get(distro, None) or distro
 

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

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