qontract-reconcile 0.10.2.dev311__py3-none-any.whl → 0.10.2.dev313__py3-none-any.whl

{qontract_reconcile-0.10.2.dev311.dist-info → qontract_reconcile-0.10.2.dev313.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev311
+Version: 0.10.2.dev313
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev311.dist-info → qontract_reconcile-0.10.2.dev313.dist-info}/RECORD

@@ -109,8 +109,8 @@ reconcile/terraform_cloudflare_resources.py,sha256=tK-BxQeNdZjf59deKd51Roz868e7U
 reconcile/terraform_cloudflare_users.py,sha256=mlSYNktRetBvw8mi2TUSdKSZw0aQ821VeU6OQ1WcV3U,13516
 reconcile/terraform_repo.py,sha256=vVJfaCV9775FGMMTHfoobaPetSlJMiQ4arNudL2pvh8,15607
 reconcile/terraform_resources.py,sha256=AXO3_Ehcg3I6ao7qiKzXC4Mk6BqwMoNooXU50c2zSTA,19555
-reconcile/terraform_tgw_attachments.py,sha256=4cUuM0cfTY6Hy2NnLgzavo7URnblOtgsgV9pSpNOadQ,18936
-reconcile/terraform_users.py,sha256=qcgI2VF6Gak_IwncOUSzqLvajSu4Q4ltKnuFIfttjhQ,10373
+reconcile/terraform_tgw_attachments.py,sha256=P2HivCjT5AlyODy-fu1qAK5355nDEArE8E4NQlIlF7U,18933
+reconcile/terraform_users.py,sha256=lzLco8t0_XQ4gWkZdvfOJIckDQpDUqTKqxGcT2P3W_k,10334
 reconcile/terraform_vpc_peerings.py,sha256=rMotDHy3Fd5QTxrOGjCJ3f2vICk3fmxrKYVCIU8p_y4,27787
 reconcile/vault_replication.py,sha256=trtbB-jDwca822J5I_s0zlwFtlyaiAtqgbPeqp7Cggc,17714
 reconcile/vpc_peerings_validator.py,sha256=_77eu6DSy6VjTE5mhV-sOIVOGIiBvDEEDCdwwRdrgVQ,7101
@@ -456,7 +456,7 @@ reconcile/oum/models.py,sha256=teH0bJTCMTzbdbYD9CU4yXDuMr34ceLcM0KuoIPU8gI,1712
 reconcile/oum/providers.py,sha256=lfG6d7YV-A4Lte45EMv1Gx4A346piJ_jAkrU5AHJZ_g,1834
 reconcile/oum/standalone.py,sha256=EN5y1S-3DwUZYzSRqRMtf63mI2slvBHKiU9zOTjYvWM,7334
 reconcile/prometheus_rules_tester/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/prometheus_rules_tester/integration.py,sha256=TWsVBUeRLH3lUCf47sWWVgq4Rpkrq0i_eu2vkqQniP0,9619
+reconcile/prometheus_rules_tester/integration.py,sha256=qa1OrD1gCR1PUrHNFc2AL3J01SdBYfMOX8fHcOUh1T8,9618
 reconcile/rhidp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/rhidp/common.py,sha256=MIOzjObdvDtZuLvrYBp2GhvPfRp6p-Lohbr_hgEsNYM,7025
 reconcile/rhidp/metrics.py,sha256=Yp0GtpjhieEdru0qkG3osBTJiKUzg6CAjwPoFTQDnCg,417
@@ -657,7 +657,7 @@ reconcile/utils/smtp_client.py,sha256=0xefB4I9E5eBB-FlxFJYjvz3Kvuqi_K3Ma_Wk0NAQK
 reconcile/utils/sqs_gateway.py,sha256=XNIf3PY4UCPNufP2Ul0UJj3fKlt5larBba-VTT-41Fg,2265
 reconcile/utils/state.py,sha256=vCHYIfrWLfPyIWEHSaADWlc4OqhwcOiqM3Egqvw-lfo,16372
 reconcile/utils/structs.py,sha256=P57POzpEntu8ZoZDnsOdni9qUuBDWknmw0iinznxXoY,386
-reconcile/utils/terraform_client.py,sha256=VP5Bd9Eto-To45TV08SmhhXTB3j-i2Ld3Nnvh2tkcjw,37393
+reconcile/utils/terraform_client.py,sha256=zF_F31WzDA3fjNPj_Jl6mQJMfI3wEQ0gsurtrjqh4Ds,37684
 reconcile/utils/terrascript_aws_client.py,sha256=KxraVMhv_RcolHthAxucQeb3x0zFD2CCk3gVMjQ_ero,302090
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=KNDCVsCLSp89V4pO3sEUd7bJUuh6gNfsxsc_18rEv_Y,357
@@ -796,7 +796,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=uQv2QJAmUXP1g2GPIH30WTlvL9soY6m9lefpZEVDM5w,3965
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=KcYVfa3UmJHVP_ocgrKe8NkrO5IDB9aWEDydSokPcRk,975
-qontract_reconcile-0.10.2.dev311.dist-info/METADATA,sha256=bbWjHaGf7oxXQzuibAvxZGmAYZWXdFjO11qBSsPhHlE,24916
-qontract_reconcile-0.10.2.dev311.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev311.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev311.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev313.dist-info/METADATA,sha256=KkW-0QYSeRGwwEnif-BFzkzPEStcexb8mN-6NV7Na34,24916
+qontract_reconcile-0.10.2.dev313.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev313.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev313.dist-info/RECORD,,

reconcile/prometheus_rules_tester/integration.py

@@ -42,7 +42,7 @@ QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 PROVIDERS = ["prometheus-rule"]
 
 NAMESPACE_NAME = "openshift-customer-monitoring"
-DEFAULT_PROMTOOL_VERSION = "2.55.1"
+DEFAULT_PROMTOOL_VERSION = "3.2.1"
 
 
 class TestContent(BaseModel):

reconcile/terraform_tgw_attachments.py

@@ -342,7 +342,7 @@ def _populate_tgw_attachments_working_dirs(
     ts: Terrascript,
     desired_state: Iterable[DesiredStateItem],
     print_to_file: str | None,
-) -> Mapping[str, str]:
+) -> dict[str, str]:
     accounts_by_infra_account_name: dict[str, list[dict[str, Any]]] = {}
     for item in desired_state:
         accounts_by_infra_account_name.setdefault(item.infra_acount_name, []).append(

reconcile/terraform_users.py

@@ -1,5 +1,4 @@
 import sys
-from collections.abc import Mapping
 from textwrap import indent
 from typing import (
     Any,
@@ -117,7 +116,7 @@ def setup(
     skip_reencrypt_accounts: list[str],
     appsre_pgp_key: str | None = None,
     account_name: str | None = None,
-) -> tuple[list[dict[str, Any]], Mapping[str, str], bool, AWSApi]:
+) -> tuple[list[dict[str, Any]], dict[str, str], bool, AWSApi]:
     accounts = [
         a
         for a in queries.get_aws_accounts(terraform_state=True)

reconcile/utils/terraform_client.py

@@ -5,8 +5,8 @@ import shutil
 import tempfile
 from collections import defaultdict
 from collections.abc import (
-    Generator,
     Iterable,
+    Iterator,
     Mapping,
 )
 from contextlib import contextmanager
@@ -86,8 +86,8 @@ class TerraformClient:
         working_dirs: Mapping[str, str],
         thread_pool_size: int,
         aws_api: AWSApi | None = None,
-        init_users=False,
-    ):
+        init_users: bool = False,
+    ) -> None:
         self.integration = integration
         self.integration_version = integration_version
         self.integration_prefix = integration_prefix
@@ -101,7 +101,7 @@ class TerraformClient:
 
         self.specs: list[TerraformSpec] = []
         self.init_specs()
-        self.outputs: dict = {}
+        self.outputs: dict[str, Any] = {}
         self.init_outputs()
 
         self.OUTPUT_TYPE_SECRETS = "Secrets"
@@ -112,19 +112,19 @@ class TerraformClient:
         if init_users:
             self.init_existing_users()
 
-    def init_existing_users(self):
+    def init_existing_users(self) -> None:
         self.users = {
             account: list(self.format_output(output, self.OUTPUT_TYPE_PASSWORDS).keys())
             for account, output in self.outputs.items()
         }
 
-    def increment_apply_count(self):
+    def increment_apply_count(self) -> None:
         self.apply_count += 1
 
     def should_apply(self) -> bool:
         return self.apply_count > 0
 
-    def get_new_users(self):
+    def get_new_users(self) -> list[tuple[str, Any, str, Any]]:
         new_users = []
         self.init_outputs()  # get updated output
         for account, output in self.outputs.items():
@@ -141,7 +141,7 @@ class TerraformClient:
                 ))
         return new_users
 
-    def init_specs(self):
+    def init_specs(self) -> None:
         self.specs = [
             TerraformSpec(name=name, working_dir=wd)
             for name, wd in self.working_dirs.items()
@@ -152,7 +152,7 @@ class TerraformClient:
     @contextmanager
     def _terraform_log_file(
         self, working_dir: str
-    ) -> Generator[tuple[IO, dict[str, str]], None, None]:
+    ) -> Iterator[tuple[IO[bytes], dict[str, str]]]:
         with tempfile.NamedTemporaryFile(dir=working_dir) as f:
             env = {
                 "TF_LOG": TERRAFORM_LOG_LEVEL,
@@ -161,7 +161,7 @@ class TerraformClient:
             yield f, env
 
     @retry(exceptions=TerraformCommandError)
-    def terraform_init(self, spec: TerraformSpec):
+    def terraform_init(self, spec: TerraformSpec) -> None:
         with self._terraform_log_file(spec.working_dir) as (f, env):
             return_code, stdout, stderr = lean_tf.init(spec.working_dir, env=env)
             log = f.read().decode("utf-8")
@@ -171,12 +171,12 @@ class TerraformClient:
                 return_code, "init", output=stdout, stderr=stderr
             )
 
-    def init_outputs(self):
+    def init_outputs(self) -> None:
         results = threaded.run(self.terraform_output, self.specs, self.thread_pool_size)
         self.outputs = dict(results)
 
     @retry(exceptions=TerraformCommandError)
-    def terraform_output(self, spec: TerraformSpec):
+    def terraform_output(self, spec: TerraformSpec) -> tuple[str, Any]:
         with self._terraform_log_file(spec.working_dir) as (f, env):
             return_code, stdout, stderr = lean_tf.output(spec.working_dir, env=env)
             log = f.read().decode("utf-8")
@@ -278,7 +278,7 @@ class TerraformClient:
         self,
         spec: TerraformSpec,
         enable_deletion: bool,
-    ) -> tuple[bool, list]:
+    ) -> tuple[bool, list[AccountUser]]:
         disabled_deletion_detected = False
         name = spec.name
         account_enable_deletion = self.accounts[name].get("enableDeletion") or False
@@ -412,7 +412,9 @@ class TerraformClient:
                             )
         return disabled_deletion_detected, created_users
 
-    def deletion_approved(self, account_name, resource_type, resource_name):
+    def deletion_approved(
+        self, account_name: str, resource_type: str, resource_name: str
+    ) -> bool:
         account = self.accounts[account_name]
         deletion_approvals = account.get("deletionApprovals")
         if not deletion_approvals:
@@ -439,11 +441,11 @@ class TerraformClient:
         return False
 
     # terraform apply
-    def apply(self):
+    def apply(self) -> bool:
         errors = threaded.run(self.terraform_apply, self.specs, self.thread_pool_size)
         return any(errors)
 
-    def terraform_apply(self, spec: TerraformSpec):
+    def terraform_apply(self, spec: TerraformSpec) -> bool:
         with self._terraform_log_file(spec.working_dir) as (f, env):
             return_code, stdout, stderr = lean_tf.apply(
                 spec.working_dir,
@@ -486,9 +488,9 @@ class TerraformClient:
 
         return replicas_info
 
-    def format_output(self, output, type):
+    def format_output(self, output: Any, type: str) -> dict[str, dict[str, Any]]:
         # data is a dictionary of dictionaries
-        data = {}
+        data: dict[str, dict[str, Any]] = {}
         if output is None:
             return data
 
@@ -643,7 +645,7 @@ class TerraformClient:
         return error_occured
 
     @staticmethod
-    def split_to_lines(*outputs):
+    def split_to_lines(*outputs: str) -> Any:
         split_outputs = []
         try:
             for output in outputs:
@@ -656,7 +658,7 @@ class TerraformClient:
             return split_outputs[0]
         return split_outputs
 
-    def cleanup(self):
+    def cleanup(self) -> None:
         if self._aws_api is not None:
             self._aws_api.cleanup()
         for wd in self.working_dirs.values():
@@ -757,7 +759,7 @@ class TerraformClient:
 
     def validate_db_upgrade(
         self, account_name: str, resource_name: str, resource_change: Mapping[str, Any]
-    ):
+    ) -> None:
         """
         Determine whether the RDS engine version upgrade is valid.
 
@@ -862,7 +864,7 @@ class TerraformClient:
             ],
         }
 
-        def is_supported(engine, version):
+        def is_supported(engine: str, version: str) -> bool:
             parsed_version = pkg_version.parse(version)
             if engine == "mysql":
                 return any(