qontract-reconcile 0.10.1rc883__py3-none-any.whl → 0.10.1rc885__py3-none-any.whl

reconcile/utils/prometheus.py

@@ -1,4 +1,4 @@
-from typing import NamedTuple, Optional, Protocol
+from typing import NamedTuple, Protocol
 
 import requests
 from pydantic import BaseModel, Field
@@ -41,7 +41,7 @@ class PrometheusVector(BaseModel):
     def mandatory_label(self, label_name: str) -> str:
         return self.metric[label_name]
 
-    def label(self, label_name: str, default: Optional[str] = None) -> Optional[str]:
+    def label(self, label_name: str, default: str | None = None) -> str | None:
         return self.metric.get(label_name, default)
 
 

reconcile/utils/promotion_state.py

@@ -1,6 +1,5 @@
 import logging
 from collections import defaultdict
-from typing import Optional
 
 from pydantic import (
     BaseModel,
@@ -20,9 +19,9 @@ class PromotionData(BaseModel):
     """
 
     success: bool
-    target_config_hash: Optional[str]
-    saas_file: Optional[str]
-    check_in: Optional[str]
+    target_config_hash: str | None
+    saas_file: str | None
+    check_in: str | None
 
     class Config:
         smart_union = True
@@ -71,7 +70,7 @@ class PromotionState:
         target_uid: str = "",
         pre_check_sha_exists: bool = True,
         use_cache: bool = False,
-    ) -> Optional[PromotionData]:
+    ) -> PromotionData | None:
         """
         Fetch promotion data from S3.
 

reconcile/utils/promtool.py

@@ -2,11 +2,7 @@ import copy
 import os
 import subprocess
 import tempfile
-from typing import (
-    Iterable,
-    Mapping,
-    MutableMapping,
-)
+from collections.abc import Iterable, Mapping, MutableMapping
 
 import yaml
 
@@ -70,9 +66,7 @@ def _run_yaml_spec_cmd(cmd: list[str], yaml_spec: Mapping) -> CommandExecutionRe
             return CommandExecutionResult(False, f"Error creating temporary file: {e}")
 
         try:
-            result = subprocess.run(
-                cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True
-            )
+            result = subprocess.run(cmd, capture_output=True, check=True)
         except subprocess.CalledProcessError as e:
             msg = f'Error running promtool command [{" ".join(cmd)}]'
             if e.stdout:

reconcile/utils/quay_api.py

@@ -30,9 +30,7 @@ class QuayApi:
             if cache_members:
                 return cache_members
 
-        url = "{}/organization/{}/team/{}/members?includePending=true".format(
-            self.api_url, self.organization, team
-        )
+        url = f"{self.api_url}/organization/{self.organization}/team/{team}/members?includePending=true"
 
         r = requests.get(url, headers=self.auth_header, timeout=self._timeout)
         if r.status_code == 404:
@@ -57,7 +55,7 @@ class QuayApi:
         return members_list
 
     def user_exists(self, user):
-        url = "{}/users/{}".format(self.api_url, user)
+        url = f"{self.api_url}/users/{user}"
         r = requests.get(url, headers=self.auth_header, timeout=self._timeout)
         if not r.ok:
             return False
@@ -68,22 +66,18 @@ class QuayApi:
 
         :raises HTTPError if there are any problems with the request
         """
-        url_team = "{}/organization/{}/team/{}/members/{}".format(
-            self.api_url, self.organization, team, user
-        )
+        url_team = f"{self.api_url}/organization/{self.organization}/team/{team}/members/{user}"
 
         r = requests.delete(url_team, headers=self.auth_header, timeout=self._timeout)
         if not r.ok:
             message = r.json().get("message", "")
 
-            expected_message = "User {} does not belong to team {}".format(user, team)
+            expected_message = f"User {user} does not belong to team {team}"
 
             if message != expected_message:
                 r.raise_for_status()
 
-        url_org = "{}/organization/{}/members/{}".format(
-            self.api_url, self.organization, user
-        )
+        url_org = f"{self.api_url}/organization/{self.organization}/members/{user}"
 
         r = requests.delete(url_org, headers=self.auth_header, timeout=self._timeout)
         r.raise_for_status()
@@ -98,9 +92,7 @@ class QuayApi:
         if user in self.list_team_members(team, cache=True):
             return True
 
-        url = "{}/organization/{}/team/{}/members/{}".format(
-            self.api_url, self.organization, team, user
-        )
+        url = f"{self.api_url}/organization/{self.organization}/team/{team}/members/{user}"
         r = requests.put(url, headers=self.auth_header, timeout=self._timeout)
         r.raise_for_status()
         return True
@@ -117,7 +109,7 @@ class QuayApi:
         :raises HTTPError: unsuccessful attempt to create the team
         """
 
-        url = "{}/organization/{}/team/{}".format(self.api_url, self.organization, team)
+        url = f"{self.api_url}/organization/{self.organization}/team/{team}"
 
         payload = {"role": role}
 
@@ -140,7 +132,7 @@ class QuayApi:
         if count > self.LIMIT_FOLLOWS:
             raise ValueError("Too many page follows")
 
-        url = "{}/repository".format(self.api_url)
+        url = f"{self.api_url}/repository"
 
         # params
         params = {"namespace": self.organization}
@@ -176,7 +168,7 @@ class QuayApi:
         """
         visibility = "public" if public else "private"
 
-        url = "{}/repository".format(self.api_url)
+        url = f"{self.api_url}/repository"
 
         params = {
             "repo_kind": "image",
@@ -193,14 +185,14 @@ class QuayApi:
         r.raise_for_status()
 
     def repo_delete(self, repo_name):
-        url = "{}/repository/{}/{}".format(self.api_url, self.organization, repo_name)
+        url = f"{self.api_url}/repository/{self.organization}/{repo_name}"
 
         # perform request
         r = requests.delete(url, headers=self.auth_header, timeout=self._timeout)
         r.raise_for_status()
 
     def repo_update_description(self, repo_name, description):
-        url = "{}/repository/{}/{}".format(self.api_url, self.organization, repo_name)
+        url = f"{self.api_url}/repository/{self.organization}/{repo_name}"
 
         params = {"description": description}
 
@@ -217,9 +209,7 @@ class QuayApi:
         self._repo_change_visibility(repo_name, "private")
 
     def _repo_change_visibility(self, repo_name, visibility):
-        url = "{}/repository/{}/{}/changevisibility".format(
-            self.api_url, self.organization, repo_name
-        )
+        url = f"{self.api_url}/repository/{self.organization}/{repo_name}/changevisibility"
 
         params = {"visibility": visibility}
 

reconcile/utils/raw_github_api.py

@@ -72,7 +72,7 @@ class RawGithubApi:
         return result
 
     def org_invitations(self, org):
-        invitations = self.query("/orgs/{}/invitations".format(org))
+        invitations = self.query(f"/orgs/{org}/invitations")
 
         return [
             login
@@ -81,9 +81,7 @@ class RawGithubApi:
         ]
 
     def team_invitations(self, org_id, team_id):
-        invitations = self.query(
-            "/organizations/{}/team/{}/invitations".format(org_id, team_id)
-        )
+        invitations = self.query(f"/organizations/{org_id}/team/{team_id}/invitations")
 
         return [
             login
@@ -95,6 +93,6 @@ class RawGithubApi:
         return self.query("/user/repository_invitations")
 
     def accept_repo_invitation(self, invitation_id):
-        url = self.BASE_URL + "/user/repository_invitations/{}".format(invitation_id)
+        url = self.BASE_URL + f"/user/repository_invitations/{invitation_id}"
         res = self.patch(url)
         res.raise_for_status()

reconcile/utils/rosa/rosa_cli.py

@@ -2,8 +2,8 @@ import collections
 import itertools
 import os
 import textwrap
-from collections.abc import Iterable
-from typing import Any, Callable, Optional
+from collections.abc import Callable, Iterable
+from typing import Any
 
 from kubernetes.client import (
     V1Container,
@@ -42,13 +42,13 @@ class LogHandle:
     ) -> Iterable[str]:
         if max_lines <= 0:
             return []
-        with open(self.log_file, "r", encoding="utf-8") as f:
+        with open(self.log_file, encoding="utf-8") as f:
             if from_file_end:
                 return collections.deque(f, maxlen=max_lines)
             return [line.rstrip() for line in itertools.islice(f, max_lines)]
 
     def write_logs_to_logger(self, logger: Callable[..., None]) -> None:
-        with open(self.log_file, "r", encoding="utf-8") as f:
+        with open(self.log_file, encoding="utf-8") as f:
             logger(f.read())
 
     def exists(self) -> bool:
@@ -67,7 +67,7 @@ class RosaCliResult:
         self,
         status: JobStatus,
         command: str,
-        log_handle: Optional[LogHandle] = None,
+        log_handle: LogHandle | None = None,
     ) -> None:
         self.status = status
         self.command = command
@@ -100,7 +100,7 @@ class RosaCliException(Exception, RosaCliResult):
         self,
         status: JobStatus,
         command: str,
-        log_handle: Optional[LogHandle] = None,
+        log_handle: LogHandle | None = None,
     ) -> None:
         Exception.__init__(
             self, f"ROSA CLI execution failed with status: {status}, cmd: {command}"

reconcile/utils/rosa/session.py

@@ -1,6 +1,5 @@
 import logging
 import tempfile
-from typing import Optional
 
 from jinja2 import Environment, FileSystemLoader
 from pydantic import BaseModel
@@ -53,8 +52,8 @@ class RosaSession:
         ocm_org_id: str,
         ocm_api: OCMBaseClient,
         job_controller: K8sJobController,
-        image: Optional[str] = None,
-        service_account: Optional[str] = None,
+        image: str | None = None,
+        service_account: str | None = None,
     ):
         self.aws_account_id = aws_account_id
         self.aws_region = aws_region
@@ -68,8 +67,8 @@ class RosaSession:
     def assemble_job(
         self,
         cmd: str,
-        annotations: Optional[dict[str, str]] = None,
-        image: Optional[str] = None,
+        annotations: dict[str, str] | None = None,
+        image: str | None = None,
     ) -> RosaJob:
         return RosaJob(
             aws_account_id=self.aws_account_id,
@@ -86,8 +85,8 @@ class RosaSession:
     def cli_execute(
         self,
         cmd: str,
-        annotations: Optional[dict[str, str]] = None,
-        image: Optional[str] = None,
+        annotations: dict[str, str] | None = None,
+        image: str | None = None,
         check_interval_seconds: int = 5,
         timeout_seconds: int = 60,
     ) -> RosaCliResult:

reconcile/utils/runtime/desired_state_diff.py

@@ -1,13 +1,8 @@
 import logging
 import multiprocessing
+from collections.abc import Callable, Iterable, Mapping
 from dataclasses import dataclass
-from typing import (
-    Any,
-    Callable,
-    Iterable,
-    Mapping,
-    Optional,
-)
+from typing import Any
 
 from deepdiff import DeepHash
 from jsonpath_ng.ext.parser import parse
@@ -177,7 +172,7 @@ def extract_diffs_with_timeout(
 
 
 def build_desired_state_diff(
-    sharding_config: Optional[DesiredStateShardConfig],
+    sharding_config: DesiredStateShardConfig | None,
     previous_desired_state: Mapping[str, Any],
     current_desired_state: Mapping[str, Any],
 ) -> DesiredStateDiff:

reconcile/utils/runtime/environment.py

@@ -1,7 +1,6 @@
 import logging
 import os
 import sys
-from typing import Optional
 
 from reconcile.utils import (
     config,
@@ -19,9 +18,7 @@ DRY_RUN_MAP = {
 }
 
 
-def log_fmt(
-    dry_run: Optional[bool] = None, dry_run_option: Optional[str] = None
-) -> str:
+def log_fmt(dry_run: bool | None = None, dry_run_option: str | None = None) -> str:
     if dry_run and dry_run_option:
         raise ValueError("Please set either dry_run or dry_run_option.")
 
@@ -46,9 +43,9 @@ def log_fmt(
 
 
 def init_env(
-    log_level: Optional[str] = None,
-    config_file: Optional[str] = None,
-    dry_run: Optional[bool] = None,
+    log_level: str | None = None,
+    config_file: str | None = None,
+    dry_run: bool | None = None,
     print_gql_url: bool = True,
 ) -> None:
     # store env configs in environment variables. this way child processes

reconcile/utils/runtime/integration.py

@@ -2,11 +2,11 @@ from abc import (
     ABC,
     abstractmethod,
 )
+from collections.abc import Callable
 from dataclasses import dataclass
 from types import ModuleType
 from typing import (
     Any,
-    Callable,
     Generic,
     Optional,
     TypeVar,
@@ -153,7 +153,7 @@ class QontractReconcileIntegration(ABC, Generic[RunParamsTypeVar]):
 
     def __init__(self, params: RunParamsTypeVar) -> None:
         self.params: RunParamsTypeVar = params
-        self._secret_reader: Optional[SecretReaderBase] = None
+        self._secret_reader: SecretReaderBase | None = None
 
     @property
     @abstractmethod
@@ -169,7 +169,7 @@ class QontractReconcileIntegration(ABC, Generic[RunParamsTypeVar]):
             self._secret_reader = create_secret_reader(use_vault=vault_settings.vault)
         return self._secret_reader
 
-    def get_early_exit_desired_state(self) -> Optional[dict[str, Any]]:
+    def get_early_exit_desired_state(self) -> dict[str, Any] | None:
         """
         An integration that wants to support early exit on its desired state
         must implement this method and return the desired state as a dictionary.
@@ -299,7 +299,7 @@ class ModuleBasedQontractReconcileIntegration(
             return self.params.module.QONTRACT_INTEGRATION.replace("_", "-")
         raise NotImplementedError("Integration missing QONTRACT_INTEGRATION.")
 
-    def get_early_exit_desired_state(self) -> Optional[dict[str, Any]]:
+    def get_early_exit_desired_state(self) -> dict[str, Any] | None:
         if self._integration_supports(EARLY_EXIT_DESIRED_STATE_FUNCTION):
             return self.params.module.early_exit_desired_state(
                 *self.params.args, **self.params.kwargs

reconcile/utils/runtime/meta.py

@@ -1,13 +1,12 @@
 import dataclasses
 from dataclasses import dataclass
-from typing import Optional
 
 
 @dataclass
 class IntegrationMeta:
     name: str
     args: list[str]
-    short_help: Optional[str]
+    short_help: str | None
 
     def to_dict(self):
         return dataclasses.asdict(self)

reconcile/utils/runtime/runner.py

@@ -3,7 +3,6 @@ import sys
 from dataclasses import dataclass
 from typing import (
     Any,
-    Optional,
     TypeVar,
 )
 
@@ -44,7 +43,7 @@ class IntegrationRunConfiguration:
     potential problems with the integration or the configuration data from app-interface.
     """
 
-    early_exit_compare_sha: Optional[str]
+    early_exit_compare_sha: str | None
     """
     The SHA of the bundle to compare the current desired state against.
     """
@@ -66,11 +65,11 @@ class IntegrationRunConfiguration:
     A debug flag to control whether the URL of the GraphQL endpoint in use is printed.
     """
 
-    def main_bundle_desired_state(self) -> Optional[dict[str, Any]]:
+    def main_bundle_desired_state(self) -> dict[str, Any] | None:
         self.switch_to_main_bundle()
         return self.integration.get_early_exit_desired_state()
 
-    def comparison_bundle_desired_state(self) -> Optional[dict[str, Any]]:
+    def comparison_bundle_desired_state(self) -> dict[str, Any] | None:
         self.switch_to_comparison_bundle()
         data = (  # pylint: disable=assignment-from-none
             self.integration.get_early_exit_desired_state()
@@ -78,7 +77,7 @@ class IntegrationRunConfiguration:
         self.switch_to_main_bundle()
         return data
 
-    def switch_to_main_bundle(self, validate_schemas: Optional[bool] = None) -> None:
+    def switch_to_main_bundle(self, validate_schemas: bool | None = None) -> None:
         final_validate_schemas = (
             validate_schemas if validate_schemas is not None else self.valdiate_schemas
         )
@@ -89,9 +88,7 @@ class IntegrationRunConfiguration:
             print_url=self.print_url,
         )
 
-    def switch_to_comparison_bundle(
-        self, validate_schemas: Optional[bool] = None
-    ) -> None:
+    def switch_to_comparison_bundle(self, validate_schemas: bool | None = None) -> None:
         final_validate_schemas = (
             validate_schemas if validate_schemas is not None else self.valdiate_schemas
         )
@@ -105,7 +102,7 @@ class IntegrationRunConfiguration:
 
 def get_desired_state_diff(
     run_cfg: IntegrationRunConfiguration,
-) -> Optional[DesiredStateDiff]:
+) -> DesiredStateDiff | None:
     """
     Calculates the desired state diff between the current bundle and the
     comparison bundle for an integration. If the integration does not support
@@ -172,7 +169,7 @@ def _integration_wet_run(
 
 def _integration_dry_run(
     integration: QontractReconcileIntegration[RunParamsTypeVar],
-    desired_state_diff: Optional[DesiredStateDiff],
+    desired_state_diff: DesiredStateDiff | None,
 ) -> None:
     """
     Runs an integration in dry-run mode, i.e. not actually making any changes

reconcile/utils/runtime/sharding.py

@@ -2,9 +2,7 @@ import copy
 from collections.abc import Iterable
 from dataclasses import dataclass
 from typing import (
-    Optional,
     Protocol,
-    Union,
 )
 
 from pydantic import BaseModel
@@ -46,16 +44,15 @@ from reconcile.utils.runtime.meta import IntegrationMeta
 
 class ShardSpec(BaseModel):
     # Base Sharding
-    shards: Optional[str] = ""
-    shard_id: Optional[str] = ""
-    shard_spec_overrides: Optional[
-        Union[
-            AWSAccountShardSpecOverrideV1,
-            OpenshiftClusterShardSpecOverrideV1,
-            CloudflareDNSZoneShardSpecOverrideV1,
-            OCMOrganizationShardSpecOverrideV1,
-        ]
-    ] = None
+    shards: str | None = ""
+    shard_id: str | None = ""
+    shard_spec_overrides: (
+        AWSAccountShardSpecOverrideV1
+        | OpenshiftClusterShardSpecOverrideV1
+        | CloudflareDNSZoneShardSpecOverrideV1
+        | OCMOrganizationShardSpecOverrideV1
+        | None
+    ) = None
 
     # Key sharding
     shard_key: str = ""
@@ -136,7 +133,7 @@ class AWSAccountShardingStrategy:
 
     def __init__(
         self,
-        aws_accounts: Optional[Iterable[sharding_aws_accounts.AWSAccountV1]] = None,
+        aws_accounts: Iterable[sharding_aws_accounts.AWSAccountV1] | None = None,
     ):
         if not aws_accounts:
             self.aws_accounts = (
@@ -162,7 +159,7 @@ class AWSAccountShardingStrategy:
         ]
 
     def get_shard_spec_overrides(
-        self, sharding: Optional[IntegrationShardingV1]
+        self, sharding: IntegrationShardingV1 | None
     ) -> dict[str, AWSAccountShardSpecOverrideV1]:
         spos: dict[str, AWSAccountShardSpecOverrideV1] = {}
 
@@ -183,7 +180,7 @@ class AWSAccountShardingStrategy:
         self,
         aws_account: sharding_aws_accounts.AWSAccountV1,
         integration_spec: IntegrationSpecV1,
-        spo: Optional[AWSAccountShardSpecOverrideV1],
+        spo: AWSAccountShardSpecOverrideV1 | None,
     ) -> ShardSpec:
         return ShardSpec(
             shard_key=aws_account.name,
@@ -213,7 +210,7 @@ class OCMOrganizationShardingStrategy:
 
     def __init__(
         self,
-        ocm_organizations: Optional[Iterable[MinimalOCMOrganization]] = None,
+        ocm_organizations: Iterable[MinimalOCMOrganization] | None = None,
     ):
         if not ocm_organizations:
             self.ocm_organizations = (
@@ -226,7 +223,7 @@ class OCMOrganizationShardingStrategy:
             self.ocm_organizations = list(ocm_organizations)
 
     def get_shard_spec_overrides(
-        self, sharding: Optional[IntegrationShardingV1]
+        self, sharding: IntegrationShardingV1 | None
     ) -> dict[str, OCMOrganizationShardSpecOverrideV1]:
         spos: dict[str, OCMOrganizationShardSpecOverrideV1] = {}
 
@@ -249,7 +246,7 @@ class OCMOrganizationShardingStrategy:
         self,
         org: MinimalOCMOrganization,
         integration_spec: IntegrationSpecV1,
-        spo: Optional[OCMOrganizationShardSpecOverrideV1],
+        spo: OCMOrganizationShardSpecOverrideV1 | None,
     ) -> ShardSpec:
         return ShardSpec(
             shard_key=org.org_id,
@@ -276,7 +273,7 @@ class OCMOrganizationShardingStrategy:
 class OpenshiftClusterShardingStrategy:
     IDENTIFIER = "per-openshift-cluster"
 
-    def __init__(self, clusters: Optional[Iterable[ClusterV1]] = None):
+    def __init__(self, clusters: Iterable[ClusterV1] | None = None):
         if not clusters:
             self.clusters = get_clusters_minimal()
         else:
@@ -300,7 +297,7 @@ class OpenshiftClusterShardingStrategy:
         ]
 
     def get_shard_spec_overrides(
-        self, sharding: Optional[IntegrationShardingV1]
+        self, sharding: IntegrationShardingV1 | None
     ) -> dict[str, OpenshiftClusterShardSpecOverrideV1]:
         spos: dict[str, OpenshiftClusterShardSpecOverrideV1] = {}
 
@@ -324,7 +321,7 @@ class OpenshiftClusterShardingStrategy:
         self,
         cluster: ClusterV1,
         integration_spec: IntegrationSpecV1,
-        spo: Optional[OpenshiftClusterShardSpecOverrideV1],
+        spo: OpenshiftClusterShardSpecOverrideV1 | None,
     ) -> ShardSpec:
         return ShardSpec(
             shard_key=cluster.name,
@@ -335,7 +332,7 @@ class OpenshiftClusterShardingStrategy:
         )
 
     def build_sub_shards(
-        self, base_shard: ShardSpec, spo: Optional[OpenshiftClusterShardSpecOverrideV1]
+        self, base_shard: ShardSpec, spo: OpenshiftClusterShardSpecOverrideV1 | None
     ) -> list[ShardSpec]:
         sub_shards = []
         if spo and spo.sub_sharding and spo.sub_sharding.strategy:
@@ -374,9 +371,7 @@ class CloudflareDnsZoneShardingStrategy:
 
     IDENTIFIER = "per-cloudflare-dns-zone"
 
-    def __init__(
-        self, cloudflare_zones: Optional[Iterable[CloudflareDnsZoneV1]] = None
-    ):
+    def __init__(self, cloudflare_zones: Iterable[CloudflareDnsZoneV1] | None = None):
         if not cloudflare_zones:
             self.cloudflare_zones = (
                 terraform_cloudflare_zones.query(query_func=gql.get_api().query).zones
@@ -389,7 +384,7 @@ class CloudflareDnsZoneShardingStrategy:
         return f"{dns_zone.account.name}-{dns_zone.identifier}"
 
     def get_shard_spec_overrides(
-        self, sharding: Optional[IntegrationShardingV1]
+        self, sharding: IntegrationShardingV1 | None
     ) -> dict[str, CloudflareDNSZoneShardSpecOverrideV1]:
         spos: dict[str, CloudflareDNSZoneShardSpecOverrideV1] = {}
 
@@ -414,7 +409,7 @@ class CloudflareDnsZoneShardingStrategy:
         self,
         dns_zone: CloudflareDnsZoneV1,
         integration_spec: IntegrationSpecV1,
-        spo: Optional[CloudflareDNSZoneShardSpecOverrideV1],
+        spo: CloudflareDNSZoneShardSpecOverrideV1 | None,
     ) -> ShardSpec:
         return ShardSpec(
             shard_key=self._get_shard_key(dns_zone),