qontract-reconcile 0.10.1rc754__py3-none-any.whl → 0.10.1rc756__py3-none-any.whl

{qontract_reconcile-0.10.1rc754.dist-info → qontract_reconcile-0.10.1rc756.dist-info}/METADATA

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

@@ -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
@@ -663,7 +663,7 @@ reconcile/utils/state.py,sha256=FK8NLT1xyumuXpYRm0Nk6pWpOE_U6-NovGn6zKCw8vw,1629
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=mZEKpu6nbfiQd60wRkc8-5sljBTUTOgaAKnF89itMzU,32085
-reconcile/utils/terrascript_aws_client.py,sha256=fiRBl2JpM_UJrjC2x2klYjwoD2fi-BiRG7acPo6RuQ4,272663
+reconcile/utils/terrascript_aws_client.py,sha256=4FR4JUSniDOFMtc_r1t2z0x_drrBfcw-J33AdWeJEyw,272662
 reconcile/utils/three_way_diff_strategy.py,sha256=nyqeQsLCoPI6e16k2CF3b9KNgQLU-rPf5RtfdUfVMwE,4468
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/unleash.py,sha256=1D56CsZfE3ShDtN3IErE1T2eeIwNmxhK-yYbCotJ99E,3601
@@ -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.1rc754.dist-info/METADATA,sha256=OD3FoCxX0CTq2h4QAdvIIjPG_kpBIaUZmsRyAbRSduU,2382
-qontract_reconcile-0.10.1rc754.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc754.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc754.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc754.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc756.dist-info/METADATA,sha256=e3uCbsaVAAU1U51hxqtUNTNVP_7hwDox4K9PcBo6J_c,2382
+qontract_reconcile-0.10.1rc756.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc756.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc756.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc756.dist-info/RECORD,,

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/utils/terrascript_aws_client.py

@@ -298,6 +298,10 @@ class aws_cloudfront_log_delivery_canonical_user_id(Data):
     pass
 
 
+class cloudinit_config(Data):
+    pass
+
+
 # temporary until we upgrade to a terrascript release
 # that supports this provider
 # https://github.com/mjuenema/python-terrascript/pull/166
@@ -436,9 +440,9 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                         "source": "hashicorp/random",
                         "version": "3.4.3",
                     },
-                    "template": {
-                        "source": "hashicorp/template",
-                        "version": "2.2.0",
+                    "cloudinit": {
+                        "source": "hashicorp/cloudinit",
+                        "version": "2.3.3",
                     },
                 },
                 required_version=TERRAFORM_VERSION[0],
@@ -5428,9 +5432,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                     "content": content,
                 })
             cloudinit_value = {"gzip": True, "base64_encode": True, "part": part}
-            cloudinit_data = data.template_cloudinit_config(
-                identifier, **cloudinit_value
-            )
+            cloudinit_data = cloudinit_config(identifier, **cloudinit_value)
             tf_resources.append(cloudinit_data)
             template_values["user_data"] = "${" + cloudinit_data.rendered + "}"
         template_resource = aws_launch_template(identifier, **template_values)