pyinfra 3.2__py2.py3-none-any.whl → 3.3.1__py2.py3-none-any.whl

pyinfra/facts/opkg.py

@@ -12,6 +12,8 @@ Gather the information provided by ``opkg`` on OpenWrt systems:
 import re
 from typing import Dict, NamedTuple, Union
 
+from typing_extensions import override
+
 from pyinfra import logger
 from pyinfra.api import FactBase
 from pyinfra.facts.util.packaging import parse_packages
@@ -83,9 +85,11 @@ class OpkgConf(FactBase):
     def default():
         return OpkgConfInfo({}, "", {}, {})
 
+    @override
     def command(self) -> str:
         return "cat /etc/opkg.conf"
 
+    @override
     def process(self, output):
         dest, lists_dir, options, arch_cfg = {}, "", {}, {}
         for line in output:
@@ -127,9 +131,11 @@ class OpkgFeeds(FactBase):
     )
     default = dict
 
+    @override
     def command(self) -> str:
         return "cat /etc/opkg/distfeeds.conf; echo CUSTOM; cat /etc/opkg/customfeeds.conf"
 
+    @override
     def process(self, output):
         feeds, kind = {}, "distribution"
         for line in output:
@@ -164,9 +170,11 @@ class OpkgInstallableArchitectures(FactBase):
     regex = re.compile(r"^(?:\s*arch\s+(?P<arch>[\w]+)\s+(?P<prio>\d+))?(\s*#.*)?$")
     default = dict
 
+    @override
     def command(self) -> str:
         return "/bin/opkg print-architecture"
 
+    @override
     def process(self, output):
         arch_list = {}
         for line in output:
@@ -195,9 +203,11 @@ class OpkgPackages(FactBase):
     regex = r"^([a-zA-Z0-9][\w\-\.]*)\s-\s([\w\-\.]+)"
     default = dict
 
+    @override
     def command(self) -> str:
         return "/bin/opkg list-installed"
 
+    @override
     def process(self, output):
         return parse_packages(self.regex, sorted(output))
 
@@ -218,9 +228,11 @@ class OpkgUpgradeablePackages(FactBase):
     default = dict
     use_default_on_error = True
 
+    @override
     def command(self) -> str:
         return "/bin/opkg list-upgradable"  # yes, really spelled that way
 
+    @override
     def process(self, output):
         result = {}
         for line in output:

pyinfra/facts/pacman.py

@@ -2,11 +2,13 @@ from __future__ import annotations
 
 import shlex
 
+from typing_extensions import override
+
 from pyinfra.api import FactBase
 
 from .util.packaging import parse_packages
 
-PACMAN_REGEX = r"^([0-9a-zA-Z\-]+)\s([0-9\._+a-z\-]+)"
+PACMAN_REGEX = r"^([0-9a-zA-Z\-_]+)\s([0-9\._+a-z\-:]+)"
 
 
 class PacmanUnpackGroup(FactBase):
@@ -21,15 +23,18 @@ class PacmanUnpackGroup(FactBase):
         ]
     """
 
+    @override
     def requires_command(self, *args, **kwargs) -> str:
         return "pacman"
 
     default = list
 
+    @override
     def command(self, package):
         # Accept failure here (|| true) for invalid/unknown packages
         return 'pacman -S --print-format "%n" {0} || true'.format(shlex.quote(package))
 
+    @override
     def process(self, output):
         return output
 
@@ -45,13 +50,16 @@ class PacmanPackages(FactBase):
         }
     """
 
+    @override
     def command(self) -> str:
         return "pacman -Q"
 
+    @override
     def requires_command(self, *args, **kwargs) -> str:
         return "pacman"
 
     default = dict
 
+    @override
     def process(self, output):
         return parse_packages(PACMAN_REGEX, output)

pyinfra/facts/pip.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing_extensions import override
+
 from pyinfra.api import FactBase
 
 from .util.packaging import parse_packages
@@ -21,13 +23,16 @@ class PipPackages(FactBase):
     default = dict
     pip_command = "pip"
 
+    @override
     def requires_command(self, pip=None):
         return pip or self.pip_command
 
+    @override
     def command(self, pip=None):
         pip = pip or self.pip_command
         return "{0} freeze --all".format(pip)
 
+    @override
     def process(self, output):
         return parse_packages(PIP_REGEX, output)
 

pyinfra/facts/pipx.py

@@ -1,5 +1,7 @@
 import re
 
+from typing_extensions import override
+
 from pyinfra.api import FactBase
 
 from .util.packaging import parse_packages
@@ -35,12 +37,15 @@ class PipxPackages(FactBase):
 
     default = dict
 
+    @override
     def requires_command(self) -> str:
         return "pipx"
 
+    @override
     def command(self) -> str:
         return "pipx list --short"
 
+    @override
     def process(self, output):
         return parse_packages(PIPX_REGEX, output)
 
@@ -64,11 +69,14 @@ class PipxEnvironment(FactBase):
 
     default = dict
 
+    @override
     def requires_command(self) -> str:
         return "pipx"
 
+    @override
     def command(self) -> str:
         return "pipx environment"
 
+    @override
     def process(self, output):
         return parse_environment(output)

pyinfra/facts/pkg.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing_extensions import override
+
 from pyinfra.api import FactBase
 
 from .util.packaging import parse_packages
@@ -19,8 +21,10 @@ class PkgPackages(FactBase):
     regex = r"^([a-zA-Z0-9_\-\+]+)\-([0-9a-z\.]+)"
     default = dict
 
+    @override
     def command(self) -> str:
         return "pkg info || pkg_info || true"
 
+    @override
     def process(self, output):
         return parse_packages(self.regex, output)

pyinfra/facts/pkgin.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing_extensions import override
+
 from pyinfra.api import FactBase
 
 from .util.packaging import parse_packages
@@ -18,13 +20,16 @@ class PkginPackages(FactBase):
         }
     """
 
+    @override
     def command(self) -> str:
         return "pkgin list"
 
+    @override
     def requires_command(self) -> str:
         return "pkgin"
 
     default = dict
 
+    @override
     def process(self, output):
         return parse_packages(PKGIN_REGEX, output)

pyinfra/facts/podman.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import json
 from typing import Any, Dict, Iterable, List, TypeVar
 
+from typing_extensions import override
+
 from pyinfra.api import FactBase
 
 T = TypeVar("T")
@@ -15,6 +17,7 @@ class PodmanFactBase(FactBase[T]):
 
     abstract = True
 
+    @override
     def requires_command(self, *args, **kwargs) -> str:
         return "podman"
 
@@ -24,9 +27,11 @@ class PodmanSystemInfo(PodmanFactBase[Dict[str, Any]]):
     Output of 'podman system info'
     """
 
+    @override
     def command(self) -> str:
         return "podman system info --format=json"
 
+    @override
     def process(self, output: Iterable[str]) -> Dict[str, Any]:
         output = json.loads(("").join(output))
         assert isinstance(output, dict)
@@ -38,9 +43,11 @@ class PodmanPs(PodmanFactBase[List[Dict[str, Any]]]):
     Output of 'podman ps'
     """
 
+    @override
     def command(self) -> str:
         return "podman ps --format=json --all"
 
+    @override
     def process(self, output: Iterable[str]) -> List[Dict[str, Any]]:
         output = json.loads(("").join(output))
         assert isinstance(output, list)

pyinfra/facts/postgres.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing_extensions import override
+
 from pyinfra.api import FactBase, MaskString, QuoteString, StringCommand
 from pyinfra.api.util import try_int
 
@@ -49,9 +51,11 @@ class PostgresFactBase(FactBase):
 
     psql_command: str
 
+    @override
     def requires_command(self, *args, **kwargs):
         return "psql"
 
+    @override
     def command(
         self,
         psql_user=None,
@@ -89,6 +93,7 @@ class PostgresRoles(PostgresFactBase):
     default = dict
     psql_command = "SELECT * FROM pg_catalog.pg_roles"
 
+    @override
     def process(self, output):
         # Remove the last line of the output (row count)
         output = output[:-1]
@@ -139,8 +144,9 @@ class PostgresDatabases(PostgresFactBase):
     """
 
     default = dict
-    psql_command = "SELECT pg_catalog.pg_encoding_to_char(encoding), * FROM pg_catalog.pg_database"
+    psql_command = "SELECT pg_catalog.pg_encoding_to_char(encoding), *, pg_catalog.pg_get_userbyid(datdba) AS owner FROM pg_catalog.pg_database"  # noqa: E501
 
+    @override
     def process(self, output):
         # Remove the last line of the output (row count)
         output = output[:-1]
@@ -155,7 +161,7 @@ class PostgresDatabases(PostgresFactBase):
 
         for details in rows:
             details["encoding"] = details.pop("pg_encoding_to_char")
-
+            details["owner"] = details.pop("owner")
             for key, value in list(details.items()):
                 if key.endswith("id") or key in (
                     "dba",

pyinfra/facts/rpm.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import re
 import shlex
 
+from typing_extensions import override
+
 from pyinfra.api import FactBase
 
 from .util.packaging import parse_packages
@@ -22,14 +24,17 @@ class RpmPackages(FactBase):
         }
     """
 
+    @override
     def command(self) -> str:
         return "rpm --queryformat {0} -qa".format(shlex.quote(rpm_query_format))
 
+    @override
     def requires_command(self) -> str:
         return "rpm"
 
     default = dict
 
+    @override
     def process(self, output):
         return parse_packages(rpm_regex, output)
 
@@ -46,9 +51,11 @@ class RpmPackage(FactBase):
         }
     """
 
+    @override
     def requires_command(self, package) -> str:
         return "rpm"
 
+    @override
     def command(self, package) -> str:
         return (
             "rpm --queryformat {0} -q {1} || "
@@ -56,6 +63,7 @@ class RpmPackage(FactBase):
             "rpm --queryformat {0} -qp {1} 2> /dev/null"
         ).format(shlex.quote(rpm_query_format), shlex.quote(package))
 
+    @override
     def process(self, output):
         for line in output:
             matches = re.match(rpm_regex, line)
@@ -73,9 +81,11 @@ class RpmPackageProvides(FactBase):
 
     default = list
 
+    @override
     def requires_command(self, *args, **kwargs) -> str:
         return "repoquery"
 
+    @override
     def command(self, package):
         # Accept failure here (|| true) for invalid/unknown packages
         return "repoquery --queryformat {0} --whatprovides {1} || true".format(
@@ -83,6 +93,7 @@ class RpmPackageProvides(FactBase):
             shlex.quote(package),
         )
 
+    @override
     def process(self, output):
         packages = []
 

pyinfra/facts/runit.py

@@ -1,3 +1,5 @@
+from typing_extensions import override
+
 from pyinfra.api import FactBase
 
 
@@ -20,9 +22,11 @@ class RunitStatus(FactBase):
 
     default = dict
 
+    @override
     def requires_command(self, *args, **kwargs) -> str:
         return "sv"
 
+    @override
     def command(self, service=None, svdir="/var/service") -> str:
         if service is None:
             return (
@@ -32,6 +36,7 @@ class RunitStatus(FactBase):
         else:
             return 'SVDIR="{0}" sv status "{1}"'.format(svdir, service)
 
+    @override
     def process(self, output):
         services = {}
         for line in output:
@@ -60,11 +65,13 @@ class RunitManaged(FactBase):
 
     default = set
 
+    @override
     def command(self, service=None, svdir="/var/service"):
         if service is None:
             return 'cd "{0}" && find -mindepth 1 -maxdepth 1 -type l -printf "%f\n"'.format(svdir)
         else:
             return 'cd "{0}" && test -h "{1}" && echo "{1}" || true'.format(svdir, service)
 
+    @override
     def process(self, output):
         return set(output)

pyinfra/facts/selinux.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import re
 from collections import defaultdict
 
+from typing_extensions import override
+
 from pyinfra.api import FactBase
 
 FIELDS = ["user", "role", "type", "level"]  # order is significant, do not change
@@ -14,14 +16,17 @@ class SEBoolean(FactBase):
     If ``boolean`` does not exist, ``SEBoolean`` returns the empty string.
     """
 
+    @override
     def requires_command(self, boolean) -> str:
         return "getsebool"
 
     default = str
 
+    @override
     def command(self, boolean):
         return "getsebool {0}".format(boolean)
 
+    @override
     def process(self, output):
         components = output[0].split(" --> ")
         return components[1]
@@ -42,9 +47,11 @@ class FileContext(FactBase):
         }
     """
 
+    @override
     def command(self, path):
         return "stat -c %C {0} || exit 0".format(path)
 
+    @override
     def process(self, output):
         context = {}
         components = output[0].split(":")
@@ -65,12 +72,15 @@ class FileContextMapping(FactBase):
 
     default = dict
 
+    @override
     def requires_command(self, target) -> str:
         return "semanage"
 
+    @override
     def command(self, target):
         return "set -o pipefail && semanage fcontext -n -l | (grep '^{0}' || true)".format(target)
 
+    @override
     def process(self, output):
         # example output: /etc       all files          system_u:object_r:etc_t:s0 # noqa: SC100
         # but lines at end that won't match: /etc/systemd/system = /usr/lib/systemd/system
@@ -97,12 +107,15 @@ class SEPorts(FactBase):
     # example output: amqp_port_t                    tcp      15672, 5671-5672  # noqa: SC100
     _regex = re.compile(r"^([\w_]+)\s+(\w+)\s+([\w\-,\s]+)$")
 
+    @override
     def requires_command(self) -> str:
         return "semanage"
 
+    @override
     def command(self):
         return "semanage port -ln"
 
+    @override
     def process(self, output):
         labels: dict[str, dict] = defaultdict(dict)
         for line in output:
@@ -132,12 +145,15 @@ class SEPort(FactBase):
 
     default = str
 
+    @override
     def requires_command(self, protocol, port) -> str:
         return "sepolicy"
 
+    @override
     def command(self, protocol, port):
         return "(sepolicy network -p {0} 2>/dev/null || true) | grep {1}".format(port, protocol)
 
+    @override
     def process(self, output):
         # if type set, first line is specific and second is generic type for port range
         # each rows in the format "22: tcp ssh_port_t 22"