qontract-reconcile 0.10.1rc884__py3-none-any.whl → 0.10.1rc886__py3-none-any.whl

reconcile/utils/glitchtip/client.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from reconcile.utils.glitchtip.models import (
     Organization,
     Project,
@@ -60,7 +58,7 @@ class GlitchtipClient(ApiBase):
         ]
 
     def create_project(
-        self, organization_slug: str, team_slug: str, name: str, platform: Optional[str]
+        self, organization_slug: str, team_slug: str, name: str, platform: str | None
     ) -> Project:
         """Create a project."""
         return Project(
@@ -75,7 +73,7 @@ class GlitchtipClient(ApiBase):
         organization_slug: str,
         slug: str,
         name: str,
-        platform: Optional[str],
+        platform: str | None,
         event_throttle_rate: int,
     ) -> Project:
         """Update a project."""

reconcile/utils/glitchtip/models.py

@@ -3,10 +3,7 @@ from __future__ import annotations
 import re
 from collections.abc import MutableMapping
 from enum import Enum
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from pydantic import (
     BaseModel,
@@ -26,7 +23,7 @@ def slugify(value: str) -> str:
 
 
 class User(BaseModel):
-    pk: Optional[int] = Field(None, alias="id")
+    pk: int | None = Field(None, alias="id")
     email: str
     role: str
     pending: bool = False
@@ -44,7 +41,7 @@ class User(BaseModel):
 
 
 class Team(BaseModel):
-    pk: Optional[int] = Field(None, alias="id")
+    pk: int | None = Field(None, alias="id")
     name: str = ""
     slug: str = ""
     users: list[User] = []
@@ -89,7 +86,7 @@ class RecipientType(Enum):
 
 
 class ProjectAlertRecipient(BaseModel):
-    pk: Optional[int]
+    pk: int | None
     recipient_type: RecipientType = Field(..., alias="recipientType")
     url: str = ""
 
@@ -118,7 +115,7 @@ class ProjectAlertRecipient(BaseModel):
 
 
 class ProjectAlert(BaseModel):
-    pk: Optional[int]
+    pk: int | None
     name: str
     timespan_minutes: int
     quantity: int
@@ -148,10 +145,10 @@ class ProjectAlert(BaseModel):
 
 
 class Project(BaseModel):
-    pk: Optional[int] = Field(None, alias="id")
+    pk: int | None = Field(None, alias="id")
     name: str
     slug: str = ""
-    platform: Optional[str]
+    platform: str | None
     teams: list[Team] = []
     alerts: list[ProjectAlert] = []
     event_throttle_rate: int = Field(0, alias="eventThrottleRate")
@@ -189,7 +186,7 @@ class Project(BaseModel):
 
 
 class Organization(BaseModel):
-    pk: Optional[int] = Field(None, alias="id")
+    pk: int | None = Field(None, alias="id")
     name: str
     slug: str = ""
     projects: list[Project] = []

reconcile/utils/gql.py

@@ -2,15 +2,10 @@ import logging
 import textwrap
 import threading
 from datetime import (
+    UTC,
     datetime,
-    timezone,
-)
-from typing import (
-    Any,
-    Dict,
-    Optional,
-    Union,
 )
+from typing import Any
 from urllib.parse import urlparse
 
 import requests
@@ -83,9 +78,7 @@ class GqlApiErrorForbiddenSchema(Exception):
 
 class GqlGetResourceError(Exception):
     def __init__(self, path, msg):
-        super().__init__(
-            "Error getting resource from path {}: {}".format(path, str(msg))
-        )
+        super().__init__(f"Error getting resource from path {path}: {str(msg)}")
 
 
 class GqlApi:
@@ -95,11 +88,11 @@ class GqlApi:
     def __init__(
         self,
         url: str,
-        token: Optional[str] = None,
+        token: str | None = None,
         int_name=None,
         validate_schemas=False,
-        commit: Optional[str] = None,
-        commit_timestamp: Optional[str] = None,
+        commit: str | None = None,
+        commit_timestamp: str | None = None,
     ) -> None:
         self.url = url
         self.token = token
@@ -143,15 +136,15 @@ class GqlApi:
     @retry(exceptions=GqlApiError, max_attempts=5, hook=capture_and_forget)
     def query(
         self, query: str, variables=None, skip_validation=False
-    ) -> Optional[dict[str, Any]]:
+    ) -> dict[str, Any] | None:
         try:
             result = self.client.execute(
                 gql(query), variables, get_execution_result=True
             ).formatted
         except requests.exceptions.ConnectionError as e:
-            raise GqlApiError("Could not connect to GraphQL server ({})".format(e))
+            raise GqlApiError(f"Could not connect to GraphQL server ({e})")
         except TransportQueryError as e:
-            raise GqlApiError("`error` returned with GraphQL response {}".format(e))
+            raise GqlApiError(f"`error` returned with GraphQL response {e}")
         except AssertionError:
             raise GqlApiError("`data` field missing from GraphQL response payload")
         except Exception as e:
@@ -247,16 +240,14 @@ class GqlApi:
         return list(self._queried_schemas)
 
     @property
-    def commit_timestamp_utc(self) -> Optional[str]:
+    def commit_timestamp_utc(self) -> str | None:
         if self.commit_timestamp:
-            return datetime.fromtimestamp(
-                int(self.commit_timestamp), timezone.utc
-            ).isoformat()
+            return datetime.fromtimestamp(int(self.commit_timestamp), UTC).isoformat()
         return None
 
 
 class GqlApiSingleton:
-    gql_api: Optional[GqlApi] = None
+    gql_api: GqlApi | None = None
     gqlapi_lock = threading.Lock()
 
     @classmethod
@@ -288,11 +279,11 @@ class GqlApiSingleton:
 
 def init(
     url: str,
-    token: Optional[str] = None,
+    token: str | None = None,
     integration=None,
     validate_schemas=False,
-    commit: Optional[str] = None,
-    commit_timestamp: Optional[str] = None,
+    commit: str | None = None,
+    commit_timestamp: str | None = None,
 ):
     return GqlApiSingleton.create(
         url,
@@ -319,12 +310,12 @@ class PersistentRequestsHTTPTransport(RequestsHTTPTransport):
         self,
         session: requests.Session,
         url: str,
-        headers: Optional[Dict[str, Any]] = None,
-        cookies: Optional[Union[Dict[str, Any], RequestsCookieJar]] = None,
-        auth: Optional[AuthBase] = None,
+        headers: dict[str, Any] | None = None,
+        cookies: dict[str, Any] | RequestsCookieJar | None = None,
+        auth: AuthBase | None = None,
         use_json: bool = True,
-        timeout: Optional[int] = None,
-        verify: Union[bool, str] = True,
+        timeout: int | None = None,
+        verify: bool | str = True,
         retries: int = 0,
         method: str = "POST",
         **kwargs: Any,
@@ -398,8 +389,8 @@ def init_from_config(
 
 
 def _get_gql_server_and_token(
-    autodetect_sha: bool = False, sha: Optional[str] = None
-) -> tuple[str, str, Optional[str], Optional[str]]:
+    autodetect_sha: bool = False, sha: str | None = None
+) -> tuple[str, str, str | None, str | None]:
     config = get_config()
 
     server_url = urlparse(config["graphql"]["server"])
@@ -425,7 +416,7 @@ def get_api() -> GqlApi:
 
 
 def get_api_for_sha(
-    sha: str, integration: Optional[str] = None, validate_schemas: bool = True
+    sha: str, integration: str | None = None, validate_schemas: bool = True
 ) -> GqlApi:
     server, token, commit, timestamp = _get_gql_server_and_token(
         autodetect_sha=False, sha=sha
@@ -442,8 +433,8 @@ def get_api_for_sha(
 
 def get_api_for_server(
     server: str,
-    token: Optional[str],
-    integration: Optional[str] = None,
+    token: str | None,
+    integration: str | None = None,
     validate_schemas: bool = True,
 ) -> GqlApi:
     return GqlApi(
@@ -458,7 +449,7 @@ def get_api_for_server(
 
 @retry(exceptions=requests.exceptions.HTTPError, max_attempts=5)
 def get_diff(
-    old_sha: str, file_type: Optional[str] = None, file_path: Optional[str] = None
+    old_sha: str, file_type: str | None = None, file_path: str | None = None
 ) -> dict[str, Any]:
     config = get_config()
 

reconcile/utils/grouping.py

@@ -1,8 +1,6 @@
 from collections import defaultdict
+from collections.abc import Callable, Hashable, Iterable
 from typing import (
-    Callable,
-    Hashable,
-    Iterable,
     TypeVar,
 )
 

reconcile/utils/imap_client.py

@@ -1,8 +1,5 @@
 import imaplib
-from typing import (
-    Any,
-    Union,
-)
+from typing import Any
 
 from reconcile.utils.secret_reader import SecretReader
 
@@ -15,7 +12,7 @@ class ImapClient:
         self.password: str = imap_config["password"]
         self.port: int = int(imap_config["port"])
         self.timeout: int = settings["imap"].get("timeout", 30)
-        self._server: Union[imaplib.IMAP4_SSL, None] = None
+        self._server: imaplib.IMAP4_SSL | None = None
 
     def __enter__(self) -> "ImapClient":
         self._server = imaplib.IMAP4_SSL(

reconcile/utils/internal_groups/client.py

@@ -1,6 +1,5 @@
 from typing import (
     Any,
-    Optional,
     Self,
 )
 
@@ -61,7 +60,7 @@ class InternalGroupsApi:
 
     @retry(exceptions=(TokenExpiredError,), max_attempts=2)
     def _request(
-        self, method: str, url: str, json: Optional[dict[Any, Any]] = None
+        self, method: str, url: str, json: dict[Any, Any] | None = None
     ) -> Response:
         try:
             return self._client.request(

reconcile/utils/internal_groups/models.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from enum import Enum
-from typing import Optional
+from enum import StrEnum
 
 from pydantic import (
     BaseModel,
@@ -9,7 +8,7 @@ from pydantic import (
 )
 
 
-class EntityType(str, Enum):
+class EntityType(StrEnum):
     USER = "user"
     SERVICE_ACCOUNT = "serviceaccount"
     DELETED_USER = "deleteduser"
@@ -35,17 +34,17 @@ class Group(BaseModel):
     contact_list: str = Field(..., alias="contactList")
     owners: list[Entity]
     display_name: str = Field(..., alias="displayName")
-    notes: Optional[str] = None
-    rover_group_member_query: Optional[str] = Field(None, alias="roverGroupMemberQuery")
-    rover_group_inclusions: Optional[list[Entity]] = Field(
+    notes: str | None = None
+    rover_group_member_query: str | None = Field(None, alias="roverGroupMemberQuery")
+    rover_group_inclusions: list[Entity] | None = Field(
         None, alias="roverGroupInclusions"
     )
-    rover_group_exclusions: Optional[list[Entity]] = Field(
+    rover_group_exclusions: list[Entity] | None = Field(
         None, alias="roverGroupExclusions"
     )
     members: list[Entity] = []
-    member_of: Optional[list[str]] = Field(None, alias="memberOf")
-    namespace: Optional[str] = None
+    member_of: list[str] | None = Field(None, alias="memberOf")
+    namespace: str | None = None
 
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, Group):

reconcile/utils/jenkins_api.py

@@ -108,7 +108,7 @@ class JenkinsApi:
         res.raise_for_status()
 
     def get_all_roles(self):
-        url = "{}/role-strategy/strategy/getAllRoles".format(self.url)
+        url = f"{self.url}/role-strategy/strategy/getAllRoles"
         res = requests.get(
             url, verify=self.ssl_verify, auth=(self.user, self.password), timeout=60
         )
@@ -117,7 +117,7 @@ class JenkinsApi:
         return res.json()
 
     def assign_role_to_user(self, role, user):
-        url = "{}/role-strategy/strategy/assignRole".format(self.url)
+        url = f"{self.url}/role-strategy/strategy/assignRole"
         data = {"type": "globalRoles", "roleName": role, "sid": user}
         res = requests.post(
             url,
@@ -130,7 +130,7 @@ class JenkinsApi:
         res.raise_for_status()
 
     def unassign_role_from_user(self, role, user):
-        url = "{}/role-strategy/strategy/unassignRole".format(self.url)
+        url = f"{self.url}/role-strategy/strategy/unassignRole"
         data = {"type": "globalRoles", "roleName": role, "sid": user}
         res = requests.post(
             url,
@@ -143,7 +143,7 @@ class JenkinsApi:
         res.raise_for_status()
 
     def safe_restart(self, force_restart=False):
-        url = "{}/safeRestart".format(self.url)
+        url = f"{self.url}/safeRestart"
         if self.should_restart or force_restart:
             logging.debug(
                 "performing safe restart. "

reconcile/utils/jinja2/extensions.py

@@ -1,6 +1,6 @@
 import base64
 import textwrap
-from typing import Callable
+from collections.abc import Callable
 
 from jinja2 import nodes
 from jinja2.exceptions import TemplateRuntimeError

reconcile/utils/jinja2/filters.py

@@ -2,7 +2,7 @@ import hashlib
 import json
 import re
 from collections.abc import Iterable
-from typing import Any, Optional
+from typing import Any
 from urllib import parse
 
 import jinja2
@@ -20,7 +20,7 @@ def json_to_dict(input: str) -> Any:
     return data
 
 
-def urlescape(string: str, safe: str = "/", encoding: Optional[str] = None) -> str:
+def urlescape(string: str, safe: str = "/", encoding: str | None = None) -> str:
     """Jinja2 filter that is a simple wrapper around urllib's URL quoting
     functions that takes a string value and makes it safe for use as URL
     components escaping any reserved characters using URL encoding. See:
@@ -37,7 +37,7 @@ def urlescape(string: str, safe: str = "/", encoding: Optional[str] = None) -> s
     return parse.quote(string, safe=safe, encoding=encoding)
 
 
-def urlunescape(string: str, encoding: Optional[str] = None) -> str:
+def urlunescape(string: str, encoding: str | None = None) -> str:
     """Jinja2 filter that is a simple wrapper around urllib's URL unquoting
     functions that takes an URL-encoded string value and unescapes it
     replacing any URL-encoded values with their character equivalent. See:
@@ -78,7 +78,7 @@ def hash_list(input: Iterable) -> str:
     lst = list(input)
     str_lst = []
     for el in lst:
-        if isinstance(el, (list, dict)):
+        if isinstance(el, list | dict):
             raise RuntimeError(
                 f"jinja2 hash_list function received non-primitive value {el}. All values received {lst}"
             )

reconcile/utils/jinja2/utils.py

@@ -1,5 +1,5 @@
 from functools import cache
-from typing import Any, Optional
+from typing import Any
 
 import jinja2
 from jinja2.sandbox import SandboxedEnvironment
@@ -66,9 +66,9 @@ def lookup_github_file_content(
     repo: str,
     path: str,
     ref: str,
-    tvars: Optional[dict[str, Any]] = None,
-    settings: Optional[dict[str, Any]] = None,
-    secret_reader: Optional[SecretReaderBase] = None,
+    tvars: dict[str, Any] | None = None,
+    settings: dict[str, Any] | None = None,
+    secret_reader: SecretReaderBase | None = None,
 ) -> str:
     if tvars is not None:
         repo = process_jinja2_template(
@@ -98,7 +98,7 @@ def lookup_s3_object(
     account_name: str,
     bucket_name: str,
     path: str,
-    region_name: Optional[str] = None,
+    region_name: str | None = None,
 ) -> str:
     settings = queries.get_app_interface_settings()
     accounts = queries.get_aws_accounts(name=account_name)
@@ -118,12 +118,12 @@ def lookup_s3_object(
 def lookup_secret(
     path: str,
     key: str,
-    version: Optional[str] = None,
-    tvars: Optional[dict[str, Any]] = None,
+    version: str | None = None,
+    tvars: dict[str, Any] | None = None,
     allow_not_found: bool = False,
-    settings: Optional[dict[str, Any]] = None,
-    secret_reader: Optional[SecretReaderBase] = None,
-) -> Optional[str]:
+    settings: dict[str, Any] | None = None,
+    secret_reader: SecretReaderBase | None = None,
+) -> str | None:
     if tvars is not None:
         path = process_jinja2_template(
             body=path, vars=tvars, settings=settings, secret_reader=secret_reader
@@ -150,10 +150,10 @@ def lookup_secret(
 
 def process_jinja2_template(
     body: str,
-    vars: Optional[dict[str, Any]] = None,
+    vars: dict[str, Any] | None = None,
     extra_curly: bool = False,
-    settings: Optional[dict[str, Any]] = None,
-    secret_reader: Optional[SecretReaderBase] = None,
+    settings: dict[str, Any] | None = None,
+    secret_reader: SecretReaderBase | None = None,
 ) -> Any:
     if vars is None:
         vars = {}
@@ -196,10 +196,10 @@ def process_jinja2_template(
 
 def process_extracurlyjinja2_template(
     body: str,
-    vars: Optional[dict[str, Any]] = None,
+    vars: dict[str, Any] | None = None,
     extra_curly: bool = True,
-    settings: Optional[dict[str, Any]] = None,
-    secret_reader: Optional[SecretReaderBase] = None,
+    settings: dict[str, Any] | None = None,
+    secret_reader: SecretReaderBase | None = None,
 ) -> Any:
     if vars is None:
         vars = {}

reconcile/utils/jira_client.py

@@ -8,7 +8,6 @@ from collections.abc import (
 )
 from typing import (
     Any,
-    Optional,
     Protocol,
 )
 
@@ -57,11 +56,11 @@ class JiraClient:
 
     def __init__(
         self,
-        jira_board: Optional[Mapping[str, Any]] = None,
-        settings: Optional[Mapping] = None,
-        jira_api: Optional[JIRA] = None,
-        project: Optional[str] = None,
-        server: Optional[str] = None,
+        jira_board: Mapping[str, Any] | None = None,
+        settings: Mapping | None = None,
+        jira_api: JIRA | None = None,
+        project: str | None = None,
+        server: str | None = None,
     ):
         """
         Note: jira_board and settings is to be deprecated. Use JiraClient.create() instead.
@@ -89,7 +88,7 @@ class JiraClient:
         self.my_permissions = functools.lru_cache(maxsize=None)(self._my_permissions)
 
     def _deprecated_init(
-        self, jira_board: Mapping[str, Any], settings: Optional[Mapping]
+        self, jira_board: Mapping[str, Any], settings: Mapping | None
     ) -> None:
         secret_reader = SecretReader(settings=settings)
         self.project = jira_board["name"]
@@ -114,7 +113,7 @@ class JiraClient:
         project_name: str,
         token: str,
         server_url: str,
-        jira_watcher_settings: Optional[JiraWatcherSettings] = None,
+        jira_watcher_settings: JiraWatcherSettings | None = None,
     ) -> JiraClient:
         read_timeout = JiraClient.DEFAULT_READ_TIMEOUT
         connect_timeout = JiraClient.DEFAULT_CONNECT_TIMEOUT
@@ -130,12 +129,12 @@ class JiraClient:
             server=server_url,
         )
 
-    def get_issues(self, fields: Optional[Mapping] = None) -> list[Issue]:
+    def get_issues(self, fields: Mapping | None = None) -> list[Issue]:
         block_size = 100
         block_num = 0
 
         all_issues: list[Issue] = []
-        jql = "project={}".format(self.project)
+        jql = f"project={self.project}"
         kwargs: dict[str, Any] = {}
         if fields:
             kwargs["fields"] = ",".join(fields)
@@ -163,7 +162,7 @@ class JiraClient:
         self,
         summary: str,
         body: str,
-        labels: Optional[Iterable[str]] = None,
+        labels: Iterable[str] | None = None,
         links: Iterable[str] = (),
     ) -> Issue:
         """Create an issue in our project with the given labels."""

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")