qontract-reconcile 0.10.1rc755__py3-none-any.whl → 0.10.1rc757__py3-none-any.whl

{qontract_reconcile-0.10.1rc755.dist-info → qontract_reconcile-0.10.1rc757.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc755
+Version: 0.10.1rc757
 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.1rc755.dist-info → qontract_reconcile-0.10.1rc757.dist-info}/RECORD

@@ -54,7 +54,7 @@ reconcile/mr_client_gateway.py,sha256=WhjMd-sIXDFCV8-rt8CEjurJ5OYB1pOD0K3o0tZRXQ
 reconcile/ocm_additional_routers.py,sha256=KfcFDVbNoc6n5dHWjYdAf1_DiVqVG6Tw23WLKoV8cdg,3306
 reconcile/ocm_addons.py,sha256=qqAyqRBRbdZQvAcjb-QlSVyRAyQBZk6iVlgnI4jyi7s,3353
 reconcile/ocm_addons_upgrade_tests_trigger.py,sha256=L1ktYynIR7pmHiYtdCTdLGJRKX72B54KUAuPLOccXzo,3995
-reconcile/ocm_aws_infrastructure_access.py,sha256=TjpQYE61wbHTAWGHkGnHzLQh31-pAzM8FC_Il53BpAI,7141
+reconcile/ocm_aws_infrastructure_access.py,sha256=kDnJP6aOFO263LSbdCxJMmUwVsM3LgdzebtIUOoIhH8,7130
 reconcile/ocm_clusters.py,sha256=YWfBF25E55Odm0L3dXnqRbC_bDuYIsBPg4j6DEpWCGw,16703
 reconcile/ocm_external_configuration_labels.py,sha256=imEpDv1RBpCSj8tHDv0R76hmNCFtcUzVNgS1yOVl8vs,3870
 reconcile/ocm_github_idp.py,sha256=glwXMsIBcl38-OmDDQCpe0YoLLXfoRgVQmqwXMEXjds,3946
@@ -426,7 +426,7 @@ reconcile/templates/jira-checkpoint-missinginfo.j2,sha256=c_Vvg-lEENsB3tgxm9B6Y9
 reconcile/templates/rosa-classic-cluster-creation.sh.j2,sha256=0UHfYtXRVJqP07VJQx456cRI6EbZNBgamtP_8nb4WPY,2353
 reconcile/templates/rosa-hcp-cluster-creation.sh.j2,sha256=O7Bf3WQIJhsZoEqaYA0wRktUO4yXXCb4BQkuvvp-C80,2385
 reconcile/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/templating/renderer.py,sha256=PrFRJc8X1O0hXGFd_HYQ01cMbkWqxj-Gu3dQxG7iXFg,10546
+reconcile/templating/renderer.py,sha256=xDuEOD6OBAaBYQzDcQ8ptwZQaarhHa-y1knN4d2xzkY,10598
 reconcile/templating/validator.py,sha256=pvDEc6veznEZzjypkoRJUGMMFLWosU-zd7i3j7JeNjE,4670
 reconcile/templating/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/templating/lib/merge_request_manager.py,sha256=JUkfF3smaQ8onzKF5F7UpmA7MWaQpftANy6dDo1FCug,5464
@@ -476,7 +476,7 @@ reconcile/test/test_ocm_clusters_manifest_updates.py,sha256=jFRVfc5jby1kI2x_gT6w
 reconcile/test/test_ocm_machine_pools.py,sha256=3qo6t2Jfr1Wee0NUacyLTDmatp0o7CUNpkVOpHiOiGk,29737
 reconcile/test/test_ocm_update_recommended_version.py,sha256=iA4BVirTGVXlwcOyeR52IuNO81X_8NR6ZNd7ZFE7igs,4328
 reconcile/test/test_ocm_upgrade_scheduler_org_updater.py,sha256=V91g2XQMa2nvKwkLVWkiPwNL6pMQE16s4jO0oXJ6wdk,4330
-reconcile/test/test_openshift_base.py,sha256=uVsnMghAQhHaJTreeOw4x2INTKJ6qeiZiiteWeKflW8,33874
+reconcile/test/test_openshift_base.py,sha256=YgTKcLmzmt9oR12s_022LAp9qr1R_CBOppYwoknspzE,33868
 reconcile/test/test_openshift_cluster_bots.py,sha256=L-yuKvMgB0LBCdfLu7wozh_lk6S_m3umXt3m_ECfLEI,8023
 reconcile/test/test_openshift_namespace_labels.py,sha256=P1hqi6P88NijNrurdXG_QR2usyo3EYZSy9zpwYHvDsM,12104
 reconcile/test/test_openshift_namespaces.py,sha256=HmRnCE5EnFt3MYceVEFHmk8wWRtCrxu2AFGFkY9pdyA,9214
@@ -783,8 +783,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=w2l4BHB09k1d-BGJ1jBUNCqDv7zkqYrMHojQXg-21kQ,4155
 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.1rc755.dist-info/METADATA,sha256=kakntqv9m6oYmZ-sI6t-ZJmUfpJuDDPcKwTIMHsMpko,2382
-qontract_reconcile-0.10.1rc755.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc755.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc755.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc755.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc757.dist-info/METADATA,sha256=0L4M3FIacdQTzZZs5uNpBMpcjoUWVgkQetpJ--aadfA,2382
+qontract_reconcile-0.10.1rc757.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc757.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc757.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc757.dist-info/RECORD,,

reconcile/ocm_aws_infrastructure_access.py

@@ -140,7 +140,7 @@ def act(
     dry_run, ocm_map, current_state, current_failed, desired_state, current_deleting
 ):
     to_delete = [c for c in current_state if c not in desired_state]
-    to_delete = to_delete + current_failed
+    to_delete += current_failed
     for item in to_delete:
         cluster = item["cluster"]
         user_arn = item["user_arn"]

reconcile/templating/renderer.py

@@ -1,5 +1,3 @@
-import hashlib
-import json
 import logging
 import os
 import tempfile
@@ -7,6 +5,7 @@ from abc import ABC, abstractmethod
 from collections.abc import Callable
 from typing import Any, Optional, Self
 
+from deepdiff import DeepHash
 from ruamel import yaml
 
 from reconcile.gql_definitions.templating.template_collection import (
@@ -175,6 +174,14 @@ def unpack_dynamic_variables(
     }
 
 
+def calc_template_hash(c: TemplateCollectionV1, variables: dict[str, Any]) -> str:
+    hashable = {
+        "templates": sorted(c.templates, key=lambda x: x.name),
+        "variables": variables,
+    }
+    return DeepHash(hashable)[hashable]
+
+
 class TemplateRendererIntegrationParams(PydanticRunParams):
     clone_repo: bool = False
     app_interface_data_path: Optional[str]
@@ -246,16 +253,10 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
                     "static": unpack_static_variables(c.variables),
                 }
 
-            template_hash = hashlib.sha256(
-                "".join(
-                    sorted([str(t) for t in c.templates] + [json.dumps(variables)])
-                ).encode("utf-8")
-            ).hexdigest()
-
             with PersistenceTransaction(persistence, dry_run) as p:
                 input = TemplateInput(
                     collection=c.name,
-                    collection_hash=template_hash,
+                    collection_hash=calc_template_hash(c, variables),
                     enable_auto_approval=c.enable_auto_approval or False,
                     labels=c.additional_mr_labels or [],
                 )

reconcile/test/test_openshift_base.py

@@ -766,7 +766,7 @@ def build_openshift_resource(
         "metadata": {"name": name},
     }
     if extra_body:
-        body = body | extra_body
+        body |= extra_body
 
     return resource.OpenshiftResource(
         body=body,