qontract-reconcile 0.10.1rc1122__py3-none-any.whl → 0.10.1rc1124__py3-none-any.whl

{qontract_reconcile-0.10.1rc1122.dist-info → qontract_reconcile-0.10.1rc1124.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1122
+Version: 0.10.1rc1124
 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.1rc1122.dist-info → qontract_reconcile-0.10.1rc1124.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
@@ -161,7 +161,7 @@ reconcile/aws_version_sync/merge_request_manager/merge_request_manager.py,sha256
 reconcile/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/change_owners/approver.py,sha256=Z3_11vnK2WNOxjEEXVDh0224-_-qbt9d6mBeVE-7fsc,2259
 reconcile/change_owners/bundle.py,sha256=h30fU-JmLH5a-rCAovpzTeTkkkgZztsZ5A2raee0YuU,5355
-reconcile/change_owners/change_log_tracking.py,sha256=3cIS-evZbU1SGkFzKDa7y9GL6uvSBZ0xbTl_qiqp4ss,7937
+reconcile/change_owners/change_log_tracking.py,sha256=kmGRDHwXmhR8nkhbWBXLEim7psEiDbgaviaO7aGQ0Dc,8673
 reconcile/change_owners/change_owners.py,sha256=0HRJhDm0oW3uYJFgzynqA1gA0lbhalhSkmWOiQmr-NM,17062
 reconcile/change_owners/change_types.py,sha256=HEsoBduhcczAXZHwT26mr5sVPxtf8J6tsvjSDDI1ceI,32077
 reconcile/change_owners/changes.py,sha256=YblT-JPFagctTphzd38SjVmj3k1YsgMzN48zGpnLYKM,18222
@@ -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.1rc1122.dist-info/METADATA,sha256=SJBDdVh53pJzF3BJNrVr8eAXEQhzEkgOpsSZy1kKv7g,2213
-qontract_reconcile-0.10.1rc1122.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1122.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1122.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1122.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1124.dist-info/METADATA,sha256=U-g8D9p9PHLNvvdvnP8L0KXkA5inZmNFT8E-jEkRx-8,2213
+qontract_reconcile-0.10.1rc1124.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1124.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1124.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1124.dist-info/RECORD,,

reconcile/change_owners/change_log_tracking.py

@@ -46,6 +46,14 @@ class ChangeLogItem:
 class ChangeLog:
     items: list[ChangeLogItem] = field(default_factory=list)
 
+    @property
+    def apps(self) -> set[str]:
+        return {app for item in self.items for app in item.apps}
+
+    @property
+    def change_types(self) -> set[str]:
+        return {change_type for item in self.items for change_type in item.change_types}
+
 
 class ChangeLogIntegrationParams(PydanticRunParams):
     gitlab_project_id: str
@@ -160,14 +168,19 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
                         | "/dependencies/status-page-component-1.yml"
                         | "/app-sre/app-changelog-1.yml"
                     ):
-                        changed_apps = {
-                            name
-                            for c in change_versions
-                            if (app := c["app"])
-                            and (app_path := app.get("$ref") or app.get("path"))
-                            and (name := app_name_by_path.get(app_path))
-                        }
-                        change_log_item.apps.extend(changed_apps)
+                        for c in change_versions:
+                            c_app: dict[str, str] = c["app"]
+                            app_path = c_app.get("$ref") or c_app.get("path")
+                            if not app_path:
+                                raise KeyError(
+                                    f"app path is expected. missing in query? app information: {c_app}"
+                                )
+                            app_name = app_name_by_path.get(app_path)
+                            if not app_name:
+                                raise KeyError(
+                                    f"app name is expected. missing in query? app information: {c_app}"
+                                )
+                            change_log_item.apps.append(app_name)
                     case "/openshift/cluster-1.yml":
                         changed_apps = {
                             name
@@ -203,6 +216,9 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
                 )
             )
 
+        logging.info(f"apps: {change_log.apps}")
+        logging.info(f"change_types: {change_log.change_types}")
+
         change_log.items = sorted(
             change_log.items, key=lambda i: i.merged_at, reverse=True
         )

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):