qontract-reconcile 0.10.1rc879__py3-none-any.whl → 0.10.1rc894__py3-none-any.whl

reconcile/utils/jjb_client.py

@@ -14,10 +14,7 @@ from subprocess import (
     STDOUT,
     CalledProcessError,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 import yaml
 from jenkins_jobs.builder import JenkinsManager
@@ -63,7 +60,7 @@ class JJB:  # pylint: disable=too-many-public-methods
                 ini = self.secret_reader.read(token)
                 ini = ini.replace('"', "")
                 ini = ini.replace("false", "False")
-            ini_file_path = "{}/{}.ini".format(wd, name)
+            ini_file_path = f"{wd}/{name}.ini"
             with open(ini_file_path, "w", encoding="locale") as f:
                 f.write(ini)
                 f.write("\n")
@@ -75,7 +72,7 @@ class JJB:  # pylint: disable=too-many-public-methods
         for c in configs:
             instance_name = c["instance"]["name"]
             config = c["config"]
-            config_file_path = "{}/config.yaml".format(working_dirs[instance_name])
+            config_file_path = f"{working_dirs[instance_name]}/config.yaml"
             if config:
                 content = yaml.load(config, Loader=yaml.FullLoader)
                 if c["type"] == "jobs":
@@ -99,7 +96,7 @@ class JJB:  # pylint: disable=too-many-public-methods
         config files in the working directories with
         the supplied configs"""
         for name, wd in self.working_dirs.items():
-            config_path = "{}/config.yaml".format(wd)
+            config_path = f"{wd}/config.yaml"
             with open(config_path, "w", encoding="locale") as f:
                 f.write(configs[name])
 
@@ -135,8 +132,8 @@ class JJB:  # pylint: disable=too-many-public-methods
         working directories"""
         configs = {}
         for name, wd in self.working_dirs.items():
-            config_path = "{}/config.yaml".format(wd)
-            with open(config_path, "r", encoding="locale") as f:
+            config_path = f"{wd}/config.yaml"
+            with open(config_path, encoding="locale") as f:
                 configs[name] = f.read()
 
         return configs
@@ -149,8 +146,8 @@ class JJB:  # pylint: disable=too-many-public-methods
         :param fetch_state: subdirectory to use ('desired' or 'current')
         """
         for name, wd in self.working_dirs.items():
-            ini_path = "{}/{}.ini".format(wd, name)
-            config_path = "{}/config.yaml".format(wd)
+            ini_path = f"{wd}/{name}.ini"
+            config_path = f"{wd}/config.yaml"
 
             output_dir = path.join(io_dir, "jjb", fetch_state, name)
             args = [
@@ -227,8 +224,8 @@ class JJB:  # pylint: disable=too-many-public-methods
 
     def update(self) -> None:
         for name, wd in self.working_dirs.items():
-            ini_path = "{}/{}.ini".format(wd, name)
-            config_path = "{}/config.yaml".format(wd)
+            ini_path = f"{wd}/{name}.ini"
+            config_path = f"{wd}/config.yaml"
 
             os.environ["PYTHONHTTPSVERIFY"] = self.python_https_verify
             cmd = ["jenkins-jobs", "--conf", ini_path, "update", config_path]
@@ -268,8 +265,8 @@ class JJB:  # pylint: disable=too-many-public-methods
 
     @retry(exceptions=(JenkinsJobsException))
     def get_jobs(self, wd, name):
-        ini_path = "{}/{}.ini".format(wd, name)
-        config_path = "{}/config.yaml".format(wd)
+        ini_path = f"{wd}/{name}.ini"
+        config_path = f"{wd}/config.yaml"
 
         args = ["--conf", ini_path, "test", config_path]
         jjb = self.get_jjb(args)
@@ -321,7 +318,7 @@ class JJB:  # pylint: disable=too-many-public-methods
                 try:
                     repos.add(self.get_repo_url(job))
                 except KeyError:
-                    logging.debug("missing github url: {}".format(job_name))
+                    logging.debug(f"missing github url: {job_name}")
         return repos
 
     def get_admins(self):
@@ -393,7 +390,7 @@ class JJB:  # pylint: disable=too-many-public-methods
         raise ValueError(f"job with {job_type=} and {repo_url=} not found")
 
     @staticmethod
-    def get_trigger_phrases_regex(job: dict) -> Optional[str]:
+    def get_trigger_phrases_regex(job: dict) -> str | None:
         for trigger in job["triggers"]:
             if "gitlab" in trigger:
                 return trigger["gitlab"].get("note-regex")

reconcile/utils/jobcontroller/controller.py

@@ -1,6 +1,6 @@
 import logging
 import time
-from typing import Optional, Protocol, TextIO
+from typing import Protocol, TextIO
 
 from kubernetes.client import (  # type: ignore[attr-defined]
     ApiClient,
@@ -85,7 +85,7 @@ class K8sJobController:
         self.oc = oc
         self.dry_run = dry_run
         self.time_module = time_module
-        self._cache: Optional[dict[str, OpenshiftResource]] = None
+        self._cache: dict[str, OpenshiftResource] | None = None
 
     @property
     def cache(self) -> dict[str, OpenshiftResource]:
@@ -111,7 +111,7 @@ class K8sJobController:
         self._cache = new_cache
         return self._cache
 
-    def get_job_generation(self, job_name: str) -> Optional[str]:
+    def get_job_generation(self, job_name: str) -> str | None:
         """
         Returns the generation annotation for a job.
         """
@@ -248,7 +248,7 @@ class K8sJobController:
             return True
         return False
 
-    def _lookup_job_uid(self, job_name: str) -> Optional[str]:
+    def _lookup_job_uid(self, job_name: str) -> str | None:
         job_resource = self.oc.get(
             self.namespace, "Job", job_name, allow_not_found=True
         )
@@ -256,7 +256,7 @@ class K8sJobController:
             return None
         return job_resource.get("metadata", {}).get("uid")
 
-    def build_secret(self, job: K8sJob) -> Optional[V1Secret]:
+    def build_secret(self, job: K8sJob) -> V1Secret | None:
         secret_data = job.secret_data()
         script_data = job.scripts()
         # fail if both dicts have overlapping keys

reconcile/utils/jobcontroller/models.py

@@ -1,7 +1,7 @@
 import hashlib
 import inspect
 from abc import ABC, abstractmethod
-from enum import Enum, IntFlag
+from enum import IntFlag, StrEnum
 from typing import Any
 
 from deepdiff import DeepHash
@@ -19,7 +19,7 @@ from kubernetes.client import (
 )
 
 
-class JobStatus(str, Enum):
+class JobStatus(StrEnum):
     SUCCESS: str = "SUCCESS"
     ERROR: str = "ERROR"
     IN_PROGRESS: str = "IN_PROGRESS"

reconcile/utils/jsonpath.py

@@ -4,7 +4,6 @@ from functools import (
     reduce,
 )
 from itertools import zip_longest
-from typing import Optional
 
 import jsonpath_ng
 import jsonpath_ng.ext.filter
@@ -54,11 +53,11 @@ def narrow_jsonpath_node(
         if path_2.fields == ("*",):
             return path_1
     elif isinstance(path_1, jsonpath_ng.Index) and isinstance(
-        path_2, (jsonpath_ng.Slice, jsonpath_ng.ext.filter.Filter)
+        path_2, jsonpath_ng.Slice | jsonpath_ng.ext.filter.Filter
     ):
         return path_1
     elif isinstance(
-        path_1, (jsonpath_ng.Slice, jsonpath_ng.ext.filter.Filter)
+        path_1, jsonpath_ng.Slice | jsonpath_ng.ext.filter.Filter
     ) and isinstance(path_2, jsonpath_ng.Index):
         return path_2
     elif isinstance(path_1, jsonpath_ng.ext.filter.Filter) and isinstance(
@@ -119,7 +118,7 @@ def apply_constraint_to_path(
     path: jsonpath_ng.JSONPath,
     path_constraint: jsonpath_ng.JSONPath,
     min_common_prefix_length: int = 1,
-) -> Optional[jsonpath_ng.JSONPath]:
+) -> jsonpath_ng.JSONPath | None:
     """
     Narrow the `path` with a more specific `path_constraint`.
     e.g. if the path constraints a slice `[*]` and the constraints a
@@ -148,7 +147,7 @@ def apply_constraint_to_path(
 
 def remove_prefix_from_path(
     path: jsonpath_ng.JSONPath, prefix: jsonpath_ng.JSONPath
-) -> Optional[jsonpath_ng.JSONPath]:
+) -> jsonpath_ng.JSONPath | None:
     path_parts = jsonpath_parts(path, ignore_root=True)
     prefix_parts = jsonpath_parts(prefix, ignore_root=True)
 

reconcile/utils/jump_host.py

@@ -4,7 +4,6 @@ import shutil
 import tempfile
 import threading
 from dataclasses import dataclass
-from typing import Optional
 
 from sshtunnel import SSHTunnelForwarder
 
@@ -27,9 +26,9 @@ class JumphostParameters:
     hostname: str
     known_hosts: str
     user: str
-    port: Optional[int]
-    remote_port: Optional[int]
-    local_port: Optional[int]
+    port: int | None
+    remote_port: int | None
+    local_port: int | None
     key: str
 
 
@@ -60,7 +59,7 @@ class JumpHostSSH(JumpHostBase):
     tunnel_lock = threading.Lock()
 
     def __init__(
-        self, parameters: JumphostParameters, gql_api: Optional[gql.GqlApi] = None
+        self, parameters: JumphostParameters, gql_api: gql.GqlApi | None = None
     ):
         JumpHostBase.__init__(self, parameters=parameters)
 
@@ -75,7 +74,7 @@ class JumpHostSSH(JumpHostBase):
         self._remote_port = parameters.remote_port
 
     @property
-    def local_port(self) -> Optional[int]:
+    def local_port(self) -> int | None:
         return self._local_port
 
     @staticmethod
@@ -102,7 +101,7 @@ class JumpHostSSH(JumpHostBase):
         self.known_hosts_file = known_hosts_file
 
     def get_ssh_base_cmd(self) -> list[str]:
-        user_host = "{}@{}".format(self._user, self._hostname)
+        user_host = f"{self._user}@{self._hostname}"
 
         return [
             "ssh",
@@ -115,7 +114,7 @@ class JumpHostSSH(JumpHostBase):
             "-o",
             "StrictHostKeyChecking=yes",
             "-o",
-            "UserKnownHostsFile={}".format(self.known_hosts_file),
+            f"UserKnownHostsFile={self.known_hosts_file}",
             "-i",
             self._identity_file,
             "-p",

reconcile/utils/keycloak.py

@@ -1,9 +1,5 @@
-from typing import (
-    Any,
-    Iterable,
-    Optional,
-    Sequence,
-)
+from collections.abc import Iterable, Sequence
+from typing import Any
 
 import requests
 from pydantic import BaseModel
@@ -31,7 +27,7 @@ class SSOClient(BaseModel):
 
 class KeycloakInstance(BaseModel):
     url: str
-    initial_access_token: Optional[str] = None
+    initial_access_token: str | None = None
 
 
 class KeycloakAPI:

reconcile/utils/ldap_client.py

@@ -1,6 +1,5 @@
 from collections import defaultdict
 from collections.abc import Iterable
-from typing import Optional
 
 from ldap3 import (
     ALL,
@@ -30,7 +29,7 @@ class LdapClient:
         self.connection.unbind()
 
     def get_users(self, uids: Iterable[str]) -> set[str]:
-        user_filter = "".join((f"(uid={u})" for u in uids))
+        user_filter = "".join(f"(uid={u})" for u in uids)
         _, _, results, _ = self.connection.search(
             self.base_dn, f"(&(objectclass=person)(|{user_filter}))", attributes=["uid"]
         )
@@ -66,7 +65,7 @@ class LdapClient:
 
     @classmethod
     def from_params(
-        cls, server_url: str, user: Optional[str], password: Optional[str], base_dn: str
+        cls, server_url: str, user: str | None, password: str | None, base_dn: str
     ) -> "LdapClient":
         connection = Connection(
             Server(server_url, get_info=ALL),

reconcile/utils/lean_terraform_client.py

@@ -3,11 +3,7 @@ import logging
 import os
 import subprocess
 from collections.abc import Mapping
-from typing import (
-    Any,
-    Optional,
-    Tuple,
-)
+from typing import Any
 
 
 def state_rm_access_key(working_dirs, account, user):
@@ -15,13 +11,13 @@ def state_rm_access_key(working_dirs, account, user):
     init_result = subprocess.run(["terraform", "init"], check=False, cwd=wd)
     if init_result.returncode != 0:
         return False
-    resource = "aws_iam_access_key.{}".format(user)
+    resource = f"aws_iam_access_key.{user}"
     result = subprocess.run(["terraform", "state", "rm", resource], check=False, cwd=wd)
     return result.returncode == 0
 
 
 def _compute_terraform_env(
-    env: Optional[Mapping[str, str]] = None,
+    env: Mapping[str, str] | None = None,
 ) -> Mapping[str, str]:
     default_env = os.environ.copy()
     return default_env if env is None else {**default_env, **env}
@@ -30,8 +26,8 @@ def _compute_terraform_env(
 def _terraform_command(
     args: list[str],
     working_dir: str,
-    env: Optional[Mapping[str, str]] = None,
-) -> Tuple[int, str, str]:
+    env: Mapping[str, str] | None = None,
+) -> tuple[int, str, str]:
     result = subprocess.run(
         args,
         capture_output=True,
@@ -66,8 +62,8 @@ def show_json(working_dir: str, path: str) -> dict[str, Any]:
 
 def init(
     working_dir: str,
-    env: Optional[Mapping[str, str]] = None,
-) -> Tuple[int, str, str]:
+    env: Mapping[str, str] | None = None,
+) -> tuple[int, str, str]:
     """
     Run terraform init -input=false -no-color.
 
@@ -84,8 +80,8 @@ def init(
 
 def output(
     working_dir: str,
-    env: Optional[Mapping[str, str]] = None,
-) -> Tuple[int, str, str]:
+    env: Mapping[str, str] | None = None,
+) -> tuple[int, str, str]:
     """
     Run terraform output -json.
 
@@ -103,8 +99,8 @@ def output(
 def plan(
     working_dir: str,
     out: str,
-    env: Optional[Mapping[str, str]] = None,
-) -> Tuple[int, str, str]:
+    env: Mapping[str, str] | None = None,
+) -> tuple[int, str, str]:
     """
     Run terraform plan -out=<out> -input=false -no-color.
 
@@ -123,8 +119,8 @@ def plan(
 def apply(
     working_dir: str,
     dir_or_plan: str,
-    env: Optional[Mapping[str, str]] = None,
-) -> Tuple[int, str, str]:
+    env: Mapping[str, str] | None = None,
+) -> tuple[int, str, str]:
     """
     Run terraform apply -input=false -no-color <dir_or_plan>.
 

reconcile/utils/membershipsources/app_interface_resolver.py

@@ -1,6 +1,6 @@
 import base64
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator
 
 from reconcile import queries
 from reconcile.gql_definitions.fragments.membership_source import (

reconcile/utils/membershipsources/models.py

@@ -1,11 +1,8 @@
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from typing import (
     Any,
-    Callable,
-    Optional,
     Protocol,
     TypeVar,
-    Union,
 )
 
 from pydantic import (
@@ -34,7 +31,7 @@ class Bot(Protocol):
     def name(self) -> str: ...
 
     @property
-    def org_username(self) -> Optional[str]: ...
+    def org_username(self) -> str | None: ...
 
     def dict(self, *, by_alias: bool = False) -> dict[str, Any]: ...
 
@@ -50,21 +47,21 @@ class RoleWithMemberships(Protocol):
     def bots(self) -> Sequence[Bot]: ...
 
     @property
-    def member_sources(self) -> Optional[Sequence[RoleMembershipSource]]: ...
+    def member_sources(self) -> Sequence[RoleMembershipSource] | None: ...
 
 
 class RoleUser(BaseModel):
     name: str
     org_username: str
-    github_username: Optional[str]
-    quay_username: Optional[str]
-    slack_username: Optional[str]
-    pagerduty_username: Optional[str]
-    aws_username: Optional[str]
-    cloudflare_user: Optional[str]
-    public_gpg_key: Optional[str]
-    tag_on_cluster_updates: Optional[bool] = False
-    tag_on_merge_requests: Optional[bool] = False
+    github_username: str | None
+    quay_username: str | None
+    slack_username: str | None
+    pagerduty_username: str | None
+    aws_username: str | None
+    cloudflare_user: str | None
+    public_gpg_key: str | None
+    tag_on_cluster_updates: bool | None = False
+    tag_on_merge_requests: bool | None = False
 
     class Config:
         extra = Extra.ignore
@@ -72,18 +69,18 @@ class RoleUser(BaseModel):
 
 class RoleBot(BaseModel):
     name: str
-    description: Optional[str]
-    org_username: Optional[str]
-    github_username: Optional[str]
-    gitlab_username: Optional[str]
-    openshift_serviceaccount: Optional[str]
-    quay_username: Optional[str]
+    description: str | None
+    org_username: str | None
+    github_username: str | None
+    gitlab_username: str | None
+    openshift_serviceaccount: str | None
+    quay_username: str | None
 
     class Config:
         extra = Extra.ignore
 
 
-RoleMember = Union[RoleUser, RoleBot]
+RoleMember = RoleUser | RoleBot
 
 ProviderGroup = tuple[str, str]
 

reconcile/utils/metrics.py

@@ -12,8 +12,6 @@ from collections.abc import (
 from types import TracebackType
 from typing import (
     Any,
-    Optional,
-    Type,
     TypeVar,
 )
 
@@ -190,10 +188,10 @@ class MetricsContainer:
     def __init__(
         self,
     ) -> None:
-        self._gauges: dict[Type[GaugeMetric], dict[Sequence[str], float]] = defaultdict(
+        self._gauges: dict[type[GaugeMetric], dict[Sequence[str], float]] = defaultdict(
             dict
         )
-        self._counters: dict[Type[CounterMetric], dict[Sequence[str], float]] = (
+        self._counters: dict[type[CounterMetric], dict[Sequence[str], float]] = (
             defaultdict(dict)
         )
 
@@ -236,7 +234,7 @@ class MetricsContainer:
 
     T = TypeVar("T", bound=BaseMetric)
 
-    def get_metric_value(self, metric_class: Type[T], **kwargs: Any) -> Optional[float]:
+    def get_metric_value(self, metric_class: type[T], **kwargs: Any) -> float | None:
         """
         Finds a unique match for the metrics class and labels, and returns its value.
         If more than one match is found, a ValueError is raised.
@@ -252,7 +250,7 @@ class MetricsContainer:
         return None
 
     def get_metrics(
-        self, metric_class: Type[T], **kwargs: Any
+        self, metric_class: type[T], **kwargs: Any
     ) -> list[tuple[T, float]]:
         """
         Returns all metrics of the given class from this container and all its scopes,
@@ -383,7 +381,7 @@ class _MetricsContext:
 
     def __init__(
         self,
-        scope: Optional[Hashable],
+        scope: Hashable | None,
         parent: MetricsContainer,
         aggregate_counters: bool,
     ):
@@ -408,9 +406,9 @@ class _MetricsContext:
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BaseException]],
-        exc_value: Optional[BaseException],
-        traceback: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
     ) -> None:
         if self.scope:
             self.parent._scopes[self.scope] = self.container
@@ -420,8 +418,8 @@ class _MetricsContext:
 
 
 def transactional_metrics(
-    scope: Optional[Hashable] = None,
-    parent_container: Optional[MetricsContainer] = None,
+    scope: Hashable | None = None,
+    parent_container: MetricsContainer | None = None,
     aggregate_counters: bool = True,
 ) -> _MetricsContext:
     """
@@ -562,9 +560,9 @@ class ErrorRateMetricSet:
 
     def __exit__(
         self: ERMS,
-        exc_type: Optional[Type[BaseException]],
-        exc_value: Optional[BaseException],
-        traceback: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
     ) -> None:
         if exc_value:
             self.fail(exc_value)

reconcile/utils/mr/base.py

@@ -4,11 +4,7 @@ from abc import (
     ABC,
     abstractmethod,
 )
-from typing import (
-    Any,
-    Optional,
-    Union,
-)
+from typing import Any
 from uuid import uuid4
 
 from gitlab.exceptions import GitlabError
@@ -36,7 +32,7 @@ class MergeRequestProcessingError(Exception):
     """
 
 
-MRClient = Union[GitLabApi, SQSGateway]
+MRClient = GitLabApi | SQSGateway
 
 
 class MergeRequestBase(ABC):
@@ -211,7 +207,7 @@ class MergeRequestBase(ABC):
             from_=gitlab_cli.main_branch, to=self.branch
         )["diffs"]
 
-    def submit(self, cli: MRClient) -> Union[Any, None]:
+    def submit(self, cli: MRClient) -> Any | None:
         if isinstance(cli, GitLabApi):
             return self.submit_to_gitlab(gitlab_cli=cli)
 
@@ -226,10 +222,10 @@ def app_interface_email(
     name: str,
     subject: str,
     body: str,
-    users: Optional[list[str]] = None,
-    aliases: Optional[list[str]] = None,
-    aws_accounts: Optional[list[str]] = None,
-    apps: Optional[list[str]] = None,
+    users: list[str] | None = None,
+    aliases: list[str] | None = None,
+    aws_accounts: list[str] | None = None,
+    apps: list[str] | None = None,
 ) -> str:
     """Render app-interface-email template."""
     with open(EMAIL_TEMPLATE, encoding="locale") as file_obj:

reconcile/utils/mr/glitchtip_access_reporter.py

@@ -1,6 +1,6 @@
 import logging
 from collections.abc import Sequence
-from datetime import date, timezone
+from datetime import UTC, date
 from datetime import datetime as dt
 from pathlib import Path
 
@@ -60,7 +60,7 @@ class UpdateGlitchtipAccessReport(MergeRequestBase):
         self._glitchtip_access_revalidation_workbook = str(
             glitchtip_access_revalidation_workbook
         )
-        self._isodate = dt.now(tz=timezone.utc).isoformat()
+        self._isodate = dt.now(tz=UTC).isoformat()
         self._dry_run = dry_run
 
     @property

reconcile/utils/mr/notificator.py

@@ -1,7 +1,6 @@
 import logging
 from datetime import datetime
 from pathlib import Path
-from typing import Optional
 
 from pydantic import BaseModel
 
@@ -32,7 +31,7 @@ class CreateAppInterfaceNotificator(MergeRequestBase):
     def __init__(
         self,
         notification: Notification,
-        labels: Optional[list[str]] = None,
+        labels: list[str] | None = None,
         email_base_path: Path = Path("data") / "app-interface" / "emails",
         dry_run: bool = False,
     ):