qontract-reconcile 0.10.1rc1121__py3-none-any.whl → 0.10.1rc1123__py3-none-any.whl

{qontract_reconcile-0.10.1rc1121.dist-info → qontract_reconcile-0.10.1rc1123.dist-info}/METADATA

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

@@ -30,7 +30,7 @@ reconcile/github_repo_permissions_validator.py,sha256=dcbXdUx6imjNchjp3pg9-z1i7l
 reconcile/github_users.py,sha256=nfTq78QRONIfDVj-5O3bD6psllJjzWFnog-EJ1WqFPU,3672
 reconcile/github_validator.py,sha256=cVTVxJIGR4a1Jz8wrdXEAb_CMpXUzvykVmUURX4cook,917
 reconcile/gitlab_fork_compliance.py,sha256=5joAIGOOLhHme1ipa7ZQeQkUOVe3dKbRO1wJtTwyNR4,4178
-reconcile/gitlab_housekeeping.py,sha256=YAzwk7tZDlw918PjokQksqYJQBUkjouhMpDxIwDdTY0,22208
+reconcile/gitlab_housekeeping.py,sha256=D0DOqC-xuMBMct04_MI8Lq32OAi_QMvvGLOz_E-77Dw,22482
 reconcile/gitlab_labeler.py,sha256=4xJHmVX155fclrHqkR926sL1GH6RTN5XfZ8PnqNXbRA,4534
 reconcile/gitlab_members.py,sha256=PrJE9OhDRdGG_gHM_77nQojLb4B18jtUu8DxgLsRS88,8417
 reconcile/gitlab_mr_sqs_consumer.py,sha256=O46mdziPgGOndbU-0_UJKJVUaiEoVzJPEgKm4_UvYoI,2571
@@ -838,7 +838,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=oZPib4HPq0aZ2Zui1QGJGk6qQdfpeihujGDBnSdKyGE,17627
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=41PVX-P3Q5XMRQLciaTJu1BlW4iZZT8Tjhces8b1SmI,130614
+tools/qontract_cli.py,sha256=1YA7gDYsU-QW1DaTCpz7zPWxsXuLRDLuO0u9HpiL6U0,130561
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -869,8 +869,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.1rc1121.dist-info/METADATA,sha256=jfB4MfYDF91IK8Gfbd9U03A7hlY9rBUZba1zHioJJbw,2213
-qontract_reconcile-0.10.1rc1121.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1121.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1121.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1121.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1123.dist-info/METADATA,sha256=QPnwh45NAXdasJR2bqLK6ApW8ouYVsdq-YCDd2EWCwY,2213
+qontract_reconcile-0.10.1rc1123.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1123.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1123.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1123.dist-info/RECORD,,

reconcile/gitlab_housekeeping.py

@@ -3,6 +3,7 @@ from collections.abc import (
     Iterable,
     Set,
 )
+from contextlib import suppress
 from dataclasses import dataclass
 from datetime import (
     UTC,
@@ -562,9 +563,12 @@ def publish_access_token_expiration_metrics(gl: GitLabApi) -> None:
         if pat.active:
             expiration_date = datetime.strptime(pat.expires_at, EXPIRATION_DATE_FORMAT)
             days_until_expiration = expiration_date.date() - datetime.now(UTC).date()
-            gitlab_token_expiration.labels(name=pat.name).set(
-                days_until_expiration.days
-            )
+            gitlab_token_expiration.labels(pat.name).set(days_until_expiration.days)
+        else:
+            with suppress(KeyError, ValueError):
+                # there's no publicly exposed method to determine if a label exists for a gauge
+                # which is why I wrapped the error like this
+                gitlab_token_expiration.remove(pat.name)
 
 
 def run(dry_run, wait_for_pipeline):

tools/qontract_cli.py

@@ -2906,13 +2906,12 @@ def change_log_tracking(ctx):
             "merged_at": change_log_item.merged_at,
             "apps": ", ".join(change_log_item.apps),
             "changes": ", ".join(covered_change_types_descriptions),
-            "error": change_log_item.error,
         }
         data.append(item)
 
     # TODO(mafriedm): Fix this
     ctx.obj["options"]["sort"] = False
-    columns = ["commit", "merged_at", "apps", "changes", "error"]
+    columns = ["commit", "merged_at", "apps", "changes"]
     print_output(ctx.obj["options"], data, columns)