qontract-reconcile 0.10.1rc832__py3-none-any.whl → 0.10.1rc834__py3-none-any.whl

{qontract_reconcile-0.10.1rc832.dist-info → qontract_reconcile-0.10.1rc834.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc832
+Version: 0.10.1rc834
 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
@@ -24,7 +24,6 @@ Requires-Dist: python-gitlab <1.12.0,>=1.11.0
 Requires-Dist: semver ~=3.0
 Requires-Dist: boto3 ==1.34.94
 Requires-Dist: botocore ==1.34.94
-Requires-Dist: mypy-boto3-s3 ==1.34.14
 Requires-Dist: urllib3 ~=2.2
 Requires-Dist: slack-sdk <4.0,>=3.10
 Requires-Dist: pypd <1.2.0,>=1.1.0

{qontract_reconcile-0.10.1rc832.dist-info → qontract_reconcile-0.10.1rc834.dist-info}/RECORD

@@ -420,7 +420,7 @@ reconcile/saas_auto_promotions_manager/integration.py,sha256=8IXLEvpblgZRr2UPfTs
 reconcile/saas_auto_promotions_manager/meta.py,sha256=76Jp50r6Y_KyJoXFfSjrt5YrCtXyg_A4FXXxHYiS3TE,161
 reconcile/saas_auto_promotions_manager/publisher.py,sha256=am8b0uLZIhWjSAgUHPtSOu2fRpa5wXaMl_WnVe4gv2k,3009
 reconcile/saas_auto_promotions_manager/s3_exporter.py,sha256=IKlVWZmiPnvl7sKeF6JgAlhXZe5CovKTxQc0SNkNSx4,2583
-reconcile/saas_auto_promotions_manager/subscriber.py,sha256=SL-LsUhdhOLnlSremXStIlpVCZx-0zLcTkxSJPIScdQ,10338
+reconcile/saas_auto_promotions_manager/subscriber.py,sha256=gz6l6xSeyYrs2KyEcXJoYbiH5JGSWE_T3VIqWl03A7k,10501
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/merge_request_manager/batcher.py,sha256=lHIULPE8nmPN9pJVfZFdD0l48EB20o4cAy4owahJenw,7848
 reconcile/saas_auto_promotions_manager/merge_request_manager/desired_state.py,sha256=isY8frVsL3PlcdZmdZ4O0qyp76oczl4DUMX9uMArs5Y,1222
@@ -675,7 +675,7 @@ reconcile/utils/sharding.py,sha256=gkYf0lD3IUKQPEmdRJZ70mdDT1c9qWjbdP7evRsUis4,8
 reconcile/utils/slack_api.py,sha256=2t9jeCS7V3sHSMk-ByRcjmh-2uVvGELCfJqm1nu_hKI,17395
 reconcile/utils/smtp_client.py,sha256=gJNbBQJpAt5PX4t_TaeNHsXM8vt50bFgndml6yK2b5o,2800
 reconcile/utils/sqs_gateway.py,sha256=gFl9DM4DmGnptuxTOe4lS3YTyE80eSAvK42ljS8h4dA,2287
-reconcile/utils/state.py,sha256=FK8NLT1xyumuXpYRm0Nk6pWpOE_U6-NovGn6zKCw8vw,16298
+reconcile/utils/state.py,sha256=DRxzuOw3Iha-b2esBMjZTZ5K-OxfrGbkyEvpTT5xHTs,16369
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=mZEKpu6nbfiQd60wRkc8-5sljBTUTOgaAKnF89itMzU,32085
@@ -812,8 +812,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jrss,4941
 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.1rc832.dist-info/METADATA,sha256=7yMOQ62RfKBicCBhKjtcwL8CN6tJUQvFOH6K5lBcDP0,2314
-qontract_reconcile-0.10.1rc832.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc832.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc832.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc832.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc834.dist-info/METADATA,sha256=GwMy-WLj9_4L9kW4KPlgRfD7XUInbC5v6Kn7gHcOVNg,2275
+qontract_reconcile-0.10.1rc834.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc834.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc834.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc834.dist-info/RECORD,,

reconcile/saas_auto_promotions_manager/subscriber.py

@@ -2,6 +2,7 @@ import hashlib
 import logging
 from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
+from datetime import datetime, timedelta, timezone
 from typing import Any, Optional
 
 from reconcile.gql_definitions.fragments.saas_target_namespace import (
@@ -152,18 +153,19 @@ class Subscriber:
         We accumulate the time a ref is running on all publishers for this subscriber.
         We compare that accumulated time with the soak_days setting of the subscriber.
         """
-        # now = datetime.now(timezone.utc)
-        # delta = timedelta(days=0)
-        # for channel in self.channels:
-        #     for publisher in channel.publishers:
-        #         deployed_at = publisher.deployment_info_by_channel.get(
-        #             channel.name
-        #         ).check_in
-        #         if not deployed_at:
-        #             continue
-        #         delta += now - deployed_at
-        # return delta >= timedelta(days=self.soak_days)
-        return True
+        now = datetime.now(timezone.utc)
+        delta = timedelta(days=0)
+        for channel in self.channels:
+            for publisher in channel.publishers:
+                deploy_info = publisher.deployment_info_by_channel.get(channel.name)
+                if not deploy_info:
+                    # At this stage we always expect a deploy_info to be present
+                    return False
+                deployed_at = deploy_info.check_in
+                if not deployed_at:
+                    continue
+                delta += now - deployed_at
+        return delta >= timedelta(days=self.soak_days)
 
     def _compute_desired_ref(self) -> None:
         """

reconcile/utils/state.py

@@ -6,6 +6,7 @@ from abc import abstractmethod
 from collections.abc import Callable, Generator, Mapping
 from dataclasses import dataclass, field
 from typing import (
+    TYPE_CHECKING,
     Any,
     Optional,
     Self,
@@ -13,7 +14,12 @@ from typing import (
 
 import boto3
 from botocore.errorfactory import ClientError
-from mypy_boto3_s3 import S3Client
+
+if TYPE_CHECKING:
+    from mypy_boto3_s3 import S3Client
+else:
+    S3Client = object
+
 from pydantic import BaseModel
 
 from reconcile.gql_definitions.common.app_interface_state_settings import (