qontract-reconcile 0.10.1rc963__py3-none-any.whl → 0.10.1rc966__py3-none-any.whl

{qontract_reconcile-0.10.1rc963.dist-info → qontract_reconcile-0.10.1rc966.dist-info}/METADATA

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

@@ -448,14 +448,14 @@ reconcile/skupper_network/models.py,sha256=HEwlVKsbmMaKaaBGvITIiSYNEVdjwXVhLaOJg
 reconcile/skupper_network/reconciler.py,sha256=XS-1oKBr_1l3dYUAVqUH6gCHg1G5ZuOfY_7fgGVAiFA,9996
 reconcile/skupper_network/site_controller.py,sha256=A3K-62BjJ5HiFVydV0ouGoD1NwrO7XhAH15BHAcS9fk,1550
 reconcile/statuspage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/statuspage/atlassian.py,sha256=G43HG5Y9FdYu_oEG9-yRpSwH4d2UtAqL26mrarWsN94,18515
+reconcile/statuspage/atlassian.py,sha256=41uE77ZeV0M98k_xVmrXUQ33iVG8Lb3TwrWq2pRc84U,18617
 reconcile/statuspage/integration.py,sha256=hsazrQMceJbr61nEkJLxJbHhudTGtFuH0mlCo66-2ug,711
-reconcile/statuspage/page.py,sha256=tMXVnajU0r5V5_KGp3cL04eMLiDD2Kf4sIkao-L5puM,5217
+reconcile/statuspage/page.py,sha256=k2CeosPG3EhTMSD_OFGm7AfDNX7zqWiibhraYqIIklg,5257
 reconcile/statuspage/state.py,sha256=wjX9by5Yy7nobxiE-xNhf6GyNwMVATd0O37jBckJm5M,1591
 reconcile/statuspage/status.py,sha256=ZKagwWqv-_Xsr97cQGCkbtd2U7ipA_iPKdnoj6Z-Jpw,2777
 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=gL8mn1SbCNMveoD0nmqc5b_gS9XxPsqLtqBxJeRAvbY,4202
+reconcile/statuspage/integrations/maintenances.py,sha256=lLhiVlSrVZONUxM8Cen-HJg1LcVILLGc1TaqjBhTuBc,4178
 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
@@ -742,8 +742,8 @@ reconcile/utils/internal_groups/client.py,sha256=RL-fNDtMGfpD7pNjCEmrj_0PV3ClCtU
 reconcile/utils/internal_groups/models.py,sha256=y_IqBVqfGqNXiu0VudvBWFrm_-uafVm5KgLG-ca8XAs,2281
 reconcile/utils/jinja2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/jinja2/extensions.py,sha256=7K-uo6G2eCWa98MHT8fRPYIKCLQB_5D2keqQ_LyAfHM,1293
-reconcile/utils/jinja2/filters.py,sha256=RVVkpf87FllrPUpqk_8KN-r1IsmnS0bpygAVvsvIr5g,4504
-reconcile/utils/jinja2/utils.py,sha256=nyTS7SafbjQliIg0PZhqK0YGfFL0W2V6XA5CRaqOkrA,7809
+reconcile/utils/jinja2/filters.py,sha256=tmiaYMhji5fv4B66YtR7zc-mE3wQLyj5I5SeX0WA2l4,4754
+reconcile/utils/jinja2/utils.py,sha256=W_LMB2KiGuwIo04GUNK7jKCpmhKy6wGOH1jgshzXBU0,8004
 reconcile/utils/jobcontroller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/jobcontroller/controller.py,sha256=2V_vm5thFx6adW4bMy9CdHXFesuo6S4lSkEpGxkXSM0,14492
 reconcile/utils/jobcontroller/models.py,sha256=tSRAkUX23iyn4YPsWEicFXwRxw3mXb5B2pDOWmXX8wQ,6350
@@ -847,8 +847,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.1rc963.dist-info/METADATA,sha256=AiGv3ClIB_-Pa6p12xqAjUMwkIZruqlZxurmniRlQas,2262
-qontract_reconcile-0.10.1rc963.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc963.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc963.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc963.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc966.dist-info/METADATA,sha256=R3U88Yv6EwtlDutM0OWh4zUzHfGn0dkFdZZITdlhX2Q,2262
+qontract_reconcile-0.10.1rc966.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc966.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc966.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc966.dist-info/RECORD,,

reconcile/statuspage/atlassian.py

@@ -1,5 +1,6 @@
 import logging
 import time
+from datetime import datetime
 from typing import (
     Any,
     Self,
@@ -414,8 +415,8 @@ class AtlassianStatusPageProvider:
         return StatusMaintenance(
             name=name_override or raw_maintenance.name,
             message=raw_maintenance.incident_updates[0].body,
-            schedule_start=raw_maintenance.scheduled_for,
-            schedule_end=raw_maintenance.scheduled_until,
+            schedule_start=datetime.fromisoformat(raw_maintenance.scheduled_for),
+            schedule_end=datetime.fromisoformat(raw_maintenance.scheduled_until),
             components=[
                 self._raw_component_to_status_component(c)
                 for c in raw_maintenance.components
@@ -470,8 +471,8 @@ class AtlassianStatusPageProvider:
         data = {
             "name": maintenance.name,
             "status": "scheduled",
-            "scheduled_for": maintenance.schedule_start,
-            "scheduled_until": maintenance.schedule_end,
+            "scheduled_for": maintenance.schedule_start.isoformat(),
+            "scheduled_until": maintenance.schedule_end.isoformat(),
             "body": maintenance.message,
             "scheduled_remind_prior": maintenance.announcements.remind_subscribers,
             "scheduled_auto_transition": True,

reconcile/statuspage/integrations/maintenances.py

@@ -55,7 +55,7 @@ class StatusPageMaintenancesIntegration(QontractReconcileIntegration[NoParams]):
         now = datetime.now(UTC)
         slack = slackapi_from_queries(QONTRACT_INTEGRATION, init_usergroups=False)
         for m in desired_state:
-            scheduled_start = datetime.fromisoformat(m.schedule_start)
+            scheduled_start = m.schedule_start
             if now <= scheduled_start <= now + timedelta(hours=1):
                 state_key = f"notifications/{m.name}"
                 if binding_state.state.exists(state_key):

reconcile/statuspage/page.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from typing import Self, cast
 
 from pydantic import BaseModel
@@ -128,8 +129,8 @@ class StatusMaintenance(BaseModel):
 
     name: str
     message: str
-    schedule_start: str
-    schedule_end: str
+    schedule_start: datetime
+    schedule_end: datetime
     components: list[StatusComponent]
     announcements: StatusMaintenanceAnnouncement
 

reconcile/utils/jinja2/filters.py

@@ -6,6 +6,7 @@ from typing import Any
 from urllib import parse
 
 import jinja2
+import yaml
 
 from reconcile.utils.jsonpath import parse_jsonpath
 
@@ -20,6 +21,15 @@ def json_to_dict(input: str) -> Any:
     return data
 
 
+def yaml_to_dict(input: str) -> Any:
+    """Jinja2 filter to parse YAML strings into dictionaries.
+    :param input: yaml string
+    :return: dict with the parsed inputs contents
+    """
+    data = yaml.safe_load(input)
+    return data
+
+
 def urlescape(string: str, safe: str = "/", encoding: str | None = None) -> str:
     """Jinja2 filter that is a simple wrapper around urllib's URL quoting
     functions that takes a string value and makes it safe for use as URL

reconcile/utils/jinja2/utils.py

@@ -1,3 +1,4 @@
+import datetime
 from functools import cache
 from typing import Any, Self
 
@@ -22,6 +23,7 @@ from reconcile.utils.jinja2.filters import (
     matches_jsonpath,
     urlescape,
     urlunescape,
+    yaml_to_dict,
 )
 from reconcile.utils.secret_reader import SecretNotFound, SecretReader, SecretReaderBase
 from reconcile.utils.vault import SecretFieldNotFound
@@ -80,6 +82,7 @@ def compile_jinja2_template(
     )
     jinja_env.filters.update({
         "json_to_dict": json_to_dict,
+        "yaml_to_dict": yaml_to_dict,
         "urlescape": urlescape,
         "urlunescape": urlunescape,
         "eval": eval_filter,
@@ -212,6 +215,9 @@ def process_jinja2_template(
         "url": url_makes_sense,
         "s3": lookup_s3_object,
         "flatten_dict": flatten,
+        "yesterday": lambda: (datetime.datetime.now() - datetime.timedelta(1)).strftime(
+            "%Y-%m-%d"
+        ),
     })
     if "_template_mocks" in vars:
         for k, v in vars["_template_mocks"].items():