qontract-reconcile 0.10.1rc924__py3-none-any.whl → 0.10.1rc926__py3-none-any.whl

{qontract_reconcile-0.10.1rc924.dist-info → qontract_reconcile-0.10.1rc926.dist-info}/METADATA

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

@@ -366,7 +366,7 @@ reconcile/gql_definitions/status_board/status_board.py,sha256=vHEzncabujkqbjJ-ib
 reconcile/gql_definitions/statuspage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/statuspage/statuspages.py,sha256=CTRzjiR9k41LqlkgyoNHwC2JERsoD_Run_aK7jw_Ono,5299
 reconcile/gql_definitions/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/templating/template_collection.py,sha256=QA68QNszPgJY996pPPJmdTULI1gjcT8MDvk1NLKi6_Y,4017
+reconcile/gql_definitions/templating/template_collection.py,sha256=I9razKZ9BThTn1HZW1AamwF0EKXxLACL30DxGxev-rA,4045
 reconcile/gql_definitions/templating/templates.py,sha256=bV1JWwxDW8opARBOrZ_h5NBsJfM-9aL-povmTZnpTOk,3296
 reconcile/gql_definitions/terraform_cloudflare_dns/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/terraform_cloudflare_dns/app_interface_cloudflare_dns_settings.py,sha256=eyGX9HcTF6MZbOYZ6Kl6Mg3k6nJTUtwqs9gDxBP_8Dk,1920
@@ -463,11 +463,11 @@ reconcile/templates/jira-checkpoint-missinginfo.j2,sha256=c_Vvg-lEENsB3tgxm9B6Y9
 reconcile/templates/rosa-classic-cluster-creation.sh.j2,sha256=FVBmnR2FmVModhqOYNBInhF8zk0Qnj9og9KHK5-X9v0,2361
 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=oUUiHHSgD5bcUN3Xf-yoEezAf3LjqN-2GlYhQUTPIZY,13067
+reconcile/templating/renderer.py,sha256=4Uo0HHRhXyXQNCMAEv3MiSL_R_B_DQ3MD7wtYcDzL9w,12951
 reconcile/templating/validator.py,sha256=5f9f35PCHOOdjb7KZquL2YdabyuAUokPDa4xutSEHIQ,5360
 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
+reconcile/templating/lib/merge_request_manager.py,sha256=P4IbblzXbubjlaxAYoahHFADUNIXLepfqwzdnHPs8OY,5608
+reconcile/templating/lib/model.py,sha256=Y1PeEP-koHKiH46JSwv4-PGRGQtcxZa9VmjTiuI6Lxs,889
 reconcile/templating/lib/rendering.py,sha256=6kt8NCCwB4vLKYal7KtRmBDguIC1p_PIQCRr-vL7p5w,5504
 reconcile/terraform_init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/terraform_init/integration.py,sha256=glQ9uy8Kj2aTQXCAupwSFeih7reX_xMX_UuWW_ywBMU,6100
@@ -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.1rc924.dist-info/METADATA,sha256=lDNUw1z1rLZBkUJGhvbJutmyOh-8hG0mfjXu2C88-Ck,2273
-qontract_reconcile-0.10.1rc924.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc924.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc924.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc924.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc926.dist-info/METADATA,sha256=eqpGD1LsAnd-3_U8CIfVPdBtlGf52mIqcTnfrhGHdFE,2273
+qontract_reconcile-0.10.1rc926.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc926.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc926.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc926.dist-info/RECORD,,

reconcile/gql_definitions/templating/template_collection.py

@@ -19,8 +19,8 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
 
 
 DEFINITION = """
-query TemplateCollection_v1 {
-  template_collection_v1 {
+query TemplateCollection_v1($name: String) {
+  template_collection_v1(name: $name) {
     name
     additionalMrLabels
     description

reconcile/templating/lib/merge_request_manager.py

@@ -136,7 +136,7 @@ class MergeRequestManager(MergeRequestManagerBase[TemplateInfo]):
 
         output = data.data
         collections = {o.input.collection for o in output}
-        collection_hashes = {o.input.collection_hash for o in output}
+        collection_hashes = {o.input.calc_template_hash() for o in output}
         additional_labels = {label for o in output for label in o.input.labels}
         # From the way the code is written, we can assert that there is only one collection and one template hash
         assert len(collections) == 1

reconcile/templating/lib/model.py

@@ -1,12 +1,30 @@
+from typing import Any
+
+from deepdiff import DeepHash
 from pydantic import BaseModel
 
+from reconcile.gql_definitions.templating.template_collection import (
+    TemplateV1,
+)
+
 
 class TemplateInput(BaseModel):
     collection: str
-    collection_hash: str
+    templates: list[TemplateV1] = []
+    variables: list[dict[str, Any]] = []
+    collection_hash: str = ""
     enable_auto_approval: bool = False
     labels: list[str] = []
 
+    def calc_template_hash(self) -> str:
+        if not self.collection_hash:
+            hashable = {
+                "templates": sorted(self.templates, key=lambda x: x.name),
+                "variables": self.variables,
+            }
+            self.collection_hash = DeepHash(hashable)[hashable]
+        return self.collection_hash
+
 
 class TemplateOutput(BaseModel):
     input: TemplateInput

reconcile/templating/renderer.py

@@ -7,7 +7,6 @@ from collections.abc import Callable
 from pathlib import Path
 from typing import Any, Self
 
-from deepdiff import DeepHash
 from ruamel import yaml
 
 from reconcile.gql_definitions.templating.template_collection import (
@@ -48,11 +47,11 @@ APP_INTERFACE_PATH_SEPERATOR = "/"
 
 
 def get_template_collections(
-    query_func: Callable | None = None, template_collection_name: str | None = None
+    query_func: Callable | None = None, name: str | None = None
 ) -> list[TemplateCollectionV1]:
-    variables: dict[str, Any] = {"filter": {}}
-    if template_collection_name:
-        variables["filter"]["name"] = template_collection_name
+    variables = {}
+    if name:
+        variables["name"] = name
     if not query_func:
         query_func = gql.get_api().query
     return query(query_func, variables=variables).template_collection_v1 or []
@@ -187,14 +186,6 @@ def unpack_dynamic_variables(
     return dynamic
 
 
-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: str | None
@@ -276,11 +267,11 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
         self,
         collection: TemplateCollectionV1,
         gql_api: GqlApi,
-        dry_run: bool,
         persistence: FilePersistence,
         ruamel_instance: yaml.YAML,
+        input: TemplateInput,
         each: dict[str, Any],
-    ) -> None:
+    ) -> list[TemplateOutput]:
         variables = {}
         if collection.variables:
             variables = {
@@ -289,20 +280,17 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
                 ),
                 "static": unpack_static_variables(collection.variables, each),
             }
+            input.variables.append(variables)
 
-        with PersistenceTransaction(persistence, dry_run) as p:
-            input = TemplateInput(
-                collection=collection.name,
-                collection_hash=calc_template_hash(collection, variables),
-                enable_auto_approval=collection.enable_auto_approval or False,
-                labels=collection.additional_mr_labels or [],
+        outputs: list[TemplateOutput] = []
+        for template in collection.templates:
+            output = self.process_template(
+                template, variables, persistence, ruamel_instance, input
             )
-            for template in collection.templates:
-                output = self.process_template(
-                    template, variables, p, ruamel_instance, input
-                )
-                if not dry_run and output:
-                    p.write([output])
+            if output:
+                outputs.append(output)
+
+        return outputs
 
     def reconcile(
         self,
@@ -311,21 +299,31 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
         ruamel_instance: yaml.YAML,
     ) -> None:
         gql_no_validation = init_from_config(validate_schemas=False)
-        for c in get_template_collections(
-            template_collection_name=self.params.template_collection_name
-        ):
+        for c in get_template_collections(name=self.params.template_collection_name):
             for_each_items: list[dict[str, Any]] = [{}]
             if c.for_each and c.for_each.items:
                 for_each_items = c.for_each.items
-            for item in for_each_items:
-                self.reconcile_template_collection(
-                    c,
-                    gql_no_validation,
-                    dry_run,
-                    persistence,
-                    ruamel_instance,
-                    item,
-                )
+            input = TemplateInput(
+                collection=c.name,
+                templates=c.templates,
+                enable_auto_approval=c.enable_auto_approval or False,
+                labels=c.additional_mr_labels or [],
+            )
+            with PersistenceTransaction(persistence, dry_run) as p:
+                outputs: list[TemplateOutput] = []
+                for item in for_each_items:
+                    outputs.extend(
+                        self.reconcile_template_collection(
+                            c,
+                            gql_no_validation,
+                            p,
+                            ruamel_instance,
+                            input,
+                            item,
+                        )
+                    )
+                if not dry_run and outputs:
+                    p.write(outputs)
 
     @property
     def name(self) -> str: