qontract-reconcile 0.10.1rc593__py3-none-any.whl → 0.10.1rc595__py3-none-any.whl

{qontract_reconcile-0.10.1rc593.dist-info → qontract_reconcile-0.10.1rc595.dist-info}/METADATA

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

@@ -111,7 +111,7 @@ reconcile/terraform_cloudflare_dns.py,sha256=auU4bzeLwd4S8D8oqpqJbrCUoEdELXrgi7v
 reconcile/terraform_cloudflare_resources.py,sha256=EbQQaoDnZ7brvRCpbFtwlD7KLk2hDVNcjhrJGaAywEk,15023
 reconcile/terraform_cloudflare_users.py,sha256=1EbTHwJgiPkJpMP-Ag340QNgGK3mXn3dcC3DpLakudM,13987
 reconcile/terraform_repo.py,sha256=c0GZFuY3rCm6VHjHqYbsgOHrEkRWKF_1LrMThsn2XDw,16127
-reconcile/terraform_resources.py,sha256=UJfygWCnLJAouAXU7EYpF-GBtqujeypMsWq04HZTE-A,18981
+reconcile/terraform_resources.py,sha256=hnW_C8i8am1rAojIOyoDG2FZofeBxK3GxH1S281eSqo,19278
 reconcile/terraform_tgw_attachments.py,sha256=_g7QSHM03YZzTU7O189S4HYtUn7WmwOBq67G4AieU24,15298
 reconcile/terraform_users.py,sha256=kXRUxCUchKCP2dbXXOzctynqMii4oyCP6bYZHQTrlTg,10202
 reconcile/terraform_vpc_peerings.py,sha256=rnDH1u93OyzrBM8Hib0HwSnlxZtx4ScRQaZAcn3mx-k,25402
@@ -387,9 +387,9 @@ 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=_C1QX9uqHuxzZJ6efL2Vdjb0Mahj1kXcfdvVB0Zh7E4,5044
-reconcile/templating/rendering.py,sha256=NH1w-iLhFzz5sWjOA3VTdmkIYgki1KDWH60Yg-0YZVw,4189
-reconcile/templating/validator.py,sha256=0bWxJOQL5UQ9iQT6XAnQuSIS5MJ7uE1Yf8yZJVy-EHo,3381
+reconcile/templating/renderer.py,sha256=3wQrVFbm1gdF6Wb1NfCjaXzJ9tTIhFwZO8TlR90eUdc,5086
+reconcile/templating/rendering.py,sha256=EWgtnnzjnMFxVkfL7qsvokIvoUhPnJxEr_goy5vgTMo,4526
+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
 reconcile/test/fixtures.py,sha256=9SDWAUlSd1rCx7z3GhULHcpr-I6FyCsXxaFAZIqYQsQ,591
@@ -458,7 +458,7 @@ reconcile/test/test_terraform_cloudflare_dns.py,sha256=aQTXX8Vr4h9aWvJZTnpZEhMGY
 reconcile/test/test_terraform_cloudflare_resources.py,sha256=NK_uktyWihkQ3gMN4bCaKerpi43CXAVYGIKTfcz05rY,13550
 reconcile/test/test_terraform_cloudflare_users.py,sha256=RAFtMMdqZha3jNnNNsqbNQQUDSqUzdoM63rCw7fs4Fo,27456
 reconcile/test/test_terraform_repo.py,sha256=soKFJfF8tWIimDs39RQl3Hnh-Od-bR4PfnEA2s1UprM,11552
-reconcile/test/test_terraform_resources.py,sha256=mLXzBids3clL_P9ObMgFoXnw3IDxhF8GiVLLMhCOFH4,15101
+reconcile/test/test_terraform_resources.py,sha256=VQ9nCJfEWEaO7WonUmwgLYc5Sf6ansVRDJngtkL5qLg,15268
 reconcile/test/test_terraform_tgw_attachments.py,sha256=cAq6exc-K-jtLla1CZUZQzVnBkyDnIlL7jybnddhLKc,36861
 reconcile/test/test_terraform_users.py,sha256=Xn4y6EcxnNQb6XcPoOhz_Ikxmh9Nrsu88OM1scN9hzY,5434
 reconcile/test/test_terraform_vpc_peerings.py,sha256=ubcsKh0TrUIwuI1-W3ETIgzsFvzAyeoFmEJFC-IK6JY,20538
@@ -624,7 +624,7 @@ reconcile/utils/internal_groups/models.py,sha256=jlkH_hyyyuwS0J1IpuS7W1AyQSKQ2Qp
 reconcile/utils/jinja2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/jinja2/extensions.py,sha256=zV_x8MhSHAynKhFnG3fULXrwsm5fUG_88IygZHSnN0o,1284
 reconcile/utils/jinja2/filters.py,sha256=_kJjdMsY3lGS5PUn4NnpXUQDNrL1IwiKsB-0MhTMGYM,4521
-reconcile/utils/jinja2/utils.py,sha256=LM5YsXoGS_7KUpy3nsLd0aWwl0uwhBGVvJIp6lTVN74,5812
+reconcile/utils/jinja2/utils.py,sha256=1TV_BoKrCFxVPbRY4hhUmbasrPa_wm9AoabCEIOXRLg,5947
 reconcile/utils/membershipsources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/membershipsources/app_interface_resolver.py,sha256=IlDiRtJZ0AfAGKEawybB6SvsKbm1POTXL6fpEt699E0,1979
 reconcile/utils/membershipsources/models.py,sha256=IFu6KHFe-HUTJPiAO3fEw7i22yv4_ytgBW-h_wrO6V4,2015
@@ -693,8 +693,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.1rc593.dist-info/METADATA,sha256=Lfkt4RPQCrWJAcp1p0WBo6W__DgrMYySGwnLQTWNFUw,2349
-qontract_reconcile-0.10.1rc593.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc593.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc593.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc593.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc595.dist-info/METADATA,sha256=enf6vRlN-w4CTr8wGMuef_otPcVxb7bXKhEPFI7tdfQ,2349
+qontract_reconcile-0.10.1rc595.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc595.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc595.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc595.dist-info/RECORD,,

reconcile/templating/renderer.py

@@ -108,8 +108,8 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
     def __init__(self, params: TemplateRendererIntegrationParams) -> None:
         super().__init__(params)
 
-    @staticmethod
     def process_template(
+        self,
         template: TemplateV1,
         variables: dict,
         persistence: FilePersistence,
@@ -120,6 +120,7 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
             TemplateData(
                 variables=variables,
             ),
+            secret_reader=self.secret_reader,
         )
         target_path = r.render_target_path()
 

reconcile/templating/rendering.py

@@ -1,11 +1,12 @@
 from abc import ABC, abstractmethod
 from typing import Any, Optional, Protocol
 
-from jinja2.sandbox import SandboxedEnvironment
 from pydantic import BaseModel
 from ruamel import yaml
 
+from reconcile.utils.jinja2.utils import process_jinja2_template
 from reconcile.utils.jsonpath import parse_jsonpath
+from reconcile.utils.secret_reader import SecretReaderBase
 
 
 class TemplateData(BaseModel):
@@ -34,17 +35,24 @@ class Template(Protocol):
 
 
 class Renderer(ABC):
-    def __init__(self, template: Template, data: TemplateData):
+    def __init__(
+        self,
+        template: Template,
+        data: TemplateData,
+        secret_reader: SecretReaderBase,
+    ):
         self.template = template
         self.data = data
-        self.jinja_env = SandboxedEnvironment()
+        self.secret_reader = secret_reader
 
     def _jinja2_render_kwargs(self) -> dict[str, Any]:
         return {**self.data.variables, "current": self.data.current}
 
     def _render_template(self, template: str) -> str:
-        return self.jinja_env.from_string(template).render(
-            **self._jinja2_render_kwargs()
+        return process_jinja2_template(
+            body=template,
+            vars=self._jinja2_render_kwargs(),
+            secret_reader=self.secret_reader,
         )
 
     @abstractmethod
@@ -126,7 +134,15 @@ class PatchRenderer(Renderer):
         return yaml.dump(self.data.current, width=4096, Dumper=yaml.RoundTripDumper)
 
 
-def create_renderer(template: Template, data: TemplateData) -> Renderer:
+def create_renderer(
+    template: Template,
+    data: TemplateData,
+    secret_reader: SecretReaderBase,
+) -> Renderer:
     if template.patch:
-        return PatchRenderer(template=template, data=data)
-    return FullRenderer(template=template, data=data)
+        return PatchRenderer(template=template, data=data, secret_reader=secret_reader)
+    return FullRenderer(
+        template=template,
+        data=data,
+        secret_reader=secret_reader,
+    )

reconcile/templating/validator.py

@@ -52,7 +52,6 @@ class TemplateValidatorIntegration(QontractReconcileIntegration):
         for template in get_templates():
             for test in template.template_test:
                 logging.info(f"Running test {test.name} for template {template.name}")
-
                 r = create_renderer(
                     template,
                     TemplateData(
@@ -61,6 +60,7 @@ class TemplateValidatorIntegration(QontractReconcileIntegration):
                             test.current or "", Loader=yaml.RoundTripLoader
                         ),
                     ),
+                    secret_reader=self.secret_reader,
                 )
                 if test.expected_target_path:
                     self.diff_result(

reconcile/terraform_resources.py

@@ -67,7 +67,7 @@ from reconcile.utils.vault import (
 )
 
 QONTRACT_INTEGRATION = "terraform_resources"
-QONTRACT_INTEGRATION_VERSION = make_semver(0, 5, 2)
+QONTRACT_INTEGRATION_VERSION = make_semver(0, 5, 3)
 QONTRACT_TF_PREFIX = "qrtf"
 
 
@@ -350,6 +350,11 @@ class MultipleAccountNamesInDryRunException(Exception):
     pass
 
 
+class CacheSource(TypedDict):
+    terraform_configurations: dict[str, str]
+    resource_spec_inventory: ExternalResourceSpecInventory
+
+
 @defer
 def run(
     dry_run: bool,
@@ -414,11 +419,15 @@ def run(
         "terraform-resources-extended-early-exit",
         default=False,
     ):
+        cache_source = CacheSource(
+            terraform_configurations=ts.terraform_configurations(),
+            resource_spec_inventory=ts.resource_spec_inventory,
+        )
         extended_early_exit_run(
             integration=QONTRACT_INTEGRATION,
             integration_version=QONTRACT_INTEGRATION_VERSION,
             dry_run=dry_run,
-            cache_source=ts.terraform_configurations(),
+            cache_source=cache_source,
             shard="_".join(account_name) if account_name else "",
             ttl_seconds=extended_early_exit_cache_ttl_seconds,
             logger=logging.getLogger(),

reconcile/test/test_terraform_resources.py

@@ -370,12 +370,16 @@ def test_run_with_extended_early_exit_run_enabled(
         log_cached_log_output=True,
         defer=defer,
     )
+    expected_cache_source = {
+        "terraform_configurations": mocks["ts"].terraform_configurations.return_value,
+        "resource_spec_inventory": mocks["ts"].resource_spec_inventory,
+    }
 
     mocks["extended_early_exit_run"].assert_called_once_with(
         integration=integ.QONTRACT_INTEGRATION,
         integration_version=integ.QONTRACT_INTEGRATION_VERSION,
         dry_run=True,
-        cache_source=mocks["ts"].terraform_configurations.return_value,
+        cache_source=expected_cache_source,
         shard="a",
         ttl_seconds=60,
         logger=mocks["logging"].getLogger.return_value,

reconcile/utils/jinja2/utils.py

@@ -157,6 +157,9 @@ def process_jinja2_template(
         "query": lookup_graphql_query_results,
         "url": url_makes_sense,
     })
+    if "_template_mocks" in vars:
+        for k, v in vars["_template_mocks"].items():
+            vars[k] = lambda *args, **kwargs: v
     try:
         template = compile_jinja2_template(body, extra_curly)
         r = template.render(vars)