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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc593
+Version: 0.10.1rc594
 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.1rc594.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
@@ -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
@@ -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.1rc594.dist-info/METADATA,sha256=FbIwYOHtBj7VdEK0G9r1zv9lIlu9_bLSKp1d03lWs3c,2349
+qontract_reconcile-0.10.1rc594.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc594.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc594.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc594.dist-info/RECORD,,

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,