qontract-reconcile 0.10.1rc398__py3-none-any.whl → 0.10.1rc399__py3-none-any.whl

{qontract_reconcile-0.10.1rc398.dist-info → qontract_reconcile-0.10.1rc399.dist-info}/METADATA

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

@@ -321,7 +321,7 @@ reconcile/saas_auto_promotions_manager/subscriber.py,sha256=cLhPlkT71J2LIice3SLm
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request.py,sha256=PNu7sE-tDUY61E03z5w0b93fdowZ8auCl0S4_vhYOKQ,1333
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager.py,sha256=SNJ9WLlaFnf_tblwC0xDBfrXi4SVadeFgV3llhTqbGM,10959
-reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=cQYT0qCQQdsG4H16zpXBnHvnF_aZy4T87SxruyxRgNc,8565
+reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=t4Zi1BSDBEhrEl0hFIC7bPA41IGwh3kTWlo7qCtDTLE,7176
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=mihuWynroB1Cea1Lsvf6V8Nb8PGiBdcLC0uhCX_52Y0,6966
 reconcile/saas_auto_promotions_manager/utils/vcs.py,sha256=WXzr6I0Q9NzTU8s2Dk_wdWxKN8zUwPFiXbx31CnuY0w,5237
@@ -613,8 +613,8 @@ tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sd_app_sre_alert_report.py,sha256=JeLhgzpKCPgLvptwg_4ZvJHLVWKNG1T5845HXTkMBxA,1826
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc398.dist-info/METADATA,sha256=40hOlhFAF0_KDt5bD1YtZDrIG_MHZi-tFwgioF-OQa4,2347
-qontract_reconcile-0.10.1rc398.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-qontract_reconcile-0.10.1rc398.dist-info/entry_points.txt,sha256=ErVY2Jp-0Rtuq5KOtMlW5yvna4nIEuc_1YbEdEdcy9o,301
-qontract_reconcile-0.10.1rc398.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc398.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc399.dist-info/METADATA,sha256=8Rhg2IJPlLsVXNXBbLK1INKk5ke86eV9Z67fDjHGShA,2347
+qontract_reconcile-0.10.1rc399.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+qontract_reconcile-0.10.1rc399.dist-info/entry_points.txt,sha256=ErVY2Jp-0Rtuq5KOtMlW5yvna4nIEuc_1YbEdEdcy9o,301
+qontract_reconcile-0.10.1rc399.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc399.dist-info/RECORD,,

reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py

@@ -56,14 +56,9 @@ class Renderer:
                 **namespace_selector
             )
             # Check if the target namespace is addressed by the selector
-            return (
-                len(
-                    get_namespaces_by_selector(
-                        namespaces=[subscriber.target_namespace],
-                        namespace_selector=selector,
-                    )
-                )
-                == 1
+            return is_namespace_addressed_by_selector(
+                namespace=subscriber.target_namespace,
+                namespace_selector=selector,
             )
         return target["namespace"]["$ref"] == subscriber.target_namespace.path
 
@@ -158,56 +153,33 @@ class Renderer:
         return f"[auto-promotion] event for channel(s) {channels}"
 
 
-def get_namespaces_by_selector(
-    namespaces: list[SaasTargetNamespace],
-    namespace_selector: SaasResourceTemplateTargetNamespaceSelectorV1,
-) -> list[SaasTargetNamespace]:
-    """
-    # TODO: for whatever reason tox fails to import this from saas_files.
-    Interestingly it works outside of tox, but to get going we simply
-    copy the function here - very bad style but works for now
+def _parse_expression(expression: str) -> Any:
+    try:
+        return parser.parse(expression)
+    except JsonPathParserError as e:
+        raise RuntimeError(
+            f"Invalid jsonpath expression in namespaceSelector '{expression}' :{e}"
+        )
 
-    Copy of reconcile.typed_queries.saas_files.get_namespaces_by_selector
-    """
 
-    # json representation of all the namespaces to filter on
+def is_namespace_addressed_by_selector(
+    namespace: SaasTargetNamespace,
+    namespace_selector: SaasResourceTemplateTargetNamespaceSelectorV1,
+) -> bool:
+    # json representation of namespace to filter on
     # remove all the None values to simplify the jsonpath expressions
-    namespaces_as_dict = {
-        "namespace": [ns.dict(by_alias=True, exclude_none=True) for ns in namespaces]
+    namespace_as_dict = {
+        "namespace": [namespace.dict(by_alias=True, exclude_none=True)]
     }
 
-    def _get_namespace_by_cluster_and_name(
-        cluster_name: str, name: str
-    ) -> SaasTargetNamespace:
-        for ns in namespaces:
-            if ns.cluster.name == cluster_name and ns.name == name:
-                return ns
-        # this should never ever happen - just make mypy happy
-        raise RuntimeError(f"namespace '{name}' not found in cluster '{cluster_name}'")
+    do_include = any(
+        _parse_expression(include).find(namespace_as_dict)
+        for include in namespace_selector.json_path_selectors.include or []
+    )
 
-    filtered_namespaces: dict[str, Any] = {}
+    do_exclude = any(
+        _parse_expression(exclude).find(namespace_as_dict)
+        for exclude in namespace_selector.json_path_selectors.exclude or []
+    )
 
-    try:
-        for include in namespace_selector.json_path_selectors.include:
-            for match in parser.parse(include).find(namespaces_as_dict):
-                cluster_name = match.value["cluster"]["name"]
-                ns_name = match.value["name"]
-                filtered_namespaces[
-                    f"{cluster_name}-{ns_name}"
-                ] = _get_namespace_by_cluster_and_name(cluster_name, ns_name)
-    except JsonPathParserError as e:
-        raise RuntimeError(
-            f"Invalid jsonpath expression in namespaceSelector '{include}' :{e}"
-        )
-
-    try:
-        for exclude in namespace_selector.json_path_selectors.exclude or []:
-            for match in parser.parse(exclude).find(namespaces_as_dict):
-                cluster_name = match.value["cluster"]["name"]
-                ns_name = match.value["name"]
-                filtered_namespaces.pop(f"{cluster_name}-{ns_name}", None)
-    except JsonPathParserError as e:
-        raise RuntimeError(
-            f"Invalid jsonpath expression in namespaceSelector '{exclude}' :{e}"
-        )
-    return list(filtered_namespaces.values())
+    return do_include and not do_exclude