qontract-reconcile 0.10.1rc1114__py3-none-any.whl → 0.10.1rc1116__py3-none-any.whl

{qontract_reconcile-0.10.1rc1114.dist-info → qontract_reconcile-0.10.1rc1116.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1114
+Version: 0.10.1rc1116
 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.1rc1114.dist-info → qontract_reconcile-0.10.1rc1116.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=fgmR_Q-RHchGhYky-Q78f0Wzx4xQ_mk8-0mpDgfFsMI,22193
+reconcile/gitlab_housekeeping.py,sha256=YAzwk7tZDlw918PjokQksqYJQBUkjouhMpDxIwDdTY0,22208
 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
@@ -467,12 +467,12 @@ reconcile/skupper_network/site_controller.py,sha256=FHVJ72h88VUEga4WH-WltkqovddN
 reconcile/statuspage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/statuspage/atlassian.py,sha256=41uE77ZeV0M98k_xVmrXUQ33iVG8Lb3TwrWq2pRc84U,18617
 reconcile/statuspage/integration.py,sha256=hsazrQMceJbr61nEkJLxJbHhudTGtFuH0mlCo66-2ug,711
-reconcile/statuspage/page.py,sha256=k2CeosPG3EhTMSD_OFGm7AfDNX7zqWiibhraYqIIklg,5257
+reconcile/statuspage/page.py,sha256=EWzu7rYjS6QJzgjKmfSV5pGmCAzFR3U5HGiN9ytblog,5375
 reconcile/statuspage/state.py,sha256=wjX9by5Yy7nobxiE-xNhf6GyNwMVATd0O37jBckJm5M,1591
 reconcile/statuspage/status.py,sha256=5nYtMaxOqMYdM7n_Glss3ZcaPKQe_nUUQKH6xCTE9rI,2741
 reconcile/statuspage/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/statuspage/integrations/components.py,sha256=49KHd_E9AdRvcEA6n75q1McZv2LfN-hRsW-WA7dgw9g,2651
-reconcile/statuspage/integrations/maintenances.py,sha256=sAFkZ6CvmA5L391SY80igzTktjE8Z4C12Vzcr_9h0xY,4158
+reconcile/statuspage/integrations/maintenances.py,sha256=8vM0cComM1m-VKIW7NrgprZrix-zLta8-muqriEF09o,4310
 reconcile/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/templates/aws_access_key_email.j2,sha256=2MUr1ERmyISzKgHqsWYLd-1Wbl-peUa-FsGUS-JLUFc,238
 reconcile/templates/email.yml.j2,sha256=OZgczNRgXPj2gVYTgwQyHAQrMGu7xp-e4W1rX19GcrU,690
@@ -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.1rc1114.dist-info/METADATA,sha256=vn63-28mfgbBR3tbkdYLhiq552vpOX4DGe0LqDP4rZQ,2213
-qontract_reconcile-0.10.1rc1114.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1114.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1114.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1114.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1116.dist-info/METADATA,sha256=FuJrNLTiKxo9O9hatAzIX5lB3r7V_KZNiDDpnB1OuCw,2213
+qontract_reconcile-0.10.1rc1116.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1116.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1116.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1116.dist-info/RECORD,,

reconcile/gitlab_housekeeping.py

@@ -99,7 +99,7 @@ merge_requests_waiting = Gauge(
 gitlab_token_expiration = Gauge(
     name="qontract_reconcile_gitlab_token_expiration_days",
     documentation="Time until personal access tokens expire",
-    labelnames=["name", "active"],
+    labelnames=["name"],
 )
 
 
@@ -557,12 +557,14 @@ def get_app_sre_usernames(gl: GitLabApi) -> set[str]:
 
 def publish_access_token_expiration_metrics(gl: GitLabApi) -> None:
     pats = gl.get_personal_access_tokens()
+
     for pat in pats:
-        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, active=pat.active).set(
-            days_until_expiration.days
-        )
+        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
+            )
 
 
 def run(dry_run, wait_for_pipeline):

reconcile/statuspage/integrations/maintenances.py

@@ -80,6 +80,7 @@ class StatusPageMaintenancesIntegration(QontractReconcileIntegration[NoParams]):
                     for m in p.maintenances or []
                     if datetime.fromisoformat(m.scheduled_start) > now
                 ]
+                desired_state = sorted(desired_state, key=lambda d: d.name)
                 page_provider = AtlassianStatusPageProvider.init_from_page(
                     page=p,
                     token=self.secret_reader.read_secret(p.credentials),
@@ -90,6 +91,7 @@ class StatusPageMaintenancesIntegration(QontractReconcileIntegration[NoParams]):
                     for m in page_provider.scheduled_maintenances
                     if page_provider.has_component_binding_for(m.name)
                 ]
+                current_state = sorted(current_state, key=lambda c: c.name)
                 self.reconcile(
                     dry_run=dry_run,
                     desired_state=desired_state,

reconcile/statuspage/page.py

@@ -146,20 +146,24 @@ class StatusMaintenance(BaseModel):
             for c in page_components
             if c.app.name in affected_services
         ]
-        if affected_components:
-            statuspage_announcements = [
-                StatusMaintenanceAnnouncement.init_from_announcement(
-                    cast(MaintenanceStatuspageAnnouncementV1, m)
-                )
-                for m in maintenance.announcements or []
-                if m.provider == PROVIDER_NAME
-            ]
-        else:
-            statuspage_announcements = [StatusMaintenanceAnnouncement()]
+        if not affected_components:
+            raise ValueError(
+                f"No StatusPage component found for maintenance '{maintenance.name}'"
+                f"via apps {affected_services}. Please define at least one StatusPage component."
+            )
+
+        statuspage_announcements = [
+            StatusMaintenanceAnnouncement.init_from_announcement(
+                cast(MaintenanceStatuspageAnnouncementV1, m)
+            )
+            for m in maintenance.announcements or []
+            if m.provider == PROVIDER_NAME
+        ]
         if len(statuspage_announcements) != 1:
             raise ValueError(
-                f"Maintenanace announcements must include exactly one item of provider {PROVIDER_NAME}"
+                f"Maintenance announcements must include exactly one item of provider {PROVIDER_NAME}"
             )
+
         return cls(
             name=maintenance.name,
             message=maintenance.message.rstrip("\n"),