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

reconcile/glitchtip_project_alerts/integration.py

@@ -4,10 +4,7 @@ from collections.abc import (
     Callable,
     Iterable,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 from urllib.parse import urlencode
 
 from reconcile import jira_permissions_validator
@@ -46,7 +43,7 @@ ProjectStates = dict[str, Project]
 
 
 class GlitchtipProjectAlertsIntegrationParams(PydanticRunParams):
-    instance: Optional[str] = None
+    instance: str | None = None
 
 
 def webhook_urls_are_unique(alerts: Iterable[ProjectAlert]) -> bool:
@@ -70,7 +67,7 @@ class GlitchtipProjectAlertsIntegration(
     def name(self) -> str:
         return QONTRACT_INTEGRATION
 
-    def get_early_exit_desired_state(self) -> Optional[dict[str, Any]]:
+    def get_early_exit_desired_state(self) -> dict[str, Any] | None:
         return {"projects": [c.dict() for c in self.get_projects(gql.get_api().query)]}
 
     def get_projects(self, query_func: Callable) -> list[GlitchtipProjectV1]:

reconcile/glitchtip_project_dsn/integration.py

@@ -3,10 +3,7 @@ from collections.abc import (
     Callable,
     Iterable,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from sretoolbox.utils import threaded
 
@@ -169,10 +166,10 @@ def projects_query(query_func: Callable) -> list[GlitchtipProjectV1]:
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
-    instance: Optional[str] = None,
-    defer: Optional[Callable] = None,
+    instance: str | None = None,
+    defer: Callable | None = None,
 ) -> None:
     # settings
     vault_settings = get_app_interface_vault_settings()

reconcile/integrations_manager.py

@@ -6,10 +6,7 @@ from collections.abc import (
     Mapping,
     Sequence,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from github import Github
 from pydantic import BaseModel
@@ -76,7 +73,7 @@ def collect_parameters(
     environment: EnvironmentV1,
     upstream: str,
     image: str,
-    image_tag_from_ref: Optional[Mapping[str, str]],
+    image_tag_from_ref: Mapping[str, str] | None,
 ) -> dict[str, Any]:
     parameters: dict[str, Any] = {}
     if environment.parameters:
@@ -180,7 +177,7 @@ def construct_oc_resources(
     integrations_environment: IntegrationsEnvironment,
     upstream: str,
     image: str,
-    image_tag_from_ref: Optional[Mapping[str, str]],
+    image_tag_from_ref: Mapping[str, str] | None,
 ) -> list[OpenshiftResource]:
     # Generate the openshift template with the helm chart. The resulting template
     # contains all the integrations in the environment
@@ -213,7 +210,7 @@ def fetch_desired_state(
     ri: ResourceInventory,
     upstream: str,
     image: str,
-    image_tag_from_ref: Optional[Mapping[str, str]],
+    image_tag_from_ref: Mapping[str, str] | None,
 ):
     for ie in integrations_environments:
         oc_resources = construct_oc_resources(ie, upstream, image, image_tag_from_ref)
@@ -224,7 +221,7 @@ def fetch_desired_state(
 
 
 def filter_integrations(
-    integrations: Iterable[IntegrationV1], upstream: Optional[str] = None
+    integrations: Iterable[IntegrationV1], upstream: str | None = None
 ) -> list[IntegrationV1]:
     if upstream is None:
         return list(integrations)

reconcile/jenkins/types.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from enum import Enum
-from typing import Optional
 
 from pydantic import (
     BaseModel,
@@ -22,11 +21,11 @@ class SSHHostKeyVerificationStrategy(Enum):
 
 class SSHConnector(BaseModel):
     credentials_id: str = Field(..., alias="credentialsId")
-    launch_timeout_seconds: Optional[int] = Field(None, alias="launchTimeoutSeconds")
-    max_num_retries: Optional[int] = Field(None, alias="maxNumRetries")
-    retry_wait_time: Optional[int] = Field(None, alias="retryWaitTime")
-    port: Optional[int] = 22
-    jvm_options: Optional[str] = Field(None, alias="jvmOptions")
+    launch_timeout_seconds: int | None = Field(None, alias="launchTimeoutSeconds")
+    max_num_retries: int | None = Field(None, alias="maxNumRetries")
+    retry_wait_time: int | None = Field(None, alias="retryWaitTime")
+    port: int | None = 22
+    jvm_options: str | None = Field(None, alias="jvmOptions")
     ssh_host_key_verification_strategy: SSHHostKeyVerificationStrategy = Field(
         SSHHostKeyVerificationStrategy.NON_VERIFYING_KEY_VERIFICATION_STRATEGY,
         alias="sshHostKeyVerificationStrategy",

reconcile/jenkins_job_builder.py

@@ -1,10 +1,7 @@
 import logging
 import sys
 from collections.abc import Callable
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile import queries
 from reconcile.utils.defer import defer
@@ -20,7 +17,7 @@ GENERATE_TYPE = ["jobs", "views"]
 
 
 def collect_configs(
-    instance_name: Optional[str], config_name: Optional[str]
+    instance_name: str | None, config_name: str | None
 ) -> list[dict[str, Any]]:
     configs = queries.get_jenkins_configs()
     if instance_name is not None:
@@ -41,8 +38,8 @@ def collect_configs(
 
 def init_jjb(
     secret_reader: SecretReaderBase,
-    instance_name: Optional[str] = None,
-    config_name: Optional[str] = None,
+    instance_name: str | None = None,
+    config_name: str | None = None,
     print_only: bool = False,
 ) -> JJB:
     configs = collect_configs(instance_name, config_name)
@@ -66,7 +63,7 @@ def validate_repos_and_admins(jjb: JJB):
     )
     unknown_admins = [a for a in jjb_admins if a not in github_usernames]
     for a in unknown_admins:
-        logging.warning("admin is missing from users: {}".format(a))
+        logging.warning(f"admin is missing from users: {a}")
     if missing_repos:
         sys.exit(1)
 
@@ -76,10 +73,10 @@ def run(
     dry_run: bool,
     io_dir: str = "throughput/",
     print_only: bool = False,
-    config_name: Optional[str] = None,
-    job_name: Optional[str] = None,
-    instance_name: Optional[str] = None,
-    defer: Optional[Callable] = None,
+    config_name: str | None = None,
+    job_name: str | None = None,
+    instance_name: str | None = None,
+    defer: Callable | None = None,
 ) -> None:
     if not print_only and config_name is not None:
         raise Exception("--config-name must works with --print-only mode")

reconcile/jenkins_roles.py

@@ -170,7 +170,7 @@ def act(diff, jenkins_map):
     elif action == "unassign_role_from_user":
         jenkins_map[instance].unassign_role_from_user(role, user)
     else:
-        raise Exception("invalid action: {}".format(action))
+        raise Exception(f"invalid action: {action}")
 
 
 def run(dry_run):

reconcile/jira_watcher.py

@@ -34,8 +34,8 @@ def format_message(server, key, data, event, previous_state=None, current_state=
         if previous_state and current_state
         else ""
     )
-    url = "{}/browse/{}".format(server, key)
-    return "{} ({}) {}{}".format(url, summary, event, info)
+    url = f"{server}/browse/{key}"
+    return f"{url} ({summary}) {event}{info}"
 
 
 def calculate_diff(server, current_state, previous_state):

reconcile/ldap_groups/integration.py

@@ -3,10 +3,7 @@ from collections.abc import (
     Callable,
     Iterable,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile.gql_definitions.ldap_groups.roles import RoleV1
 from reconcile.gql_definitions.ldap_groups.roles import query as roles_query
@@ -62,7 +59,7 @@ class LdapGroupsIntegration(QontractReconcileIntegration[LdapGroupsIntegrationPa
         return {"roles": [c.dict() for c in self.get_roles(query_func)]}
 
     @defer
-    def run(self, dry_run: bool, defer: Optional[Callable] = None) -> None:
+    def run(self, dry_run: bool, defer: Callable | None = None) -> None:
         """Run the integration."""
         gql_api = gql.get_api()
         roles = self.get_roles(gql_api.query)

reconcile/ocm/types.py

@@ -1,10 +1,5 @@
 from __future__ import annotations
 
-from typing import (
-    Optional,
-    Union,
-)
-
 from pydantic import (
     BaseModel,
     Extra,
@@ -18,29 +13,29 @@ class OCMClusterAutoscale(BaseModel):
 
 
 class OCMClusterNetwork(BaseModel):
-    type: Optional[str]
+    type: str | None
     vpc: str
     service: str
     pod: str
 
 
 class OCMClusterSpec(BaseModel):
-    autoscale: Optional[OCMClusterAutoscale]
+    autoscale: OCMClusterAutoscale | None
     channel: str
-    disable_user_workload_monitoring: Optional[bool]
-    external_id: Optional[str]
-    id: Optional[str]
-    instance_type: Optional[str]
-    multi_az: Optional[bool]
-    nodes: Optional[int]
+    disable_user_workload_monitoring: bool | None
+    external_id: str | None
+    id: str | None
+    instance_type: str | None
+    multi_az: bool | None
+    nodes: int | None
     private: bool
     product: str
     provider: str
-    provision_shard_id: Optional[str]
+    provision_shard_id: str | None
     region: str
-    initial_version: Optional[str]
+    initial_version: str | None
     version: str
-    hypershift: Optional[bool]
+    hypershift: bool | None
 
     class Config:
         extra = Extra.forbid
@@ -57,7 +52,7 @@ class OSDClusterSpec(OCMClusterSpec):
 class ROSAOcmAwsStsAttrs(BaseModel):
     installer_role_arn: str
     support_role_arn: str
-    controlplane_role_arn: Optional[str]
+    controlplane_role_arn: str | None
     worker_role_arn: str
 
     class Config:
@@ -66,7 +61,7 @@ class ROSAOcmAwsStsAttrs(BaseModel):
 
 class ROSAOcmAwsAttrs(BaseModel):
     creator_role_arn: str
-    sts: Optional[ROSAOcmAwsStsAttrs]
+    sts: ROSAOcmAwsStsAttrs | None
 
     class Config:
         extra = Extra.forbid
@@ -82,9 +77,9 @@ class ROSAClusterAWSAccount(BaseModel):
 
 class ROSAClusterSpec(OCMClusterSpec):
     account: ROSAClusterAWSAccount
-    subnet_ids: Optional[list[str]]
-    availability_zones: Optional[list[str]]
-    oidc_endpoint_url: Optional[str]
+    subnet_ids: list[str] | None
+    availability_zones: list[str] | None
+    oidc_endpoint_url: str | None
 
     class Config:
         extra = Extra.forbid
@@ -93,18 +88,18 @@ class ROSAClusterSpec(OCMClusterSpec):
 class ClusterMachinePool(BaseModel):
     id: str
     instance_type: str
-    replicas: Optional[int]
-    autoscale: Optional[OCMClusterAutoscale]
+    replicas: int | None
+    autoscale: OCMClusterAutoscale | None
 
 
 class OCMSpec(BaseModel):
-    path: Optional[str]
-    spec: Union[OSDClusterSpec, ROSAClusterSpec, OCMClusterSpec]
+    path: str | None
+    spec: OSDClusterSpec | ROSAClusterSpec | OCMClusterSpec
     machine_pools: list[ClusterMachinePool] = Field(
         default_factory=list, alias="machinePools"
     )
     network: OCMClusterNetwork
-    domain: Optional[str]
+    domain: str | None
     server_url: str = Field("", alias="serverUrl")
     console_url: str = Field("", alias="consoleUrl")
     elb_fqdn: str = Field("", alias="elbFQDN")

reconcile/ocm_addons_upgrade_tests_trigger.py

@@ -1,8 +1,5 @@
 import logging
-from typing import (
-    Callable,
-    Optional,
-)
+from collections.abc import Callable
 
 from reconcile import queries
 from reconcile.typed_queries.app_interface_vault_settings import (
@@ -18,7 +15,7 @@ QONTRACT_INTEGRATION = "ocm-addons-upgrade-tests-trigger"
 
 
 @defer
-def run(dry_run: bool, defer: Optional[Callable] = None) -> None:
+def run(dry_run: bool, defer: Callable | None = None) -> None:
     settings = queries.get_app_interface_settings()
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)
@@ -40,7 +37,7 @@ def run(dry_run: bool, defer: Optional[Callable] = None) -> None:
         )
 
         ocm = ocm_map[ocm_name]
-        state_updates: dict[str, Optional[str]] = {}
+        state_updates: dict[str, str | None] = {}
         for aut in addon_upgrade_tests:
             addon_name = aut["addon"]["name"]
             addon_org_version = None

reconcile/ocm_clusters.py

@@ -4,7 +4,7 @@ from collections.abc import (
     Iterable,
     Mapping,
 )
-from typing import Any, Optional
+from typing import Any
 
 import reconcile.utils.mr.clusters_updates as cu
 import reconcile.utils.ocm as ocmmod
@@ -283,7 +283,7 @@ def get_cluster_ocm_update_spec(
 
 
 def _app_interface_updates_mr(
-    clusters_updates: Mapping[str, Any], gitlab_project_id: Optional[str], dry_run: bool
+    clusters_updates: Mapping[str, Any], gitlab_project_id: str | None, dry_run: bool
 ):
     """Creates an MR to app-interface with the necessary cluster manifest updates
 
@@ -318,15 +318,15 @@ def _cluster_is_compatible(cluster: Mapping[str, Any]) -> bool:
 
 
 class OcmClustersParams(PydanticRunParams):
-    gitlab_project_id: Optional[str] = None
+    gitlab_project_id: str | None = None
     thread_pool_size: int = 10
 
     # rosa job controller params
-    job_controller_cluster: Optional[str] = None
-    job_controller_namespace: Optional[str] = None
-    rosa_job_service_account: Optional[str] = None
-    rosa_role: Optional[str] = None
-    rosa_job_image: Optional[str] = None
+    job_controller_cluster: str | None = None
+    job_controller_namespace: str | None = None
+    rosa_job_service_account: str | None = None
+    rosa_role: str | None = None
+    rosa_job_image: str | None = None
 
 
 class OcmClusters(QontractReconcileIntegration[OcmClustersParams]):

reconcile/ocm_internal_notifications/integration.py

@@ -5,7 +5,6 @@ from collections.abc import (
     Callable,
 )
 from functools import lru_cache
-from typing import Optional
 
 from reconcile.gql_definitions.common.ocm_environments import (
     query as ocm_environment_query,
@@ -48,7 +47,7 @@ class OcmInternalNotifications(QontractReconcileIntegration[NoParams]):
     @lru_cache
     def slack_get_user_id_by_name(
         self, user_name: str, mail_address: str
-    ) -> Optional[str]:
+    ) -> str | None:
         try:
             return self.slack.get_user_id_by_name(
                 user_name=user_name, mail_address=mail_address

reconcile/ocm_labels/integration.py

@@ -5,10 +5,7 @@ from collections.abc import (
     Callable,
     Iterable,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from deepdiff import DeepHash
 from pydantic import validator
@@ -124,7 +121,7 @@ class OcmLabelsIntegration(QontractReconcileIntegration[OcmLabelsIntegrationPara
             init_aus_cluster_label_source(query_func),
         ]
 
-    def get_early_exit_desired_state(self) -> Optional[dict[str, Any]]:
+    def get_early_exit_desired_state(self) -> dict[str, Any] | None:
         gqlapi = gql.get_api()
         desired = {
             "org_labels": self.fetch_desired_state(

reconcile/ocm_machine_pools.py

@@ -3,12 +3,8 @@ from abc import (
     ABC,
     abstractmethod,
 )
-from collections.abc import Mapping
+from collections.abc import Iterable, Mapping
 from enum import Enum
-from typing import (
-    Iterable,
-    Optional,
-)
 
 from pydantic import (
     BaseModel,
@@ -100,12 +96,12 @@ class AbstractPool(ABC, BaseModel):
     # Abstract class for machine pools, to be implemented by OSD/HyperShift classes
 
     id: str
-    replicas: Optional[int]
-    taints: Optional[list[Mapping[str, str]]]
-    labels: Optional[Mapping[str, str]]
+    replicas: int | None
+    taints: list[Mapping[str, str]] | None
+    labels: Mapping[str, str] | None
     cluster: str
     cluster_type: ClusterType = Field(..., exclude=True)
-    autoscaling: Optional[AbstractAutoscaling]
+    autoscaling: AbstractAutoscaling | None
 
     @root_validator()
     @classmethod
@@ -131,7 +127,7 @@ class AbstractPool(ABC, BaseModel):
         pass
 
     @abstractmethod
-    def invalid_diff(self, pool: ClusterMachinePoolV1) -> Optional[str]:
+    def invalid_diff(self, pool: ClusterMachinePoolV1) -> str | None:
         pass
 
     @abstractmethod
@@ -184,7 +180,7 @@ class MachinePool(AbstractPool):
             or self._has_diff_autoscale(pool)
         )
 
-    def invalid_diff(self, pool: ClusterMachinePoolV1) -> Optional[str]:
+    def invalid_diff(self, pool: ClusterMachinePoolV1) -> str | None:
         if self.instance_type != pool.instance_type:
             return "instance_type"
         return None
@@ -203,7 +199,7 @@ class MachinePool(AbstractPool):
         cluster: str,
         cluster_type: ClusterType,
     ):
-        autoscaling: Optional[MachinePoolAutoscaling] = None
+        autoscaling: MachinePoolAutoscaling | None = None
         if pool.autoscale:
             autoscaling = MachinePoolAutoscaling(
                 min_replicas=pool.autoscale.min_replicas,
@@ -229,7 +225,7 @@ class NodePool(AbstractPool):
     # Node pool, used for HyperShift clusters
 
     aws_node_pool: AWSNodePool
-    subnet: Optional[str]
+    subnet: str | None
 
     def delete(self, ocm: OCM) -> None:
         ocm.delete_node_pool(self.cluster, self.dict(by_alias=True))
@@ -266,7 +262,7 @@ class NodePool(AbstractPool):
             or self._has_diff_autoscale(pool)
         )
 
-    def invalid_diff(self, pool: ClusterMachinePoolV1) -> Optional[str]:
+    def invalid_diff(self, pool: ClusterMachinePoolV1) -> str | None:
         if self.aws_node_pool.instance_type != pool.instance_type:
             return "instance_type"
         if self.subnet != pool.subnet:
@@ -283,7 +279,7 @@ class NodePool(AbstractPool):
         cluster: str,
         cluster_type: ClusterType,
     ):
-        autoscaling: Optional[NodePoolAutoscaling] = None
+        autoscaling: NodePoolAutoscaling | None = None
         if pool.autoscale:
             autoscaling = NodePoolAutoscaling(
                 min_replica=pool.autoscale.min_replicas,

reconcile/ocm_upgrade_scheduler_org_updater.py

@@ -1,9 +1,6 @@
 import json
 import logging
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 import yaml
 
@@ -25,7 +22,7 @@ def render_policy(
     template: dict[str, Any],
     cluster_spec: OCMSpec,
     labels: dict[str, str],
-    settings: Optional[dict[str, Any]] = None,
+    settings: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
     body = template["path"]["content"]
     type = template.get("type") or "jinja2"