qontract-reconcile 0.10.1rc911__py3-none-any.whl → 0.10.1rc913__py3-none-any.whl

{qontract_reconcile-0.10.1rc911.dist-info → qontract_reconcile-0.10.1rc913.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc911
+Version: 0.10.1rc913
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc911.dist-info → qontract_reconcile-0.10.1rc913.dist-info}/RECORD

@@ -113,7 +113,7 @@ reconcile/terraform_cloudflare_dns.py,sha256=NfgUqXL218D9pW6sprtUAJQlMzFHa2FXKp_
 reconcile/terraform_cloudflare_resources.py,sha256=41Mj1WkuS75slCDpmhG2GGf1nh3BwfxcdNC73-PNadc,15000
 reconcile/terraform_cloudflare_users.py,sha256=AzIhQwnJtsUh7GlZpvJE0um-_7Q6zYRxzUVJYoSU3dY,13943
 reconcile/terraform_repo.py,sha256=D6JFKLLJbsMHcIG3--oUNeuQteXqT6E5tJ18qzb9YXM,16218
-reconcile/terraform_resources.py,sha256=P2_S0TqkRp4VYf9yoJxt52YFgHJOMqfUYe1GwLzBc7M,19288
+reconcile/terraform_resources.py,sha256=HmTrDTpPbWOvvyPdEM7bXbLPsTS8Tcg1mPu8nZTvAlE,19288
 reconcile/terraform_tgw_attachments.py,sha256=dhtqrckfB3CN90PnrKAepPFRzFB0Ecoh1vk3IkpZ2uE,18657
 reconcile/terraform_users.py,sha256=HqSm3ev3b8dZ9J6F_phDZB-FQsnlsdeKp9RPoY1cU94,10188
 reconcile/terraform_vpc_peerings.py,sha256=WhGvDHwllM36yTJPE5EzQ1Z0Oc-tT9ksXbBn5cpFBBg,27676
@@ -464,7 +464,7 @@ reconcile/templates/rosa-classic-cluster-creation.sh.j2,sha256=FVBmnR2FmVModhqOY
 reconcile/templates/rosa-hcp-cluster-creation.sh.j2,sha256=2wTdv9qvapCvT8NSi_hq8sXhpFSaxRX-V6Cao1diCI8,2393
 reconcile/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/templating/renderer.py,sha256=VQVsQxMjKfftpsgzpd1jJ-bhrsgi8zjDYXYzMfI4vZA,12104
-reconcile/templating/validator.py,sha256=L_5kvY1LJTNQUmhPZZoB62NBiTKFIjlia0j6jZGdvh8,4660
+reconcile/templating/validator.py,sha256=tGI7PwPMAmRJ_-Gg_O7NoZO8ytg_QUeCQAv6G1smitc,4736
 reconcile/templating/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/templating/lib/merge_request_manager.py,sha256=4oe3EwQOP7CZSraocivbRzzOuVb0ooElaUS2_DGsF50,5603
 reconcile/templating/lib/model.py,sha256=fb6FYYLQjmoh2DjVKO7TEWCuDPf1Q34xmOx0M9Z07ek,324
@@ -705,7 +705,7 @@ reconcile/utils/sqs_gateway.py,sha256=RiIfkBuGC15Q2178caG1_5hg53gY6QdRL1tWbK3FOM
 reconcile/utils/state.py,sha256=sJbfxvSTnHlHfgQRc_vRz-U_9NnVFGq-W8DX3ZHkfeY,16352
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
-reconcile/utils/terraform_client.py,sha256=zbx5Ng2Xm7P93qqvFCbR-2FFYUTlmZbLGYNWvpkDtzE,32400
+reconcile/utils/terraform_client.py,sha256=hyMtNVBuDHbqQNSsdG5kTIvJRyOt23tFuWAspPf_Lqo,32161
 reconcile/utils/terrascript_aws_client.py,sha256=kU--Qk42v7OXbOtBEBhgRPRdSiFcfXOvMS6stHs0r_o,276712
 reconcile/utils/three_way_diff_strategy.py,sha256=OniTnogBkdgy_7Xg51N1MgjS-Qtk8uM1ccjWaiXxiV8,4895
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
@@ -844,8 +844,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc911.dist-info/METADATA,sha256=zZqEzan0ir-yqlWaKhNwX7vcukqD6Q2flNVLCZtUjKA,2273
-qontract_reconcile-0.10.1rc911.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc911.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc911.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc911.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc913.dist-info/METADATA,sha256=_Z85T5zVc8ot621q16JjZ2OTEpfrUsmf3g_bCxtz_l0,2273
+qontract_reconcile-0.10.1rc913.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc913.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc913.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc913.dist-info/RECORD,,

reconcile/templating/validator.py

@@ -79,15 +79,17 @@ class TemplateValidatorIntegration(QontractReconcileIntegration):
 
         # Check condition
         should_render = r.render_condition()
-        if (
-            template_test.expected_to_render is not None
-            and template_test.expected_to_render != should_render
-        ):
+        expected_to_render = (
+            template_test.expected_to_render
+            if template_test.expected_to_render is not None
+            else True
+        )
+        if expected_to_render != should_render:
             diffs.append(
                 TemplateDiff(
                     template=template.name,
                     test=template_test.name,
-                    diff=f"Condition mismatch, got: {should_render}, expected: {template_test.expected_to_render}",
+                    diff=f"Condition mismatch for expectedToRender, got: {should_render}, expected: {expected_to_render}",
                 )
             )
 

reconcile/terraform_resources.py

@@ -66,7 +66,7 @@ from reconcile.utils.vault import (
 )
 
 QONTRACT_INTEGRATION = "terraform_resources"
-QONTRACT_INTEGRATION_VERSION = make_semver(0, 5, 3)
+QONTRACT_INTEGRATION_VERSION = make_semver(0, 5, 4)
 QONTRACT_TF_PREFIX = "qrtf"
 
 

reconcile/utils/terraform_client.py

@@ -757,7 +757,6 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
         if after_version == before_version:
             return
 
-        allow_major_version_upgrade = after.get("allow_major_version_upgrade", False)
         region_name = get_region_from_availability_zone(before["availability_zone"])
         if self._aws_api is not None:
             valid_upgrade_target = self._aws_api.get_db_valid_upgrade_target(
@@ -765,13 +764,10 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
             )
             if not valid_upgrade_target:
                 # valid_upgrade_target can be empty when current version is no longer supported by AWS.
-                # In this case, we can't validate it, so treat it as major version upgrade for safety.
-                # Skip validation if allow_major_version_upgrade is enabled.
-                if not allow_major_version_upgrade:
-                    raise ValueError(
-                        "allow_major_version_upgrade is not enabled for upgrading RDS instance: "
-                        f"{resource_name} to a new version when there is no valid upgrade target available."
-                    )
+                # In this case, we can't validate it, so skip.
+                logging.warning(
+                    f"No valid upgrade target available, skip validation for {resource_name}."
+                )
                 return
             target = next(
                 (
@@ -786,6 +782,10 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
                     f"Cannot upgrade RDS instance: {resource_name} "
                     f"from {before_version} to {after_version}"
                 )
+            allow_major_version_upgrade = after.get(
+                "allow_major_version_upgrade",
+                False,
+            )
             if target["IsMajorVersionUpgrade"] and not allow_major_version_upgrade:
                 raise ValueError(
                     "allow_major_version_upgrade is not enabled for upgrading RDS instance: "