qontract-reconcile 0.10.1rc875__py3-none-any.whl → 0.10.1rc877__py3-none-any.whl

{qontract_reconcile-0.10.1rc875.dist-info → qontract_reconcile-0.10.1rc877.dist-info}/METADATA

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

@@ -364,7 +364,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=lS0vzEKV2ZrzOqOEriqpy0yBgKjb2Ftrzgx6PIH46_4,3310
+reconcile/gql_definitions/templating/template_collection.py,sha256=Y1xA4ODphlsSMjGkAH-nm-dF5FzaQlpfs8hVMBczH5o,3542
 reconcile/gql_definitions/templating/templates.py,sha256=ejAvQ13zfNMQTz3FWtRUic6dSvio3aAgBKEqt600hbk,2821
 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
@@ -461,7 +461,7 @@ reconcile/templates/jira-checkpoint-missinginfo.j2,sha256=c_Vvg-lEENsB3tgxm9B6Y9
 reconcile/templates/rosa-classic-cluster-creation.sh.j2,sha256=0UHfYtXRVJqP07VJQx456cRI6EbZNBgamtP_8nb4WPY,2353
 reconcile/templates/rosa-hcp-cluster-creation.sh.j2,sha256=O7Bf3WQIJhsZoEqaYA0wRktUO4yXXCb4BQkuvvp-C80,2385
 reconcile/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/templating/renderer.py,sha256=HfPjE7bl8RjpZbesgfx8HYCfHimkdYO7whst5HJsFeY,10851
+reconcile/templating/renderer.py,sha256=cRgoT5aMTbo3UYR9RkHIajd5lQ4wjN1Bge-DTrhY6Ac,11831
 reconcile/templating/validator.py,sha256=pvDEc6veznEZzjypkoRJUGMMFLWosU-zd7i3j7JeNjE,4670
 reconcile/templating/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/templating/lib/merge_request_manager.py,sha256=JUkfF3smaQ8onzKF5F7UpmA7MWaQpftANy6dDo1FCug,5464
@@ -472,7 +472,7 @@ reconcile/terraform_init/integration.py,sha256=xcFKTc_or3xB3kE_I3OECNkkgbwALIwwd
 reconcile/terraform_init/merge_request.py,sha256=3CYtgSd7Q9zjKg4wsDz437EPCRfGeZZ8fZ0Y-ChKXJY,1475
 reconcile/terraform_init/merge_request_manager.py,sha256=fMcT6hbdEF3nFATJpvr8BedvQHq_MzFkgVJSloBNwOQ,3101
 reconcile/terraform_vpc_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/terraform_vpc_resources/integration.py,sha256=OOi29VUtlAhCgeUV86UlWCK72dNTp8tgXX6SXLpuMr8,8113
+reconcile/terraform_vpc_resources/integration.py,sha256=hQX5JWrC-MSwICs4FMJ_pbTa5eTQP6VrmE58z_XYclg,8204
 reconcile/terraform_vpc_resources/merge_request.py,sha256=loRymUigCIvaaT0s_NzktZchh-DGRQnCICdBSCAcFPY,1503
 reconcile/terraform_vpc_resources/merge_request_manager.py,sha256=Vj2nuQbQyrL4q_il1My-bLxYNh_r3YXqX45P8fwtP6Q,3259
 reconcile/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -837,8 +837,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jrss,4941
 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.1rc875.dist-info/METADATA,sha256=euiJEioZo1ljg7S8g_lGaosApSKGcaAYXlVhmK8s3YU,2273
-qontract_reconcile-0.10.1rc875.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc875.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc875.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc875.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc877.dist-info/METADATA,sha256=eGK-obD-y6Kqjiz2fI4n5OefUFpshM_OXDvIMLxVkxw,2273
+qontract_reconcile-0.10.1rc877.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc877.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc877.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc877.dist-info/RECORD,,

reconcile/gql_definitions/templating/template_collection.py

@@ -25,6 +25,9 @@ query TemplateCollection_v1 {
     additionalMrLabels
     description
     enableAutoApproval
+    forEach {
+      items
+    }
     variables {
       static
       dynamic {
@@ -54,6 +57,10 @@ class ConfiguredBaseModel(BaseModel):
         extra=Extra.forbid
 
 
+class TemplateCollectionForEachV1(ConfiguredBaseModel):
+    items: Optional[list[Json]] = Field(..., alias="items")
+
+
 class TemplateCollectionVariablesQueriesV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     query: str = Field(..., alias="query")
@@ -83,6 +90,7 @@ class TemplateCollectionV1(ConfiguredBaseModel):
     additional_mr_labels: Optional[list[str]] = Field(..., alias="additionalMrLabels")
     description: str = Field(..., alias="description")
     enable_auto_approval: Optional[bool] = Field(..., alias="enableAutoApproval")
+    for_each: Optional[TemplateCollectionForEachV1] = Field(..., alias="forEach")
     variables: Optional[TemplateCollectionVariablesV1] = Field(..., alias="variables")
     templates: list[TemplateV1] = Field(..., alias="templates")
 

reconcile/templating/renderer.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import os
 import tempfile
@@ -30,7 +31,7 @@ from reconcile.typed_queries.github_orgs import get_github_orgs
 from reconcile.typed_queries.gitlab_instances import get_gitlab_instances
 from reconcile.utils import gql
 from reconcile.utils.git import clone
-from reconcile.utils.gql import init_from_config
+from reconcile.utils.gql import GqlApi, init_from_config
 from reconcile.utils.jinja2.utils import process_jinja2_template
 from reconcile.utils.ruamel import create_ruamel_instance
 from reconcile.utils.runtime.integration import (
@@ -158,18 +159,25 @@ class ClonedRepoGitlabPersistence(FilePersistence):
 
 def unpack_static_variables(
     collection_variables: TemplateCollectionVariablesV1,
+    each: dict[str, Any],
 ) -> dict:
-    return collection_variables.static or {}
+    return {
+        k: json.loads(process_jinja2_template(body=json.dumps(v), vars={"each": each}))
+        for k, v in (collection_variables.static or {}).items()
+    }
 
 
 def unpack_dynamic_variables(
-    collection_variables: TemplateCollectionVariablesV1, gql: gql.GqlApi
+    collection_variables: TemplateCollectionVariablesV1,
+    each: dict[str, Any],
+    gql: gql.GqlApi,
 ) -> dict[str, dict[str, Any]]:
     static = collection_variables.static or {}
     dynamic: dict[str, dict[str, Any]] = {}
     for dv in collection_variables.dynamic or []:
         query = process_jinja2_template(
-            body=dv.query, vars={"static": static, "dynamic": dynamic}
+            body=dv.query,
+            vars={"static": static, "dynamic": dynamic, "each": each},
         )
         dynamic[dv.name] = gql.query(query) or {}
     return dynamic
@@ -238,6 +246,38 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
                 )
         return None
 
+    def reconcile_template_collection(
+        self,
+        collection: TemplateCollectionV1,
+        gql_api: GqlApi,
+        dry_run: bool,
+        persistence: FilePersistence,
+        ruamel_instance: yaml.YAML,
+        each: dict[str, Any],
+    ) -> None:
+        variables = {}
+        if collection.variables:
+            variables = {
+                "dynamic": unpack_dynamic_variables(
+                    collection.variables, each, gql_api
+                ),
+                "static": unpack_static_variables(collection.variables, each),
+            }
+
+        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 [],
+            )
+            for template in collection.templates:
+                output = self.process_template(
+                    template, variables, p, ruamel_instance, input
+                )
+                if not dry_run and output:
+                    p.write([output])
+
     def reconcile(
         self,
         dry_run: bool,
@@ -247,26 +287,18 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
         gql_no_validation = init_from_config(validate_schemas=False)
 
         for c in get_template_collections():
-            variables = {}
-            if c.variables:
-                variables = {
-                    "dynamic": unpack_dynamic_variables(c.variables, gql_no_validation),
-                    "static": unpack_static_variables(c.variables),
-                }
-
-            with PersistenceTransaction(persistence, dry_run) as p:
-                input = TemplateInput(
-                    collection=c.name,
-                    collection_hash=calc_template_hash(c, variables),
-                    enable_auto_approval=c.enable_auto_approval or False,
-                    labels=c.additional_mr_labels or [],
+            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,
                 )
-                for template in c.templates:
-                    output = self.process_template(
-                        template, variables, p, ruamel_instance, input
-                    )
-                    if not dry_run and output:
-                        p.write([output])
 
     @property
     def name(self) -> str:

reconcile/terraform_vpc_resources/integration.py

@@ -72,8 +72,9 @@ class TerraformVpcResources(QontractReconcileIntegration[TerraformVpcResourcesPa
         for request in requests:
             # Skiping requests that don't have outputs,
             # this happens because we are not filtering the requests
-            # when running the integration for a single account with --account-name
-            if request.account.name not in outputs.keys():
+            # when running the integration for a single account with --account-name.
+            # We also don't want to create outputs for deleted requets.
+            if request.account.name not in outputs.keys() or request.delete:
                 continue
 
             outputs_per_request[request.identifier] = []