qontract-reconcile 0.10.1rc604__py3-none-any.whl → 0.10.1rc605__py3-none-any.whl

{qontract_reconcile-0.10.1rc604.dist-info → qontract_reconcile-0.10.1rc605.dist-info}/METADATA

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

@@ -392,8 +392,8 @@ reconcile/templates/aws_access_key_email.j2,sha256=2MUr1ERmyISzKgHqsWYLd-1Wbl-pe
 reconcile/templates/email.yml.j2,sha256=OZgczNRgXPj2gVYTgwQyHAQrMGu7xp-e4W1rX19GcrU,690
 reconcile/templates/jira-checkpoint-missinginfo.j2,sha256=c_Vvg-lEENsB3tgxm9B6Y9igCUQhCnFDYh6xw-zcIbU,570
 reconcile/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/templating/renderer.py,sha256=3wQrVFbm1gdF6Wb1NfCjaXzJ9tTIhFwZO8TlR90eUdc,5086
-reconcile/templating/rendering.py,sha256=EWgtnnzjnMFxVkfL7qsvokIvoUhPnJxEr_goy5vgTMo,4526
+reconcile/templating/renderer.py,sha256=IOZN0ASSKqp4JGXZ1BDba4XosD3nCuqhStxHMGBcxDI,5119
+reconcile/templating/rendering.py,sha256=2kMfstQz12FL-Qfh9OBuzAcYY1OggbFQrCYx1nxERSg,4737
 reconcile/templating/validator.py,sha256=W64nR1eoKVDGewJ4DEX9ZiWWKjFEKg5w5Xi6lrrPBd8,3434
 reconcile/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/conftest.py,sha256=rQousYrxUz-EwAIbsYO6bIwR1B4CrOz9y_zaUVo2lfI,4466
@@ -709,8 +709,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=OvalpVRfY4pNmpMaWHHYqBjV68b1eGQjX8SCyTAXb1w,3501
 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.1rc604.dist-info/METADATA,sha256=8DqZZvzBIt5WiKjrw88w6gjkqWMvmmFJteu3Hskyuyo,2349
-qontract_reconcile-0.10.1rc604.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc604.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc604.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc604.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc605.dist-info/METADATA,sha256=bx0cGNR1BJbl-kyvPzH5U9kttb_fURemj1y_idTO9PU,2349
+qontract_reconcile-0.10.1rc605.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc605.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc605.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc605.dist-info/RECORD,,

reconcile/templating/renderer.py

@@ -2,7 +2,7 @@ import logging
 import os
 from abc import ABC, abstractmethod
 from collections.abc import Callable
-from typing import Optional
+from typing import Any, Optional
 
 from pydantic import BaseModel
 from ruamel import yaml
@@ -87,12 +87,12 @@ def unpack_static_variables(
 
 def unpack_dynamic_variables(
     collection_variables: TemplateCollectionVariablesV1, gql: gql.GqlApi
-) -> dict:
+) -> dict[str, dict[str, Any]]:
     if not collection_variables.dynamic:
         return {}
+
     return {
-        dv.name: list(gql.query(dv.query).values())
-        for dv in collection_variables.dynamic or []
+        dv.name: gql.query(dv.query) or {} for dv in collection_variables.dynamic or []
     }
 
 
@@ -137,7 +137,9 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
             output = r.render_output()
 
             if current_str != output:
-                print(f"diff in template {template.name} for target_path {target_path}")
+                logging.info(
+                    f"diff for template {template.name} in target path {target_path}"
+                )
                 return TemplateOutput(
                     path=target_path,
                     content=output,
@@ -156,12 +158,11 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
         ruaml_instance = create_ruamel_instance()
 
         for c in get_template_collections():
-            variables = {}
             if c.variables:
-                variables.update(
-                    unpack_dynamic_variables(c.variables, gql_no_validation)
-                )
-                variables.update(unpack_static_variables(c.variables))
+                variables = {
+                    "dynamic": unpack_dynamic_variables(c.variables, gql_no_validation),
+                    "static": unpack_static_variables(c.variables),
+                }
 
             for template in c.templates:
                 output = self.process_template(

reconcile/templating/rendering.py

@@ -1,10 +1,11 @@
+import logging
 from abc import ABC, abstractmethod
 from typing import Any, Optional, Protocol
 
 from pydantic import BaseModel
 from ruamel import yaml
 
-from reconcile.utils.jinja2.utils import process_jinja2_template
+from reconcile.utils.jinja2.utils import Jinja2TemplateError, process_jinja2_template
 from reconcile.utils.jsonpath import parse_jsonpath
 from reconcile.utils.secret_reader import SecretReaderBase
 
@@ -49,11 +50,15 @@ class Renderer(ABC):
         return {**self.data.variables, "current": self.data.current}
 
     def _render_template(self, template: str) -> str:
-        return process_jinja2_template(
-            body=template,
-            vars=self._jinja2_render_kwargs(),
-            secret_reader=self.secret_reader,
-        )
+        try:
+            return process_jinja2_template(
+                body=template,
+                vars=self._jinja2_render_kwargs(),
+                secret_reader=self.secret_reader,
+            )
+        except Jinja2TemplateError as e:
+            logging.error(f"Error rendering template {self.template.name}: {e}")
+            raise e
 
     @abstractmethod
     def render_output(self) -> str: