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

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

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

@@ -128,7 +128,7 @@ reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=fshslI27hrqT40qrVsVOQaW
 reconcile/aus/ocm_upgrade_scheduler.py,sha256=7cK2SakCFkl5EdnqUEAYdUo4pUnnf-SsUR10uytAGyE,3058
 reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=OBgE5mnVdQQV4tMH0AE2V_PDt9Gy6d-LyuPceqjORts,2331
 reconcile/aus/upgrades.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aus/version_gate_approver.py,sha256=VJ6Lrzkapr14QvulzIsE-sTfawIDcyn9UGOC3pIM1gs,6895
+reconcile/aus/version_gate_approver.py,sha256=sZEVB0qVpAXpqymHxavFprkqmqt29fZAIuzSjPHLLrQ,7239
 reconcile/aus/version_gates/__init__.py,sha256=fWx-IvS132Wpa4gWNIuoNvFwqhkuUuFWYWq5-xiLklI,362
 reconcile/aus/version_gates/handler.py,sha256=S_isQPYHbG4DERiUEvQBZ6ngiFX3uMmATA-Q_eNKmFk,839
 reconcile/aus/version_gates/ocp_gate_handler.py,sha256=RW1ppDaCZXVegV9AzzqYXxDUu_Z_7d43Z5h2Pk_piKc,716
@@ -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
@@ -670,7 +670,7 @@ reconcile/utils/ocm/syncsets.py,sha256=zvji9qWvInIRTdoybMaM9-VUhq4L1VewWfWCQmp4u
 reconcile/utils/ocm/upgrades.py,sha256=ZWDfg3VrmRGx7Re-JjecRjwmn7Rh-dsuLA3OljbCByg,6616
 reconcile/utils/rosa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/rosa/rosa_cli.py,sha256=zuXBRh-cJK4yOPjtiSRbUQRURemFiLlWdjj3XteuQ-4,10475
-reconcile/utils/rosa/session.py,sha256=HNE3od_gUL38q43lpKVvaIatd6LYgRnYzRBFbv5hHgQ,3875
+reconcile/utils/rosa/session.py,sha256=nPEmSNos0_ATQEVg2KckAlVyIEBvxUVo7pa0WMACoOU,4150
 reconcile/utils/runtime/__init__.py,sha256=sfk92MGfsBh9tKYHl_FH17NdEsrGBwgDFTb7KNKoIfY,107
 reconcile/utils/runtime/desired_state_diff.py,sha256=finZnWoVDCiYTgu4lGk8G4QOFAGgiIDhD3fcnVqYoxM,8108
 reconcile/utils/runtime/environment.py,sha256=JLptHJoYyeLdMBghJppttP3wZ5HxHLMLgUcfGjIiKLM,2087
@@ -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.1rc606.dist-info/METADATA,sha256=eUhofv8hXCCHrIOqQ_i7gu9ICj-Yd6JG8k3SibY-ZlY,2349
+qontract_reconcile-0.10.1rc606.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc606.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc606.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc606.dist-info/RECORD,,

reconcile/aus/version_gate_approver.py

@@ -178,6 +178,9 @@ class VersionGateApprover(QontractReconcileIntegration[VersionGateApproverParams
         for gate in gates:
             if gate.label in self.handlers and gate.label not in enabled_gate_handlers:
                 continue
+            logging.info(
+                f"handle gate {gate.label} for cluster {cluster.name} {{gate_id = {gate.id}), version = {gate.version_raw_id_prefix}, cluster_id = {cluster.id}, org_id = {ocm_org_id}}}"
+            )
             success = self.handlers[gate.label].handle(
                 ocm_api=ocm_api,
                 ocm_org_id=ocm_org_id,
@@ -189,7 +192,7 @@ class VersionGateApprover(QontractReconcileIntegration[VersionGateApproverParams
                 create_version_agreement(ocm_api, gate.id, cluster.id)
             elif not success:
                 logging.error(
-                    f"Failed to handle gate {gate.id} for cluster {cluster.name}"
+                    f"failed to handle gate {gate.label} for cluster {cluster.name} {{gate_id = {gate.id}), version = {gate.version_raw_id_prefix}, cluster_id = {cluster.id}, org_id = {ocm_org_id}}}"
                 )
 
 

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:

reconcile/utils/rosa/session.py

@@ -89,6 +89,9 @@ class RosaSession:
     def upgrade_account_roles(
         self, role_prefix: str, minor_version: str, channel_group: str, dry_run: bool
     ) -> None:
+        logging.info(
+            f"Upgrade account roles in AWS account {self.aws_account_id} to {minor_version} ({channel_group})"
+        )
         if not dry_run:
             result = self.cli_execute(
                 f"rosa upgrade account-roles --prefix {role_prefix} --version {minor_version} --channel-group {channel_group} -y -m=auto"
@@ -104,6 +107,9 @@ class RosaSession:
         Upgrades the operator roles of a cluster to match the latest
         policy versions available for the cluster.
         """
+        logging.info(
+            f"Upgrade operator roles in AWS account {self.aws_account_id} for cluster {cluster_id}"
+        )
         if not dry_run:
             result = self.cli_execute(
                 cmd=f"rosa upgrade operator-roles --cluster {cluster_id} -y -m=auto",