qontract-reconcile 0.10.1rc938__py3-none-any.whl → 0.10.1rc940__py3-none-any.whl

{qontract_reconcile-0.10.1rc938.dist-info → qontract_reconcile-0.10.1rc940.dist-info}/METADATA

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

@@ -57,14 +57,14 @@ reconcile/ocm_aws_infrastructure_access.py,sha256=SghVWdmgliPVo_xHsp-e64_iC3mqDi
 reconcile/ocm_clusters.py,sha256=bD8zlnUbwfDaVvHd-lSDGWmqY1ag_Gcr6kQ0y3aiKG4,16702
 reconcile/ocm_external_configuration_labels.py,sha256=imEpDv1RBpCSj8tHDv0R76hmNCFtcUzVNgS1yOVl8vs,3870
 reconcile/ocm_github_idp.py,sha256=glwXMsIBcl38-OmDDQCpe0YoLLXfoRgVQmqwXMEXjds,3946
-reconcile/ocm_groups.py,sha256=CluPyvmwE5JOZS2HQSReC1sD8L1ChhnJlAg8lcwdtxc,3395
+reconcile/ocm_groups.py,sha256=-rTPMewkdyo1De6gs4u-294p3z34oUbGfuNi8ov56Sk,3424
 reconcile/ocm_machine_pools.py,sha256=poGfITOCJEMwYAJpiuL8SytgTcBmGIKEZPgNGld80TY,16563
 reconcile/ocm_update_recommended_version.py,sha256=IYkfLXIprOW1jguZeELcGP1iBPuj-b53R-FTqKulMl8,4204
 reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=aLgyInt9oIWAg0XtCiwJRUSwdPx3masKV8kHzkyEEOQ,4282
 reconcile/openshift_base.py,sha256=MvydL1Qq6g_mex_EOWDFFuckt8VtE3LfHW0mhWkUJFs,49712
 reconcile/openshift_cluster_bots.py,sha256=eRPYZqWMKFNxLlSN0QG97V5t1iIESQ0BbGaiaQP5VB0,10940
 reconcile/openshift_clusterrolebindings.py,sha256=QfSy1Ik8eEY5XObc1Q4xyhqyErZenJmbPv_u9wcDNNo,5864
-reconcile/openshift_groups.py,sha256=wb_J5hvfpgS5RTeeZDPiQ_zvwbajGYysFNP603YNioE,9313
+reconcile/openshift_groups.py,sha256=sK2wLWwNupztbfyFPl32VH42s_s8Mu3g-URdlisnwJc,9382
 reconcile/openshift_limitranges.py,sha256=UvCGo_OQ4XoDK55TJmn55qEhhlkhLzhU12tX8nT5kPQ,3442
 reconcile/openshift_namespace_labels.py,sha256=pqKAWjNicCQBoq7CwQI-dpW2dcy9sFZl-rBiO2m-e0k,15605
 reconcile/openshift_namespaces.py,sha256=DdQ4a76g0E7dgRPZEA8MTtZthzUJQjWAb5VdspArWtE,5795
@@ -461,11 +461,11 @@ reconcile/templates/jira-checkpoint-missinginfo.j2,sha256=c_Vvg-lEENsB3tgxm9B6Y9
 reconcile/templates/rosa-classic-cluster-creation.sh.j2,sha256=zqMMlKWV-aUDMtA-Xu5kl5pYLilewDClnKM0c807nNA,2146
 reconcile/templates/rosa-hcp-cluster-creation.sh.j2,sha256=DdnABKA-vu2x420JBBrr200bK8GE62GSzY9lBr2k7v8,2178
 reconcile/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/templating/renderer.py,sha256=4Uo0HHRhXyXQNCMAEv3MiSL_R_B_DQ3MD7wtYcDzL9w,12951
+reconcile/templating/renderer.py,sha256=rcaGQ8sQjsAyWJKjsOFgKhLEUnPvJAh7eDAJBHHSQMs,12800
 reconcile/templating/validator.py,sha256=5f9f35PCHOOdjb7KZquL2YdabyuAUokPDa4xutSEHIQ,5360
 reconcile/templating/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/templating/lib/merge_request_manager.py,sha256=P4IbblzXbubjlaxAYoahHFADUNIXLepfqwzdnHPs8OY,5608
-reconcile/templating/lib/model.py,sha256=Y1PeEP-koHKiH46JSwv4-PGRGQtcxZa9VmjTiuI6Lxs,889
+reconcile/templating/lib/merge_request_manager.py,sha256=XwpOR4rVS9ZiJ_Mn8qfCXPZ7CRLMGSJgeIkqD-8Jhgc,5228
+reconcile/templating/lib/model.py,sha256=YVUIXuPny3_kpFgBMSud8q_ndY5o882wKiX0l0A14L4,481
 reconcile/templating/lib/rendering.py,sha256=pbZv8uYlNtgzTjYMl5qSIW94vDS4CfE47aSjX4HpL-k,6210
 reconcile/terraform_init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/terraform_init/integration.py,sha256=glQ9uy8Kj2aTQXCAupwSFeih7reX_xMX_UuWW_ywBMU,6100
@@ -763,7 +763,7 @@ reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=ojnIjw-8vRnmCCxOG
 reconcile/utils/mr/user_maintenance.py,sha256=cHPBn8zrReWLHalyk-EFdkFJe9zjVjRoZhT4t2zZfGE,3956
 reconcile/utils/ocm/__init__.py,sha256=xv7CJp7K9LCQfa4gL_W0MMCOD1P4qOy8t5aZj1xXNUE,808
 reconcile/utils/ocm/addons.py,sha256=_LDdJ-gapM3s5exKlIUt-MlXZTAUoHezbYBU0QmvfWQ,7335
-reconcile/utils/ocm/base.py,sha256=IF-TOj9YqDBfuXRMAxCZ8xFTNsgLQdsAxCtIk4UjH4E,14457
+reconcile/utils/ocm/base.py,sha256=iL_uMN03URDisWHpsaGGto_pLx652epUkuld_9ctx5o,14555
 reconcile/utils/ocm/cluster_groups.py,sha256=F8oqVqN_4QUnGL0K61zZhoYIzJeP57EcmZpwmoV0mr4,1751
 reconcile/utils/ocm/clusters.py,sha256=Fn4swizm1qq-XiNlIZ9SvahkftWAyNT8hF4kqRBpK4g,8287
 reconcile/utils/ocm/identity_providers.py,sha256=dKed09N8iWmn39tI_MpwgVe47x23eLsknGbjMUxtwr4,2175
@@ -842,8 +842,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 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.1rc938.dist-info/METADATA,sha256=8eH4i_Fb7X4grau64UTXOtx-nGf9JlgMej8egsZGHAU,2262
-qontract_reconcile-0.10.1rc938.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc938.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc938.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc938.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc940.dist-info/METADATA,sha256=J7rHvi9BG3xcDI8XfR2-qBhCHm4A-q0RZ9GyVkmRF8k,2262
+qontract_reconcile-0.10.1rc940.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc940.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc940.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc940.dist-info/RECORD,,

reconcile/ocm_groups.py

@@ -13,6 +13,7 @@ from reconcile import (
 from reconcile.status import ExitCodes
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.ocm import OCMMap
+from reconcile.utils.ocm.base import OCMClusterGroupId
 
 QONTRACT_INTEGRATION = "ocm-groups"
 
@@ -76,9 +77,12 @@ def run(dry_run, thread_pool_size=10):
     ocm_map, current_state = fetch_current_state(clusters, thread_pool_size)
     desired_state = openshift_groups.fetch_desired_state(clusters=ocm_map.clusters())
 
-    # we only manage dedicated-admins via OCM
-    current_state = [s for s in current_state if s["group"] == "dedicated-admins"]
-    desired_state = [s for s in desired_state if s["group"] == "dedicated-admins"]
+    current_state = [
+        s for s in current_state if s["group"] in OCMClusterGroupId.values()
+    ]
+    desired_state = [
+        s for s in desired_state if s["group"] in OCMClusterGroupId.values()
+    ]
 
     diffs = openshift_groups.calculate_diff(current_state, desired_state)
     openshift_groups.validate_diffs(diffs)
@@ -100,8 +104,9 @@ def early_exit_desired_state(*args, **kwargs) -> dict[str, Any]:
         if integration_is_enabled(QONTRACT_INTEGRATION, c) and _cluster_is_compatible(c)
     ]
     desired_state = openshift_groups.fetch_desired_state(clusters=clusters)
-    # we only manage dedicated-admins via OCM
-    desired_state = [s for s in desired_state if s["group"] == "dedicated-admins"]
+    desired_state = [
+        s for s in desired_state if s["group"] in OCMClusterGroupId.values()
+    ]
 
     return {
         "state": desired_state,

reconcile/openshift_groups.py

@@ -31,6 +31,7 @@ from reconcile.utils.oc_map import (
     OCMap,
     init_oc_map_from_clusters,
 )
+from reconcile.utils.ocm.base import OCMClusterGroupId
 from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.sharding import is_in_shard
 
@@ -270,16 +271,19 @@ def run(
         defer(oc_map.cleanup)
     desired_state = fetch_desired_state(oc_map.clusters())
 
-    # we only manage dedicated-admins via OCM
     current_state = [
         s
         for s in current_state
-        if not (s["cluster"] in ocm_clusters and s["group"] == "dedicated-admins")
+        if not (
+            s["cluster"] in ocm_clusters and s["group"] in OCMClusterGroupId.values()
+        )
     ]
     desired_state = [
         s
         for s in desired_state
-        if not (s["cluster"] in ocm_clusters and s["group"] == "dedicated-admins")
+        if not (
+            s["cluster"] in ocm_clusters and s["group"] in OCMClusterGroupId.values()
+        )
     ]
 
     ob.publish_cluster_desired_metrics_from_state(

reconcile/templating/lib/merge_request_manager.py

@@ -4,7 +4,7 @@ import string
 
 from pydantic import BaseModel
 
-from reconcile.templating.lib.model import TemplateOutput
+from reconcile.templating.lib.model import TemplateOutput, TemplateResult
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.merge_request_manager.merge_request_manager import (
     MergeRequestManagerBase,
@@ -24,14 +24,14 @@ TR_LABEL = "template-output"
 
 VERSION_REF = "tr_version"
 COLLECTION_REF = "collection"
-TEMPLATE_COLLECTION_HASH_REF = "collection_hash"
+TEMPLATE_RESULT_HASH_REF = "result_hash"
 
 COMPILED_REGEXES = {
     i: re.compile(rf".*{i}: (.*)$", re.MULTILINE)
     for i in [
         VERSION_REF,
         COLLECTION_REF,
-        TEMPLATE_COLLECTION_HASH_REF,
+        TEMPLATE_RESULT_HASH_REF,
     ]
 }
 
@@ -47,7 +47,7 @@ Parts of this description are used by the Template Renderer to manage the MR.
 
 * {VERSION_REF}: $version
 * {COLLECTION_REF}: $collection
-* {TEMPLATE_COLLECTION_HASH_REF}: $collection_hash
+* {TEMPLATE_RESULT_HASH_REF}: $result_hash
 """
 )
 
@@ -63,10 +63,10 @@ def create_parser() -> Parser:
 
 
 def render_description(
-    collection: str, collection_hash: str, version: str = TR_VERSION
+    collection: str, result_hash: str, version: str = TR_VERSION
 ) -> str:
     return MR_DESC.substitute(
-        collection=collection, collection_hash=collection_hash, version=version
+        collection=collection, result_hash=result_hash, version=version
     )
 
 
@@ -76,7 +76,7 @@ def render_title(collection: str) -> str:
 
 class TemplateInfo(BaseModel):
     collection: str
-    collection_hash: str
+    result_hash: str
 
 
 class TemplateRenderingMR(MergeRequestBase):
@@ -122,7 +122,7 @@ class TemplateRenderingMR(MergeRequestBase):
 
 
 class MrData(BaseModel):
-    data: list[TemplateOutput]
+    result: TemplateResult
     auto_approved: bool
 
 
@@ -134,21 +134,17 @@ class MergeRequestManager(MergeRequestManagerBase[TemplateInfo]):
         if not self._housekeeping_ran:
             self.housekeeping()
 
-        output = data.data
-        collections = {o.input.collection for o in output}
-        collection_hashes = {o.input.calc_template_hash() for o in output}
-        additional_labels = {label for o in output for label in o.input.labels}
-        # From the way the code is written, we can assert that there is only one collection and one template hash
-        assert len(collections) == 1
-        assert len(collection_hashes) == 1
-        collection = collections.pop()
-        collection_hash = collection_hashes.pop()
+        result = data.result
+        output = result.outputs
+        collection = result.collection
+        result_hash = result.calc_result_hash()
+        additional_labels = result.labels
 
         """Create a new MR with the rendered template."""
         if mr := self._merge_request_already_exists({"collection": collection}):
-            if mr.mr_info.collection_hash == collection_hash:
+            if mr.mr_info.result_hash == result_hash:
                 logging.info(
-                    "MR already exists and has the same template hash. Skipping: %s",
+                    "MR already exists and has the same result hash. Skipping: %s",
                     mr.raw.attributes.get("web_url", "NO_WEBURL"),
                 )
                 return None
@@ -159,13 +155,13 @@ class MergeRequestManager(MergeRequestManagerBase[TemplateInfo]):
                 )
                 self._vcs.close_app_interface_mr(
                     mr.raw,
-                    "Closing this MR because the collection hash has changed.",
+                    "Closing this MR because the result hash has changed.",
                 )
 
-        description = render_description(collection, collection_hash)
+        description = render_description(collection, result_hash)
         title = render_title(collection)
 
-        logging.info("Opening MR for %s with hash (%s)", collection, collection_hash)
+        logging.info("Opening MR for %s with hash (%s)", collection, result_hash)
         mr_labels = [TR_LABEL]
 
         if data.auto_approved:

reconcile/templating/lib/model.py

@@ -1,34 +1,20 @@
-from typing import Any
-
 from deepdiff import DeepHash
 from pydantic import BaseModel
 
-from reconcile.gql_definitions.templating.template_collection import (
-    TemplateV1,
-)
-
-
-class TemplateInput(BaseModel):
-    collection: str
-    templates: list[TemplateV1] = []
-    variables: list[dict[str, Any]] = []
-    collection_hash: str = ""
-    enable_auto_approval: bool = False
-    labels: list[str] = []
-
-    def calc_template_hash(self) -> str:
-        if not self.collection_hash:
-            hashable = {
-                "templates": sorted(self.templates, key=lambda x: x.name),
-                "variables": self.variables,
-            }
-            self.collection_hash = DeepHash(hashable)[hashable]
-        return self.collection_hash
-
 
 class TemplateOutput(BaseModel):
-    input: TemplateInput
     is_new: bool = False
     path: str
     content: str
     auto_approved: bool = False
+
+
+class TemplateResult(BaseModel):
+    collection: str
+    enable_auto_approval: bool = False
+    labels: list[str] = []
+    outputs: list[TemplateOutput] = []
+
+    def calc_result_hash(self) -> str:
+        hashable = {o.path: o for o in self.outputs}
+        return DeepHash(hashable)[hashable]

reconcile/templating/renderer.py

@@ -20,7 +20,7 @@ from reconcile.templating.lib.merge_request_manager import (
     MrData,
     create_parser,
 )
-from reconcile.templating.lib.model import TemplateInput, TemplateOutput
+from reconcile.templating.lib.model import TemplateOutput, TemplateResult
 from reconcile.templating.lib.rendering import (
     Renderer,
     TemplateData,
@@ -59,7 +59,7 @@ def get_template_collections(
 
 class FilePersistence(ABC):
     @abstractmethod
-    def write(self, outputs: list[TemplateOutput]) -> None:
+    def write(self, result: TemplateResult) -> None:
         pass
 
     @abstractmethod
@@ -89,8 +89,8 @@ class LocalFilePersistence(FilePersistence):
             raise ValueError("app_interface_data_path should end with /data")
         self.app_interface_data_path = app_interface_data_path
 
-    def write(self, outputs: list[TemplateOutput]) -> None:
-        for output in outputs:
+    def write(self, result: TemplateResult) -> None:
+        for output in result.outputs:
             filepath = Path(join_path(self.app_interface_data_path, output.path))
             filepath.parent.mkdir(parents=True, exist_ok=True)
             filepath.write_text(output.content, encoding="utf-8")
@@ -111,9 +111,11 @@ class PersistenceTransaction(FilePersistence):
         self.dry_run = dry_run
         self.content_cache: dict[str, str | None] = {}
         self.output_cache: dict[str, TemplateOutput] = {}
+        self.result: TemplateResult
 
-    def write(self, outputs: list[TemplateOutput]) -> None:
-        for output in outputs:
+    def write(self, result: TemplateResult) -> None:
+        self.result = result
+        for output in result.outputs:
             self.content_cache[output.path] = output.content
             self.output_cache[output.path] = output
 
@@ -127,7 +129,8 @@ class PersistenceTransaction(FilePersistence):
 
     def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
         if not self.dry_run and self.output_cache:
-            self.persistence.write(list(self.output_cache.values()))
+            self.result.outputs = list(self.output_cache.values())
+            self.persistence.write(self.result)
 
 
 class ClonedRepoGitlabPersistence(FilePersistence):
@@ -143,18 +146,19 @@ class ClonedRepoGitlabPersistence(FilePersistence):
         self.vcs = vcs
         self.mr_manager = mr_manager
 
-    def write(self, outputs: list[TemplateOutput]) -> None:
+    def write(self, result: TemplateResult) -> None:
         self.mr_manager.housekeeping()
 
-        if any([o.input.enable_auto_approval for o in outputs]):
-            auto_approved = [o for o in outputs if o.auto_approved]
+        if result.enable_auto_approval:
+            auto_approved = [o for o in result.outputs if o.auto_approved]
             if auto_approved:
+                result.outputs = auto_approved
                 self.mr_manager.create_merge_request(
-                    MrData(data=auto_approved, auto_approved=True)
+                    MrData(result=result, auto_approved=True)
                 )
                 return
 
-        self.mr_manager.create_merge_request(MrData(data=outputs, auto_approved=False))
+        self.mr_manager.create_merge_request(MrData(result=result, auto_approved=False))
 
     def read(self, path: str) -> str | None:
         return self._read_local_file(join_path(self.local_path, path))
@@ -231,7 +235,6 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
         variables: dict,
         persistence: FilePersistence,
         ruaml_instance: yaml.YAML,
-        template_input: TemplateInput,
     ) -> TemplateOutput | None:
         r = TemplateRendererIntegration._create_renderer(
             template, variables, secret_reader=self.secret_reader
@@ -259,7 +262,6 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
                     content=output,
                     is_new=current_str is None,
                     auto_approved=template.auto_approved or False,
-                    input=template_input,
                 )
         return None
 
@@ -269,7 +271,6 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
         gql_api: GqlApi,
         persistence: FilePersistence,
         ruamel_instance: yaml.YAML,
-        input: TemplateInput,
         each: dict[str, Any],
     ) -> list[TemplateOutput]:
         variables = {}
@@ -280,12 +281,11 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
                 ),
                 "static": unpack_static_variables(collection.variables, each),
             }
-            input.variables.append(variables)
 
         outputs: list[TemplateOutput] = []
         for template in collection.templates:
             output = self.process_template(
-                template, variables, persistence, ruamel_instance, input
+                template, variables, persistence, ruamel_instance
             )
             if output:
                 outputs.append(output)
@@ -303,27 +303,24 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
             for_each_items: list[dict[str, Any]] = [{}]
             if c.for_each and c.for_each.items:
                 for_each_items = c.for_each.items
-            input = TemplateInput(
+            result = TemplateResult(
                 collection=c.name,
-                templates=c.templates,
                 enable_auto_approval=c.enable_auto_approval or False,
                 labels=c.additional_mr_labels or [],
             )
             with PersistenceTransaction(persistence, dry_run) as p:
-                outputs: list[TemplateOutput] = []
                 for item in for_each_items:
-                    outputs.extend(
+                    result.outputs.extend(
                         self.reconcile_template_collection(
                             c,
                             gql_no_validation,
                             p,
                             ruamel_instance,
-                            input,
                             item,
                         )
                     )
-                if not dry_run and outputs:
-                    p.write(outputs)
+                if not dry_run and result.outputs:
+                    p.write(result)
 
     @property
     def name(self) -> str:

reconcile/utils/ocm/base.py

@@ -64,6 +64,10 @@ class OCMClusterGroupId(Enum):
     DEDICATED_ADMINS = "dedicated-admins"
     CLUSTER_ADMINS = "cluster-admins"
 
+    @classmethod
+    def values(cls) -> list[str]:
+        return [group.value for group in cls]
+
 
 class OCMClusterUser(BaseModel):
     """