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

reconcile/utils/saasherder/interfaces.py

@@ -1,13 +1,9 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Mapping, Sequence, Set
 from typing import (
-    AbstractSet,
     Any,
-    Mapping,
-    Optional,
     Protocol,
-    Union,
     runtime_checkable,
 )
 
@@ -17,7 +13,7 @@ from reconcile.utils.secret_reader import HasSecret
 
 @runtime_checkable
 class HasParameters(Protocol):
-    parameters: Optional[dict[str, Any]]
+    parameters: dict[str, Any] | None
 
 
 class SaasFileSecretParameters(Protocol):
@@ -30,14 +26,14 @@ class SaasFileSecretParameters(Protocol):
         self,
         *,
         by_alias: bool = False,
-        include: Optional[Union[AbstractSetIntStr, MappingIntStrAny]] = None,
+        include: AbstractSetIntStr | MappingIntStrAny | None = None,
     ) -> dict[str, Any]: ...
 
 
-SaasSecretParameters = Optional[Sequence[SaasFileSecretParameters]]
+SaasSecretParameters = Sequence[SaasFileSecretParameters] | None
 # Taken from pydantic.typing
-AbstractSetIntStr = AbstractSet[Union[int, str]]
-MappingIntStrAny = Mapping[Union[int, str], Any]
+AbstractSetIntStr = Set[int | str]
+MappingIntStrAny = Mapping[int | str, Any]
 
 
 @runtime_checkable
@@ -55,16 +51,16 @@ class SaasApp(Protocol):
     name: str
 
     @property
-    def parent_app(self) -> Optional[SaasParentApp]: ...
+    def parent_app(self) -> SaasParentApp | None: ...
 
     @property
-    def self_service_roles(self) -> Optional[Sequence[SaasRole]]: ...
+    def self_service_roles(self) -> Sequence[SaasRole] | None: ...
 
     @property
-    def service_owners(self) -> Optional[Sequence[SaasServiceOwner]]: ...
+    def service_owners(self) -> Sequence[SaasServiceOwner] | None: ...
 
     @property
-    def code_components(self) -> Optional[Sequence[AppCodeComponent]]: ...
+    def code_components(self) -> Sequence[AppCodeComponent] | None: ...
 
 
 class SaasPipelinesProvider(Protocol):
@@ -126,7 +122,7 @@ class SaasPipelinesProviderTekton(Protocol):
     @property
     def pipeline_templates(
         self,
-    ) -> Optional[SaasPipelinesProviderTekton_PipelinesProviderPipelineTemplates]: ...
+    ) -> SaasPipelinesProviderTekton_PipelinesProviderPipelineTemplates | None: ...
 
 
 class SaasResourceRequestsRequirements(Protocol):
@@ -135,7 +131,7 @@ class SaasResourceRequestsRequirements(Protocol):
 
 
 class SaasResourceLimitsRequirements(Protocol):
-    cpu: Optional[str]
+    cpu: str | None
     memory: str
 
 
@@ -161,30 +157,30 @@ class SaasSlackWorkspace(Protocol):
     name: str
 
     @property
-    def integrations(self) -> Optional[Sequence[SaasSlackWorkspaceIntegration]]: ...
+    def integrations(self) -> Sequence[SaasSlackWorkspaceIntegration] | None: ...
 
 
 class SaasSlackOutputNotifications(Protocol):
-    start: Optional[bool]
+    start: bool | None
 
 
 class SaasSlackOutput(Protocol):
-    output: Optional[str]
-    channel: Optional[str]
+    output: str | None
+    channel: str | None
 
     @property
     def workspace(self) -> SaasSlackWorkspace: ...
 
     @property
-    def notifications(self) -> Optional[SaasSlackOutputNotifications]: ...
+    def notifications(self) -> SaasSlackOutputNotifications | None: ...
 
 
 class SaasFileAuthentication(Protocol):
     @property
-    def code(self) -> Optional[HasSecret]: ...
+    def code(self) -> HasSecret | None: ...
 
     @property
-    def image(self) -> Optional[HasSecret]: ...
+    def image(self) -> HasSecret | None: ...
 
 
 class SaasEnvironment_SaasSecretParameters(Protocol):
@@ -215,7 +211,7 @@ class SaasResourceTemplateTargetNamespace(Protocol):
         self,
         *,
         by_alias: bool = False,
-        include: Optional[Union[AbstractSetIntStr, MappingIntStrAny]] = None,
+        include: AbstractSetIntStr | MappingIntStrAny | None = None,
     ) -> dict[str, Any]: ...
 
 
@@ -226,29 +222,27 @@ class SaasPromotionChannelData(Protocol):
 @runtime_checkable
 class SaasParentSaasPromotion(Protocol):
     q_type: str
-    parent_saas: Optional[str]
-    target_config_hash: Optional[str]
+    parent_saas: str | None
+    target_config_hash: str | None
 
 
 class SaasPromotionData(Protocol):
-    channel: Optional[str]
+    channel: str | None
 
     @property
     def data(
         self,
-    ) -> Optional[
-        Sequence[Union[SaasParentSaasPromotion, SaasPromotionChannelData]]
-    ]: ...
+    ) -> Sequence[SaasParentSaasPromotion | SaasPromotionChannelData] | None: ...
 
 
 class SaasResourceTemplateTargetPromotion(Protocol):
-    auto: Optional[bool]
-    publish: Optional[list[str]]
-    subscribe: Optional[list[str]]
-    soak_days: Optional[int]
+    auto: bool | None
+    publish: list[str] | None
+    subscribe: list[str] | None
+    soak_days: int | None
 
     @property
-    def promotion_data(self) -> Optional[Sequence[SaasPromotionData]]: ...
+    def promotion_data(self) -> Sequence[SaasPromotionData] | None: ...
 
 
 class Channel(Protocol):
@@ -261,17 +255,17 @@ class SaasPromotion(Protocol):
     commit_sha: str
     saas_file: str
     target_config_hash: str
-    auto: Optional[bool] = None
-    publish: Optional[list[str]] = None
-    saas_file_paths: Optional[list[str]] = None
-    target_paths: Optional[list[str]] = None
-    soak_days: Optional[int] = None
+    auto: bool | None = None
+    publish: list[str] | None = None
+    saas_file_paths: list[str] | None = None
+    target_paths: list[str] | None = None
+    soak_days: int | None = None
 
     @property
-    def promotion_data(self) -> Optional[Sequence[SaasPromotionData]]: ...
+    def promotion_data(self) -> Sequence[SaasPromotionData] | None: ...
 
     @property
-    def subscribe(self) -> Optional[list[Channel]]: ...
+    def subscribe(self) -> list[Channel] | None: ...
 
     def dict(self, *, by_alias: bool = False) -> dict[str, Any]: ...
 
@@ -314,23 +308,23 @@ class SaasResourceTemplateTargetImage(Protocol):
 
 
 class SaasResourceTemplateTarget(HasParameters, HasSecretParameters, Protocol):
-    path: Optional[str]
-    name: Optional[str]
-    disable: Optional[bool]
-    delete: Optional[bool]
+    path: str | None
+    name: str | None
+    disable: bool | None
+    delete: bool | None
     ref: str
 
     @property
     def namespace(self) -> SaasResourceTemplateTargetNamespace: ...
 
     @property
-    def promotion(self) -> Optional[SaasResourceTemplateTargetPromotion]: ...
+    def promotion(self) -> SaasResourceTemplateTargetPromotion | None: ...
 
     @property
-    def upstream(self) -> Optional[SaasResourceTemplateTargetUpstream]: ...
+    def upstream(self) -> SaasResourceTemplateTargetUpstream | None: ...
 
     @property
-    def image(self) -> Optional[SaasResourceTemplateTargetImage]: ...
+    def image(self) -> SaasResourceTemplateTargetImage | None: ...
 
     def uid(
         self, parent_saas_file_name: str, parent_resource_template_name: str
@@ -343,8 +337,8 @@ class SaasResourceTemplate(HasParameters, HasSecretParameters, Protocol):
     name: str
     url: str
     path: str
-    provider: Optional[str]
-    hash_length: Optional[int]
+    provider: str | None
+    hash_length: int | None
 
     @property
     def targets(self) -> Sequence[SaasResourceTemplateTarget]: ...
@@ -361,11 +355,11 @@ class SaasServiceOwner(Protocol):
 
 class AppCodeComponent(Protocol):
     url: str
-    blocked_versions: Optional[list[str]]
-    hotfix_versions: Optional[list[str]]
+    blocked_versions: list[str] | None
+    hotfix_versions: list[str] | None
 
 
-SaasPipelinesProviders = Union[SaasPipelinesProviderTekton, SaasPipelinesProvider]
+SaasPipelinesProviders = SaasPipelinesProviderTekton | SaasPipelinesProvider
 
 
 @runtime_checkable
@@ -377,18 +371,18 @@ class ManagedResourceName(Protocol):
 class SaasFile(HasParameters, HasSecretParameters, Protocol):
     path: str
     name: str
-    labels: Optional[dict[str, Any]]
+    labels: dict[str, Any] | None
     managed_resource_types: list[str]
-    takeover: Optional[bool]
-    deprecated: Optional[bool]
-    compare: Optional[bool]
-    timeout: Optional[str]
-    publish_job_logs: Optional[bool]
-    cluster_admin: Optional[bool]
+    takeover: bool | None
+    deprecated: bool | None
+    compare: bool | None
+    timeout: str | None
+    publish_job_logs: bool | None
+    cluster_admin: bool | None
     image_patterns: list[str]
-    allowed_secret_parameter_paths: Optional[list[str]]
-    use_channel_in_image_tag: Optional[bool]
-    validate_targets_in_app: Optional[bool]
+    allowed_secret_parameter_paths: list[str] | None
+    use_channel_in_image_tag: bool | None
+    validate_targets_in_app: bool | None
 
     @property
     def app(self) -> SaasApp: ...
@@ -397,19 +391,19 @@ class SaasFile(HasParameters, HasSecretParameters, Protocol):
     def pipelines_provider(self) -> SaasPipelinesProviders: ...
 
     @property
-    def deploy_resources(self) -> Optional[SaasDeployResources]: ...
+    def deploy_resources(self) -> SaasDeployResources | None: ...
 
     @property
-    def slack(self) -> Optional[SaasSlackOutput]: ...
+    def slack(self) -> SaasSlackOutput | None: ...
 
     @property
-    def authentication(self) -> Optional[SaasFileAuthentication]: ...
+    def authentication(self) -> SaasFileAuthentication | None: ...
 
     @property
     def resource_templates(self) -> Sequence[SaasResourceTemplate]: ...
 
     @property
-    def self_service_roles(self) -> Optional[Sequence[SaasRole]]: ...
+    def self_service_roles(self) -> Sequence[SaasRole] | None: ...
 
     @property
-    def managed_resource_names(self) -> Optional[Sequence[ManagedResourceName]]: ...
+    def managed_resource_names(self) -> Sequence[ManagedResourceName] | None: ...

reconcile/utils/saasherder/models.py

@@ -1,13 +1,8 @@
 import base64
-from collections.abc import Iterable
+from collections.abc import Iterable, Sequence
 from dataclasses import dataclass
 from enum import Enum
-from typing import (
-    Any,
-    Optional,
-    Sequence,
-    Union,
-)
+from typing import Any
 
 from github import Github
 from pydantic import (
@@ -52,7 +47,7 @@ class UpstreamJob:
 class TriggerSpecBase:
     saas_file_name: str
     env_name: str
-    timeout: Optional[str]
+    timeout: str | None
     pipelines_provider: SaasPipelinesProviders
     resource_template_name: str
     cluster_name: str
@@ -66,8 +61,8 @@ class TriggerSpecBase:
 
 @dataclass
 class TriggerSpecConfig(TriggerSpecBase):
-    target_name: Optional[str] = None
-    reason: Optional[str] = None
+    target_name: str | None = None
+    reason: str | None = None
 
     @property
     def state_key(self) -> str:
@@ -83,7 +78,7 @@ class TriggerSpecConfig(TriggerSpecBase):
 @dataclass
 class TriggerSpecMovingCommit(TriggerSpecBase):
     ref: str
-    reason: Optional[str] = None
+    reason: str | None = None
 
     @property
     def state_key(self) -> str:
@@ -98,7 +93,7 @@ class TriggerSpecMovingCommit(TriggerSpecBase):
 class TriggerSpecUpstreamJob(TriggerSpecBase):
     instance_name: str
     job_name: str
-    reason: Optional[str] = None
+    reason: str | None = None
 
     @property
     def state_key(self) -> str:
@@ -112,7 +107,7 @@ class TriggerSpecUpstreamJob(TriggerSpecBase):
 @dataclass
 class TriggerSpecContainerImage(TriggerSpecBase):
     image: str
-    reason: Optional[str] = None
+    reason: str | None = None
 
     @property
     def state_key(self) -> str:
@@ -123,12 +118,12 @@ class TriggerSpecContainerImage(TriggerSpecBase):
         return key
 
 
-TriggerSpecUnion = Union[
-    TriggerSpecConfig,
-    TriggerSpecMovingCommit,
-    TriggerSpecUpstreamJob,
-    TriggerSpecContainerImage,
-]
+TriggerSpecUnion = (
+    TriggerSpecConfig
+    | TriggerSpecMovingCommit
+    | TriggerSpecUpstreamJob
+    | TriggerSpecContainerImage
+)
 
 
 class Namespace(BaseModel):
@@ -137,7 +132,7 @@ class Namespace(BaseModel):
     app: SaasApp
     cluster: Cluster
     managed_resource_types: list[str] = Field(..., alias="managedResourceTypes")
-    managed_resource_names: Optional[Sequence[ManagedResourceName]] = Field(
+    managed_resource_names: Sequence[ManagedResourceName] | None = Field(
         ..., alias="managedResourceNames"
     )
 
@@ -155,16 +150,16 @@ class PromotionChannelData(BaseModel):
 
 class ParentSaasPromotion(BaseModel):
     q_type: str = Field(..., alias="type")
-    parent_saas: Optional[str]
-    target_config_hash: Optional[str]
+    parent_saas: str | None
+    target_config_hash: str | None
 
     class Config:
         allow_population_by_field_name = True
 
 
 class PromotionData(BaseModel):
-    channel: Optional[str]
-    data: Optional[list[Union[ParentSaasPromotion, PromotionChannelData]]] = None
+    channel: str | None
+    data: list[ParentSaasPromotion | PromotionChannelData] | None = None
 
 
 class Channel(BaseModel):
@@ -181,20 +176,20 @@ class Promotion(BaseModel):
     target_config_hash: str
     saas_target_uid: str
     soak_days: int
-    auto: Optional[bool] = None
-    publish: Optional[list[str]] = None
-    subscribe: Optional[list[Channel]] = None
-    promotion_data: Optional[list[PromotionData]] = None
-    saas_file_paths: Optional[list[str]] = None
-    target_paths: Optional[list[str]] = None
+    auto: bool | None = None
+    publish: list[str] | None = None
+    subscribe: list[Channel] | None = None
+    promotion_data: list[PromotionData] | None = None
+    saas_file_paths: list[str] | None = None
+    target_paths: list[str] | None = None
 
 
 @dataclass
 class ImageAuth:
-    username: Optional[str] = None
-    password: Optional[str] = None
-    auth_server: Optional[str] = None
-    docker_config: Optional[dict[str, dict[str, dict[str, str]]]] = None
+    username: str | None = None
+    password: str | None = None
+    auth_server: str | None = None
+    docker_config: dict[str, dict[str, dict[str, str]]] | None = None
 
     def getDockerConfigJson(self) -> dict:
         if self.docker_config:
@@ -219,7 +214,7 @@ class TargetSpec:
     cluster: str
     namespace: str
     managed_resource_types: Iterable[str]
-    managed_resource_names: Optional[Sequence[ManagedResourceName]]
+    managed_resource_names: Sequence[ManagedResourceName] | None
     delete: bool
     privileged: bool
     image_auth: ImageAuth

reconcile/utils/saasherder/saasherder.py

@@ -10,22 +10,16 @@ from collections import (
     defaultdict,
 )
 from collections.abc import (
+    Generator,
     Iterable,
     Mapping,
     MutableMapping,
     Sequence,
 )
 from contextlib import suppress
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from types import TracebackType
-from typing import (
-    Any,
-    Generator,
-    Optional,
-    Tuple,
-    Type,
-    Union,
-)
+from typing import Any
 from urllib.parse import urlparse
 
 import yaml
@@ -121,12 +115,12 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         secret_reader: SecretReaderBase,
         hash_length: int,
         repo_url: str,
-        gitlab: Optional[GitLabApi] = None,
-        jenkins_map: Optional[dict[str, JenkinsApi]] = None,
-        state: Optional[State] = None,
+        gitlab: GitLabApi | None = None,
+        jenkins_map: dict[str, JenkinsApi] | None = None,
+        state: State | None = None,
         validate: bool = False,
         include_trigger_trace: bool = False,
-        all_saas_files: Optional[Iterable[SaasFile]] = None,
+        all_saas_files: Iterable[SaasFile] | None = None,
     ):
         self.error_registered = False
         self.saas_files = saas_files
@@ -171,9 +165,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
 
     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:
         self.cleanup()
 
@@ -203,8 +197,8 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     yield (saas_file, resource_template, target)
 
     def _get_saas_file_feature_enabled(
-        self, name: str, default: Optional[bool] = None
-    ) -> Optional[bool]:
+        self, name: str, default: bool | None = None
+    ) -> bool | None:
         """Returns a bool indicating if a feature is enabled in a saas file,
         or a supplied default. Returns False if there are multiple
         saas files in the process.
@@ -434,9 +428,8 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 self.valid = False
                 # This should never be possible theoretically ...
                 logging.error(
-                    "Non-unique resource template reference {} in " "channel {}".format(
-                        rt_ref, channel
-                    )
+                    f"Non-unique resource template reference {rt_ref} in "
+                    f"channel {channel}"
                 )
                 continue
             publications[channel].add(rt_ref)
@@ -461,9 +454,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     self.valid = False
                     logging.error(
                         "Channel is not published by any target\n"
-                        "subscriber_saas: {}\n"
-                        "subscriber_rt: {}\n"
-                        "channel: {}".format(sub_saas, sub_rt_name, sub_channel)
+                        f"subscriber_saas: {sub_saas}\n"
+                        f"subscriber_rt: {sub_rt_name}\n"
+                        f"channel: {sub_channel}"
                     )
                 for pub_ref in pub_channel_refs:
                     (pub_saas, pub_rt_name, pub_rt_url, _) = pub_ref
@@ -472,26 +465,19 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                         logging.error(
                             "Subscriber and Publisher targets have different "
                             "source repositories\n"
-                            "publisher_saas: {}\n"
-                            "publisher_rt: {}\n"
-                            "publisher_repo: {}\n"
-                            "subscriber_saas: {}\n"
-                            "subscriber_rt: {}\n"
-                            "subscriber_repo: {}\n".format(
-                                pub_saas,
-                                pub_rt_name,
-                                pub_rt_url,
-                                sub_saas,
-                                sub_rt_name,
-                                sub_rt_url,
-                            )
+                            f"publisher_saas: {pub_saas}\n"
+                            f"publisher_rt: {pub_rt_name}\n"
+                            f"publisher_repo: {pub_rt_url}\n"
+                            f"subscriber_saas: {sub_saas}\n"
+                            f"subscriber_rt: {sub_rt_name}\n"
+                            f"subscriber_repo: {sub_rt_url}\n"
                         )
 
     @staticmethod
     def build_saas_file_env_combo(
         saas_file_name: str,
         env_name: str,
-    ) -> Tuple[str, str]:
+    ) -> tuple[str, str]:
         """
         Build a tuple of short and long names for a saas file and environment combo,
         max tekton pipelinerun name length can be 63,
@@ -903,7 +889,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
 
     def _process_template(
         self, spec: TargetSpec
-    ) -> tuple[list[Any], str, Optional[Promotion]]:
+    ) -> tuple[list[Any], str, Promotion | None]:
         saas_file_name = spec.saas_file_name
         resource_template_name = spec.resource_template_name
         image_auth = spec.image_auth
@@ -1076,7 +1062,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         return resources, html_url, target_promotion
 
     def _assemble_channels(
-        self, saas_files: Optional[Iterable[SaasFile]]
+        self, saas_files: Iterable[SaasFile] | None
     ) -> dict[str, Channel]:
         """
         We need to assemble all publisher_uids that are publishing to a channel.
@@ -1157,7 +1143,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         image_patterns: Iterable[str],
         image_auth: ImageAuth,
         error_prefix: str,
-    ) -> Optional[Image]:
+    ) -> Image | None:
         if not image_patterns:
             logging.error(
                 f"{error_prefix} imagePatterns is empty (does not contain {image})"
@@ -1230,7 +1216,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         return None in images
 
     def _initiate_github(
-        self, saas_file: SaasFile, base_url: Optional[str] = None
+        self, saas_file: SaasFile, base_url: str | None = None
     ) -> Github:
         token = (
             self.secret_reader.read_secret(saas_file.authentication.code)
@@ -1293,7 +1279,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             self.thread_pool_size,
             ri=ri,
         )
-        self.promotions: list[Optional[Promotion]] = promotions
+        self.promotions: list[Promotion | None] = promotions
 
     def _init_populate_desired_state_specs(
         self, saas_file: SaasFile
@@ -1368,7 +1354,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
 
     def populate_desired_state_saas_file(
         self, spec: TargetSpec, ri: ResourceInventory
-    ) -> Optional[Promotion]:
+    ) -> Promotion | None:
         if spec.delete:
             # to delete resources, we avoid adding them to the desired state
             return None
@@ -1460,12 +1446,10 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
     def get_diff(
         self, trigger_type: TriggerTypes, dry_run: bool
     ) -> tuple[
-        Union[
-            list[TriggerSpecConfig],
-            list[TriggerSpecMovingCommit],
-            list[TriggerSpecUpstreamJob],
-            list[TriggerSpecContainerImage],
-        ],
+        list[TriggerSpecConfig]
+        | list[TriggerSpecMovingCommit]
+        | list[TriggerSpecUpstreamJob]
+        | list[TriggerSpecContainerImage],
         bool,
     ]:
         if trigger_type == TriggerTypes.MOVING_COMMITS:
@@ -1759,7 +1743,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         return list(itertools.chain.from_iterable(results))
 
     @staticmethod
-    def remove_none_values(d: Optional[dict[Any, Any]]) -> dict[Any, Any]:
+    def remove_none_values(d: dict[Any, Any] | None) -> dict[Any, Any]:
         if d is None:
             return {}
         new = {}
@@ -1916,7 +1900,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         if promotion.commit_sha in self.hotfix_versions.get(promotion.url, set()):
             return True
 
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
         passed_soak_days = timedelta(days=0)
 
         for channel in promotion.subscribe:
@@ -2016,7 +2000,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         if not (self.state and self._promotion_state):
             raise Exception("state is not initialized")
 
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
         for promotion in self.promotions:
             if promotion is None:
                 continue