qontract-reconcile 0.10.2.dev219__py3-none-any.whl → 0.10.2.dev221__py3-none-any.whl

{qontract_reconcile-0.10.2.dev219.dist-info → qontract_reconcile-0.10.2.dev221.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev219
+Version: 0.10.2.dev221
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev219.dist-info → qontract_reconcile-0.10.2.dev221.dist-info}/RECORD

@@ -629,7 +629,7 @@ reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=C0thIm_k9MBldfqwHzyqtYZk9sIvMdm9IbbnXLGwjD8,14158
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
 reconcile/utils/helm.py,sha256=wC1h0GylhDFeZ6hZEtYy2giAGIIQroaQhkAtURoSlI8,3893
-reconcile/utils/helpers.py,sha256=womAD2bKPUAFOjHvNPAe_2Hsb-oVTxuQiYPGeR-Thp0,1772
+reconcile/utils/helpers.py,sha256=koyAtYnxsUVx-HIn6GpedcUE-ekz_VtoYDkiZ0iv8ik,1795
 reconcile/utils/imap_client.py,sha256=h8YDiCSCvroErhpH_-KGYI7Y2WU2Q2oSpuxDFbOkSbY,1989
 reconcile/utils/instrumented_wrappers.py,sha256=VqT4s0Bdicv224-uSeSaugtHXm-xJ3oSeBiqj0QQRiU,1942
 reconcile/utils/jenkins_api.py,sha256=RaKuZmO7_lbI-hE6c_Pq2a6CQdmBVj7BcP2jR68cIbI,7081
@@ -651,13 +651,13 @@ reconcile/utils/oc_map.py,sha256=ougQ-Wlsa8ymoE_lPQ7g2LlpsUOsHVeRCLYW_6fjeWU,897
 reconcile/utils/ocm_base_client.py,sha256=t5kxhklEqOpenXPkXiwQIk8d3D7hIUndBm5qGusS0bc,6681
 reconcile/utils/openshift_resource.py,sha256=DI-e04f4NqEUFJ_9HzjY-QMhFt7o2XVauM09mzMC5Vs,24716
 reconcile/utils/openssl.py,sha256=QVvhzhpChq_4Daf_5wE1qeZJr4thg3DDjJPn4bOPD4E,365
-reconcile/utils/output.py,sha256=dj3tE_sj3x8ssnAV6hCGmsRI9ttqUUFsIH1r7RujNA8,2038
+reconcile/utils/output.py,sha256=wvsyf8NsFTaFHNkc8to75ta8f474Y4TMO4cHyAHEePk,2209
 reconcile/utils/pagerduty_api.py,sha256=_24i9S_4X7nlvHb-7clXRE0p1BG4ODjOzKxWO-F9WgI,7627
 reconcile/utils/parse_dhms_duration.py,sha256=TONpLnec5gHeF7k815YNJpQyDjXhkxZIcv9s8ffbTSY,1840
 reconcile/utils/password_validator.py,sha256=XwuWg-8CPlcuG7dl_oQ1G1h2gSVSnfMym_VkuprpWVg,2183
 reconcile/utils/prometheus.py,sha256=Ad0rwLbxRuuYjHwkwJloHEdK0bvy42h-p-HIT1DhDhs,3832
 reconcile/utils/promotion_state.py,sha256=McSgGj3oog83ThJCrMR2v8q6Xb_Pxij-HEe_RbDu8cg,3946
-reconcile/utils/promtool.py,sha256=xmPBWEApkk0L2qZBAvTxakNXxfTz-tVLPFxGnpsxXnM,2831
+reconcile/utils/promtool.py,sha256=xPK4ejsXtK0csj7BVAs49IkilGWgWpHiC2j_oPAp4rQ,2831
 reconcile/utils/quay_api.py,sha256=uE_jxcdy3ViHtYFAfwDQuFDaO7Pr6AAPoVnmORbyHio,7822
 reconcile/utils/quay_mirror.py,sha256=dpWCNv5lITwIk6Q9RkmqaQKHNk_JPy27UQEribJ7E-U,1324
 reconcile/utils/raw_github_api.py,sha256=2WKtE8ABYYB9UGOAh9N_kLkksBWL3320Z2_scteZddI,2805
@@ -815,7 +815,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev219.dist-info/METADATA,sha256=-wCSzoFu4nVFyPf8EWli9O7kQ8EDxTwL_IuetzJZApg,24555
-qontract_reconcile-0.10.2.dev219.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev219.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev219.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev221.dist-info/METADATA,sha256=ULhOVhcm1skrHzQUR1v8GulsYxMPU2MCwHXPSmRcpiY,24555
+qontract_reconcile-0.10.2.dev221.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev221.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev221.dist-info/RECORD,,

reconcile/utils/helpers.py

@@ -4,6 +4,7 @@ import re
 import string
 from collections import Counter
 from collections.abc import (
+    Generator,
     Iterable,
     Mapping,
 )
@@ -17,11 +18,12 @@ DEFAULT_TOGGLE_LEVEL = logging.ERROR
 
 
 @contextmanager
-def toggle_logger(log_level: int = DEFAULT_TOGGLE_LEVEL):
+def toggle_logger(log_level: int = DEFAULT_TOGGLE_LEVEL) -> Generator[logging.Logger]:
     logger = logging.getLogger()
     default_level = logger.level
     try:
-        yield logger.setLevel(log_level)  # type: ignore[func-returns-value]
+        logger.setLevel(log_level)
+        yield logger
     finally:
         logger.setLevel(default_level)
 

reconcile/utils/output.py

@@ -41,26 +41,40 @@ def print_output(
     return formatted_content
 
 
-def format_table(content, columns, table_format="simple") -> str:
+def _format_cell(cell: dict, column: str, table_format: str) -> dict | str:
+    # example: for column 'cluster.name'
+    # cell = item['cluster']['name']
+    raw_data = cell
+    for token in column.split("."):
+        raw_data = raw_data.get(token) or {}
+    if raw_data == {}:
+        return ""
+
+    if not isinstance(raw_data, list | str):
+        return raw_data
+
+    data = ""
+    if isinstance(raw_data, str):
+        data = raw_data
+
+    if isinstance(raw_data, list):
+        if table_format == "github":
+            data = "<br />".join(raw_data)
+        else:
+            data = "\n".join(raw_data)
+
+    if table_format == "github":
+        return data.replace("|", "&#124;")
+
+    return data
+
+
+def format_table(
+    content: Iterable[dict], columns: Iterable[str], table_format: str = "simple"
+) -> str:
     headers = [column.upper() for column in columns]
     table_data = []
     for item in content:
-        row_data = []
-        for column in columns:
-            # example: for column 'cluster.name'
-            # cell = item['cluster']['name']
-            cell = item
-            for token in column.split("."):
-                cell = cell.get(token) or {}
-            if cell == {}:
-                cell = ""
-            if isinstance(cell, list):
-                if table_format == "github":
-                    cell = "<br />".join(cell)
-                else:
-                    cell = "\n".join(cell)
-            if table_format == "github" and isinstance(cell, str):
-                cell = cell.replace("|", "&#124;")
-            row_data.append(cell)
+        row_data = [_format_cell(item, column, table_format) for column in columns]
         table_data.append(row_data)
     return tabulate(table_data, headers=headers, tablefmt=table_format)

reconcile/utils/promtool.py

@@ -9,7 +9,7 @@ import yaml
 from reconcile.utils.defer import defer
 from reconcile.utils.structs import CommandExecutionResult
 
-PROMTOOL_VERSION = ["2.54.1"]
+PROMTOOL_VERSION = ["2.55.1"]
 PROMTOOL_VERSION_REGEX = r"^promtool,\sversion\s([\d]+\.[\d]+\.[\d]+).+$"