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

reconcile/templating/lib/rendering.py

@@ -1,7 +1,7 @@
 import logging
 from abc import ABC, abstractmethod
 from io import StringIO
-from typing import Any, Optional, Protocol
+from typing import Any, Protocol
 
 from pydantic import BaseModel
 
@@ -13,27 +13,27 @@ from reconcile.utils.secret_reader import SecretReaderBase
 
 class TemplateData(BaseModel):
     variables: dict[str, Any]
-    current: Optional[dict[str, Any]]
-    current_with_explicit_start: Optional[bool] = False
+    current: dict[str, Any] | None
+    current_with_explicit_start: bool | None = False
 
 
 class TemplatePatch(Protocol):
     path: str
-    identifier: Optional[str]
+    identifier: str | None
 
     def dict(self) -> dict[str, str]: ...
 
 
 class Template(Protocol):
     name: str
-    condition: Optional[str]
+    condition: str | None
     target_path: str
     template: str
 
     def dict(self) -> dict[str, str]: ...
 
     @property
-    def patch(self) -> Optional[TemplatePatch]:
+    def patch(self) -> TemplatePatch | None:
         pass
 
 
@@ -42,7 +42,7 @@ class Renderer(ABC):
         self,
         template: Template,
         data: TemplateData,
-        secret_reader: Optional[SecretReaderBase] = None,
+        secret_reader: SecretReaderBase | None = None,
     ):
         self.template = template
         self.data = data
@@ -149,7 +149,7 @@ class PatchRenderer(Renderer):
 def create_renderer(
     template: Template,
     data: TemplateData,
-    secret_reader: Optional[SecretReaderBase] = None,
+    secret_reader: SecretReaderBase | None = None,
 ) -> Renderer:
     if template.patch:
         return PatchRenderer(template=template, data=data, secret_reader=secret_reader)

reconcile/templating/renderer.py

@@ -5,7 +5,7 @@ import tempfile
 from abc import ABC, abstractmethod
 from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Optional, Self
+from typing import Any, Self
 
 from deepdiff import DeepHash
 from ruamel import yaml
@@ -46,7 +46,7 @@ APP_INTERFACE_PATH_SEPERATOR = "/"
 
 
 def get_template_collections(
-    query_func: Optional[Callable] = None,
+    query_func: Callable | None = None,
 ) -> list[TemplateCollectionV1]:
     if not query_func:
         query_func = gql.get_api().query
@@ -59,15 +59,14 @@ class FilePersistence(ABC):
         pass
 
     @abstractmethod
-    def read(self, path: str) -> Optional[str]:
+    def read(self, path: str) -> str | None:
         pass
 
     @staticmethod
-    def _read_local_file(path: str) -> Optional[str]:
+    def _read_local_file(path: str) -> str | None:
         try:
             with open(
                 path,
-                "r",
                 encoding="utf-8",
             ) as f:
                 return f.read()
@@ -92,7 +91,7 @@ class LocalFilePersistence(FilePersistence):
             filepath.parent.mkdir(parents=True, exist_ok=True)
             filepath.write_text(output.content, encoding="utf-8")
 
-    def read(self, path: str) -> Optional[str]:
+    def read(self, path: str) -> str | None:
         return self._read_local_file(join_path(self.app_interface_data_path, path))
 
 
@@ -106,7 +105,7 @@ class PersistenceTransaction(FilePersistence):
     def __init__(self, persistence: FilePersistence, dry_run: bool) -> None:
         self.persistence = persistence
         self.dry_run = dry_run
-        self.content_cache: dict[str, Optional[str]] = {}
+        self.content_cache: dict[str, str | None] = {}
         self.output_cache: dict[str, TemplateOutput] = {}
 
     def write(self, outputs: list[TemplateOutput]) -> None:
@@ -114,7 +113,7 @@ class PersistenceTransaction(FilePersistence):
             self.content_cache[output.path] = output.content
             self.output_cache[output.path] = output
 
-    def read(self, path: str) -> Optional[str]:
+    def read(self, path: str) -> str | None:
         if path not in self.content_cache:
             self.content_cache[path] = self.persistence.read(path)
         return self.content_cache[path]
@@ -153,7 +152,7 @@ class ClonedRepoGitlabPersistence(FilePersistence):
 
         self.mr_manager.create_merge_request(MrData(data=outputs, auto_approved=False))
 
-    def read(self, path: str) -> Optional[str]:
+    def read(self, path: str) -> str | None:
         return self._read_local_file(join_path(self.local_path, path))
 
 
@@ -193,7 +192,7 @@ def calc_template_hash(c: TemplateCollectionV1, variables: dict[str, Any]) -> st
 
 class TemplateRendererIntegrationParams(PydanticRunParams):
     clone_repo: bool = False
-    app_interface_data_path: Optional[str]
+    app_interface_data_path: str | None
 
 
 def join_path(base: str, sub: str) -> str:
@@ -211,7 +210,7 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
         persistence: FilePersistence,
         ruaml_instance: yaml.YAML,
         template_input: TemplateInput,
-    ) -> Optional[TemplateOutput]:
+    ) -> TemplateOutput | None:
         r = create_renderer(
             template,
             TemplateData(

reconcile/templating/validator.py

@@ -1,6 +1,6 @@
 import logging
+from collections.abc import Callable
 from difflib import context_diff
-from typing import Callable, Optional
 
 from pydantic import BaseModel
 from ruamel import yaml
@@ -22,7 +22,7 @@ QONTRACT_INTEGRATION = "template-validator"
 
 
 def get_templates(
-    query_func: Optional[Callable] = None,
+    query_func: Callable | None = None,
 ) -> list[TemplateV1]:
     if not query_func:
         query_func = gql.get_api().query
@@ -41,7 +41,7 @@ class TemplateValidatorIntegration(QontractReconcileIntegration):
         template: TemplateV1,
         template_test: TemplateTestV1,
         ruaml_instance: yaml.YAML,
-        secret_reader: Optional[SecretReaderBase] = None,
+        secret_reader: SecretReaderBase | None = None,
     ) -> Renderer:
         return create_renderer(
             template,
@@ -57,7 +57,7 @@ class TemplateValidatorIntegration(QontractReconcileIntegration):
         template: TemplateV1,
         template_test: TemplateTestV1,
         ruaml_instance: yaml.YAML,
-        secret_reader: Optional[SecretReaderBase] = None,
+        secret_reader: SecretReaderBase | None = None,
     ) -> list[TemplateDiff]:
         diffs: list[TemplateDiff] = []
 

reconcile/terraform_aws_route53.py

@@ -4,10 +4,7 @@ from collections.abc import (
     Iterable,
     Mapping,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile import queries
 from reconcile.status import ExitCodes
@@ -206,10 +203,10 @@ def build_desired_state(
 @defer
 def run(
     dry_run: bool = False,
-    print_to_file: Optional[str] = None,
+    print_to_file: str | None = None,
     enable_deletion: bool = True,
     thread_pool_size: int = 10,
-    account_name: Optional[str] = None,
+    account_name: str | None = None,
     defer=None,
 ):
     settings = queries.get_app_interface_settings()

reconcile/terraform_cloudflare_dns.py

@@ -3,12 +3,9 @@ import sys
 from collections.abc import (
     Callable,
     Mapping,
-)
-from typing import (
-    Any,
-    Optional,
     Sequence,
 )
+from typing import Any
 
 from deepdiff import DeepHash
 
@@ -74,9 +71,9 @@ DEFAULT_CLOUDFLARE_ZONE_RECORDS_MAX = 500
 class TerraformCloudflareDNSIntegrationParams(PydanticRunParams):
     enable_deletion: bool
     thread_pool_size: int
-    selected_account: Optional[str] = None
-    selected_zone: Optional[str] = None
-    print_to_file: Optional[str]
+    selected_account: str | None = None
+    selected_zone: str | None = None
+    print_to_file: str | None
 
 
 class TerraformCloudflareDNSIntegration(
@@ -93,7 +90,7 @@ class TerraformCloudflareDNSIntegration(
         return self.qontract_integration.replace("_", "-")
 
     @defer
-    def run(self, dry_run: bool, defer: Optional[Callable] = None) -> None:
+    def run(self, dry_run: bool, defer: Callable | None = None) -> None:
         settings = self._get_app_interface_settings()
 
         if not settings.settings:
@@ -258,7 +255,7 @@ def ensure_record_number_not_exceed_max(
 
 
 def get_cloudflare_provider_rps(
-    records: Optional[Sequence[CloudflareDnsRecordV1]],
+    records: Sequence[CloudflareDnsRecordV1] | None,
 ) -> int:
     """
     Setting Cloudlare Terraform provider's RPS based on the size of the zone to improve performance of MR checks.
@@ -277,8 +274,8 @@ def build_cloudflare_terraform_config_collection(
     secret_reader: SecretReaderBase,
     query_zones: CloudflareDnsZoneQueryData,
     qontract_integration: str,
-    selected_account: Optional[str],
-    selected_zone: Optional[str],
+    selected_account: str | None,
+    selected_zone: str | None,
 ) -> TerraformConfigClientCollection:
     cf_clients = TerraformConfigClientCollection()
     cf_accounts: dict[str, CloudflareAccount] = {}
@@ -356,7 +353,7 @@ def build_cloudflare_terraform_config_collection(
 
 
 def cloudflare_dns_zone_to_external_resource(
-    zones: Optional[list[CloudflareDnsZoneV1]],
+    zones: list[CloudflareDnsZoneV1] | None,
 ) -> list[ExternalResourceSpec]:
     """
     This is a method that massage a list of CloudflareDnsZoneV1 into ExternalResourceSpec

reconcile/terraform_cloudflare_resources.py

@@ -1,10 +1,8 @@
 import logging
 import sys
+from collections.abc import Iterable
 from typing import (
     Any,
-    Iterable,
-    Optional,
-    Tuple,
     cast,
 )
 
@@ -120,7 +118,7 @@ def create_backend_config(
 def build_clients(
     secret_reader: SecretReaderBase,
     query_accounts: TerraformCloudflareAccountsQueryData,
-    selected_account: Optional[str] = None,
+    selected_account: str | None = None,
 ) -> list[tuple[str, TerrascriptCloudflareClient]]:
     clients = []
     for cf_acct in query_accounts.accounts or []:
@@ -158,8 +156,8 @@ def _build_oc_resources(
     secret_reader: SecretReaderBase,
     use_jump_host: bool,
     thread_pool_size: int,
-    internal: Optional[bool] = None,
-    account_names: Optional[Iterable[str]] = None,
+    internal: bool | None = None,
+    account_names: Iterable[str] | None = None,
 ) -> tuple[ResourceInventory, OCMap]:
     ri = ResourceInventory()
 
@@ -194,7 +192,7 @@ def _build_oc_resources(
 def _populate_oc_resources(
     spec: CurrentStateSpec,
     ri: ResourceInventory,
-    account_names: Optional[Iterable[str]],
+    account_names: Iterable[str] | None,
 ):
     """
     This was taken from terraform_resources and might be a later candidate for DRY.
@@ -310,12 +308,12 @@ def _filter_cloudflare_namespaces(
 @defer
 def run(
     dry_run: bool,
-    print_to_file: Optional[str],
+    print_to_file: str | None,
     enable_deletion: bool,
     thread_pool_size: int,
-    selected_account: Optional[str] = None,
+    selected_account: str | None = None,
     vault_output_path: str = "",
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
     defer=None,
 ) -> None:
@@ -431,7 +429,7 @@ def run(
 
 
 def _get_cloudflare_desired_state() -> (
-    Tuple[
+    tuple[
         TerraformCloudflareAccountsQueryData,
         TerraformCloudflareResourcesQueryData,
     ]

reconcile/terraform_cloudflare_users.py

@@ -4,10 +4,7 @@ from collections.abc import (
     MutableMapping,
 )
 from dataclasses import dataclass
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile.gql_definitions.terraform_cloudflare_users import (
     app_interface_setting_cloudflare_and_vault,
@@ -69,8 +66,8 @@ class CloudflareUser:
 
 
 class TerraformCloudflareUsersParams(PydanticRunParams):
-    print_to_file: Optional[str]
-    account_name: Optional[str]
+    print_to_file: str | None
+    account_name: str | None
     thread_pool_size: int
     enable_deletion: bool
 
@@ -84,7 +81,7 @@ class TerraformCloudflareUsers(
 
     def get_early_exit_desired_state(
         self, *args: Any, **kwargs: Any
-    ) -> Optional[dict[str, Any]]:
+    ) -> dict[str, Any] | None:
         cloudflare_roles, settings = self._get_desired_state()
 
         if not settings.settings:
@@ -211,7 +208,7 @@ class TerraformCloudflareUsers(
         self,
         query_data: CloudflareAccountRoleQueryData,
         secret_reader: SecretReaderBase,
-        account_name: Optional[str],
+        account_name: str | None,
     ) -> TerraformConfigClientCollection:
         cf_clients = TerraformConfigClientCollection()
         for role in query_data.cloudflare_account_roles or []:
@@ -276,9 +273,9 @@ class TerraformCloudflareUsers(
 
 
 def get_cloudflare_users(
-    cloudflare_roles: Optional[Iterable[CloudflareAccountRoleV1]],
-    account_name: Optional[str],
-    email_domain_allow_list: Optional[Iterable[str]],
+    cloudflare_roles: Iterable[CloudflareAccountRoleV1] | None,
+    account_name: str | None,
+    email_domain_allow_list: Iterable[str] | None,
 ) -> dict[str, dict[str, CloudflareUser]]:
     """
     Returns a two-level dictionary of users with 1st level keys mapping to Cloudflare account names

reconcile/terraform_init/integration.py

@@ -1,6 +1,6 @@
 import logging
 from collections.abc import Callable
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from typing import Any
 
 import jinja2
@@ -83,7 +83,7 @@ class TerraformInitIntegration(
             "account_name": account.name,
             "bucket_name": bucket_name,
             "region": account.resources_default_region,
-            "timestamp": int(datetime.now(tz=timezone.utc).timestamp()),
+            "timestamp": int(datetime.now(tz=UTC).timestamp()),
         })
 
     def reconcile_account(

reconcile/terraform_repo.py

@@ -1,9 +1,6 @@
 import logging
 from collections.abc import Callable
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 import yaml
 from pydantic import (
@@ -44,10 +41,10 @@ class RepoOutput(BaseModel):
     project_path: str
     delete: bool
     aws_creds: VaultSecret
-    variables: Optional[TerraformRepoVariablesV1]
-    bucket: Optional[str]
-    region: Optional[str]
-    bucket_path: Optional[str]
+    variables: TerraformRepoVariablesV1 | None
+    bucket: str | None
+    region: str | None
+    bucket_path: str | None
     require_fips: bool
     tf_version: str
 
@@ -63,10 +60,10 @@ class OutputFile(BaseModel):
 
 
 class TerraformRepoIntegrationParams(PydanticRunParams):
-    output_file: Optional[str]
+    output_file: str | None
     validate_git: bool
-    gitlab_project_id: Optional[str]
-    gitlab_merge_request_id: Optional[int]
+    gitlab_project_id: str | None
+    gitlab_merge_request_id: int | None
 
 
 class TerraformRepoIntegration(
@@ -86,7 +83,7 @@ class TerraformRepoIntegration(
     def run(
         self,
         dry_run: bool,
-        defer: Optional[Callable] = None,
+        defer: Callable | None = None,
     ) -> None:
         gqlapi = gql.get_api()
 
@@ -304,9 +301,9 @@ class TerraformRepoIntegration(
         existing_state: list[TerraformRepoV1],
         desired_state: list[TerraformRepoV1],
         dry_run: bool,
-        state: Optional[State],
+        state: State | None,
         recreate_state: bool,
-    ) -> Optional[list[TerraformRepoV1]]:
+    ) -> list[TerraformRepoV1] | None:
         """Calculated the difference between existing and desired state
         to determine what actions the executor will need to take
 

reconcile/terraform_resources.py

@@ -1,15 +1,14 @@
 import logging
 from collections.abc import (
     Callable,
+    Collection,
     Iterable,
     Mapping,
+    Sequence,
 )
 from dataclasses import asdict
 from typing import (
     Any,
-    Collection,
-    Optional,
-    Sequence,
     TypedDict,
     cast,
 )
@@ -72,7 +71,7 @@ QONTRACT_TF_PREFIX = "qrtf"
 
 
 def get_tf_namespaces(
-    account_names: Optional[Iterable[str]] = None,
+    account_names: Iterable[str] | None = None,
 ) -> list[NamespaceV1]:
     namespaces = get_namespaces()
     return filter_tf_namespaces(namespaces, account_names)
@@ -81,7 +80,7 @@ def get_tf_namespaces(
 def populate_oc_resources(
     spec: ob.CurrentStateSpec,
     ri: ResourceInventory,
-    account_names: Optional[Iterable[str]],
+    account_names: Iterable[str] | None,
 ) -> None:
     if spec.oc is None:
         return
@@ -124,9 +123,9 @@ def populate_oc_resources(
 def fetch_current_state(
     namespaces: Iterable[NamespaceV1],
     thread_pool_size: int,
-    internal: Optional[bool],
+    internal: bool | None,
     use_jump_host: bool,
-    account_names: Optional[Iterable[str]],
+    account_names: Iterable[str] | None,
     secret_reader: SecretReaderBase,
 ) -> tuple[ResourceInventory, OCMap]:
     ri = ResourceInventory()
@@ -159,7 +158,7 @@ def fetch_current_state(
 def init_working_dirs(
     accounts: list[dict[str, Any]],
     thread_pool_size: int,
-    settings: Optional[Mapping[str, Any]] = None,
+    settings: Mapping[str, Any] | None = None,
 ) -> tuple[Terrascript, dict[str, str]]:
     ts = Terrascript(
         QONTRACT_INTEGRATION,
@@ -195,8 +194,8 @@ def validate_account_names(
 
 def get_aws_accounts(
     dry_run: bool,
-    include_accounts: Optional[Collection[str]],
-    exclude_accounts: Optional[Collection[str]],
+    include_accounts: Collection[str] | None,
+    exclude_accounts: Collection[str] | None,
 ) -> list[dict[str, Any]]:
     if exclude_accounts and not dry_run:
         message = "--exclude-accounts is only supported in dry-run mode"
@@ -236,7 +235,7 @@ def setup(
     accounts: list[dict[str, Any]],
     account_names: set[str],
     tf_namespaces: list[NamespaceV1],
-    print_to_file: Optional[str],
+    print_to_file: str | None,
     thread_pool_size: int,
 ) -> tuple[Terraform, TerrascriptClient, SecretReaderBase]:
     vault_settings = get_app_interface_vault_settings()
@@ -277,7 +276,7 @@ def setup(
 
 
 def filter_tf_namespaces(
-    namespaces: Iterable[NamespaceV1], account_names: Optional[Iterable[str]]
+    namespaces: Iterable[NamespaceV1], account_names: Iterable[str] | None
 ) -> list[NamespaceV1]:
     tf_namespaces = []
     for namespace_info in namespaces:
@@ -360,19 +359,19 @@ class CacheSource(TypedDict):
 @defer
 def run(
     dry_run: bool,
-    print_to_file: Optional[str] = None,
+    print_to_file: str | None = None,
     enable_deletion: bool = False,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
     light: bool = False,
     vault_output_path: str = "",
-    account_name: Optional[Sequence[str]] = None,
-    exclude_accounts: Optional[Sequence[str]] = None,
+    account_name: Sequence[str] | None = None,
+    exclude_accounts: Sequence[str] | None = None,
     enable_extended_early_exit: bool = False,
     extended_early_exit_cache_ttl_seconds: int = 3600,
     log_cached_log_output: bool = False,
-    defer: Optional[Callable] = None,
+    defer: Callable | None = None,
 ) -> None:
     # account_name is a tuple of account names for more detail go to
     # https://click.palletsprojects.com/en/8.1.x/options/#multiple-options
@@ -452,11 +451,11 @@ class RunnerParams(TypedDict):
     dry_run: bool
     enable_deletion: bool
     thread_pool_size: int
-    internal: Optional[bool]
+    internal: bool | None
     use_jump_host: bool
     light: bool
     vault_output_path: str
-    defer: Optional[Callable]
+    defer: Callable | None
 
 
 def runner(
@@ -469,11 +468,11 @@ def runner(
     dry_run: bool,
     enable_deletion: bool = False,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
     light: bool = False,
     vault_output_path: str = "",
-    defer: Optional[Callable] = None,
+    defer: Callable | None = None,
 ) -> ExtendedEarlyExitRunnerResult:
     if not light:
         disabled_deletions_detected, err = tf.plan(enable_deletion)