qontract-reconcile 0.10.1rc788__py3-none-any.whl → 0.10.1rc790__py3-none-any.whl

{qontract_reconcile-0.10.1rc788.dist-info → qontract_reconcile-0.10.1rc790.dist-info}/METADATA

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

@@ -248,7 +248,7 @@ reconcile/gql_definitions/common/pagerduty_instances.py,sha256=qcbOSUNwmeRcBetJ2
 reconcile/gql_definitions/common/pgp_reencryption_settings.py,sha256=NPLmO6J-zSu5B9QiYbDezLHY3TuOO9ihRBV-Zr84R9w,2259
 reconcile/gql_definitions/common/pipeline_providers.py,sha256=JJgmmghqLIwjKOdcWYHPnf4PDgAq4GF7046i0ozrqgI,9127
 reconcile/gql_definitions/common/reserved_networks.py,sha256=yP9qSQCaSQcva-ZgTnZp09qH27ur5_qK080ToIs04MY,2560
-reconcile/gql_definitions/common/saas_files.py,sha256=B7HE_jV5ky8AFxOCleSg2RYDrtUaV99DYa2If8wyvHs,15926
+reconcile/gql_definitions/common/saas_files.py,sha256=0F1dXJo7B37S2i5RQSvISOQOBlu2U2ue1rRsK5SZ4VU,16005
 reconcile/gql_definitions/common/saas_target_namespaces.py,sha256=gcTU9jrsNq9-HX-oOkj-nEZKYFTRytDHLs4SpEs93aw,2755
 reconcile/gql_definitions/common/saasherder_settings.py,sha256=nqQLcMwYxLseqq0BEcVvmrpIj2eQq0h8XDSpLN6GGCw,1793
 reconcile/gql_definitions/common/smtp_client_settings.py,sha256=JU6t6D-Qj-z1gLlgUiHKe0W7AxWQdty9jlv-ig_43tM,2248
@@ -409,9 +409,9 @@ reconcile/rhidp/sso_client/metrics.py,sha256=Tq7tSOsqL3XdcPUdozxqzSPIodUeOV87UCT
 reconcile/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/integration.py,sha256=8IXLEvpblgZRr2UPfTsaLZIUDJOdJaoakhqLBkGU_Es,6750
 reconcile/saas_auto_promotions_manager/meta.py,sha256=76Jp50r6Y_KyJoXFfSjrt5YrCtXyg_A4FXXxHYiS3TE,161
-reconcile/saas_auto_promotions_manager/publisher.py,sha256=psrthZGgCQDUO3rwQjKSBMlwcTgfij6sxdebGuxkNv4,2739
+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=NPhlagNF8om7ikrjRlYNSQ2Ra7wgW_3-OlEWapnjtW0,9405
+reconcile/saas_auto_promotions_manager/subscriber.py,sha256=SL-LsUhdhOLnlSremXStIlpVCZx-0zLcTkxSJPIScdQ,10338
 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
@@ -422,7 +422,7 @@ reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py,sha256
 reconcile/saas_auto_promotions_manager/merge_request_manager/open_merge_requests.py,sha256=-qGQOh6Jdp4lomNDij3zWVC0pl6uPHFWS5Woqcp5HQk,410
 reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=IZ7cuH6uOi7f0aIPVi1irBmP0CIK5vmEuhKBJz4YA1s,7235
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=txisb7NT7u5vpmZqRK3R4bpHDiJ7IUyNt9FZfvgm9MA,7998
+reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=ZZ7JL6VPfKasq-XXi6CL2UZ89jOcC9uwLW1e8LMvgws,8187
 reconcile/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/skupper_network/integration.py,sha256=178Q9RSYuZ9NmrCK4jRMLMekrewUaaRdclccI6zBsQ8,10786
 reconcile/skupper_network/models.py,sha256=DNTI7HZv-rqY42GIIxyRuvroHLvdH6rJerjIq9lj3RU,6663
@@ -510,7 +510,7 @@ reconcile/test/test_quay_repos.py,sha256=TdkcRF_a8PLp01Kti9eZZN-vGup2yPBT4Iba3k0
 reconcile/test/test_queries.py,sha256=SpH3RmNpBjEr_ne3VjAMCgKK8RE1z1zo7bypkT5uoO4,1946
 reconcile/test/test_repo_owners.py,sha256=uRYMLbMmh-9usF0TerabZTZV-Z1CS4I6ybT-LQqCLe8,1423
 reconcile/test/test_requests_sender.py,sha256=7fd9C2kEFS0-CYtlsif66N1kO9c44pzuBPAJKR9igqU,5385
-reconcile/test/test_saasherder.py,sha256=1_GyiXxxNqKSKE7PrtFJL7tUFg77d1oQPZzNBZW-DLQ,47042
+reconcile/test/test_saasherder.py,sha256=hSZk34aZFq-wspT-kJmFuHjh8ztSr7IzGc5QdRVrsJ8,47164
 reconcile/test/test_saasherder_allowed_secret_paths.py,sha256=5NHQwNJO66at6HiyMZ5sVRTQDwxdvlOQo0KmkBWCw5Q,4853
 reconcile/test/test_secret_reader.py,sha256=kz7nzcPjvA08cytnvcA_PMA98AEyqJWsESkYeRn5xCk,4994
 reconcile/test/test_slack_base.py,sha256=gpbWOLNxMMX6fyAbs1JakhLTnwfedb3f7WpUae4tQZE,5060
@@ -536,7 +536,7 @@ reconcile/test/test_version_bump.py,sha256=q6-3Y1roriI6YWpFwaHOMN7emEP3yL33sh_0V
 reconcile/test/test_vpc_peerings_validator.py,sha256=dFSmjc_dMN2GqMbntCFpa7PUZmyYuQ9DKffh-T5wmxM,6639
 reconcile/test/test_wrong_region.py,sha256=7KzL7OaICQ9Z3DW27zt_ykMN7_87owAFC-2CYjvGoyA,2138
 reconcile/test/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/test/saas_auto_promotions_manager/conftest.py,sha256=4BtuxVZ0Lsmdp6AhG8kbtowkwG7e-pSjIKv35Wm1hI0,5803
+reconcile/test/saas_auto_promotions_manager/conftest.py,sha256=GdFWjuNMrwB9tp0ZG6O9OZnI2GTtBK5cO4DCz_liBtc,5980
 reconcile/test/saas_auto_promotions_manager/test_integration_test.py,sha256=S30eXJSy2Vc3YLbCP7AfLkOiFGUVoKhEvEBL5vwnbfg,1848
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -785,8 +785,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=w2l4BHB09k1d-BGJ1jBUNCqDv7zkqYrMHojQXg-21kQ,4155
 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.1rc788.dist-info/METADATA,sha256=35KzCcK2CjxIE0CCyx17qxBc0-537HWxpoFAL42iIwI,2364
-qontract_reconcile-0.10.1rc788.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc788.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc788.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc788.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc790.dist-info/METADATA,sha256=hGlhrIUEP7Ra-X9cEXOBXPCZA0mMazOKnqwWsMKfd6g,2364
+qontract_reconcile-0.10.1rc790.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc790.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc790.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc790.dist-info/RECORD,,

reconcile/gql_definitions/common/saas_files.py

@@ -254,6 +254,7 @@ query SaasFiles {
           auto
           publish
           subscribe
+          soakDays
           promotion_data {
             channel
             data {
@@ -452,6 +453,7 @@ class SaasResourceTemplateTargetPromotionV1(ConfiguredBaseModel):
     auto: Optional[bool] = Field(..., alias="auto")
     publish: Optional[list[str]] = Field(..., alias="publish")
     subscribe: Optional[list[str]] = Field(..., alias="subscribe")
+    soak_days: Optional[int] = Field(..., alias="soakDays")
     promotion_data: Optional[list[PromotionDataV1]] = Field(..., alias="promotion_data")
 
 

reconcile/saas_auto_promotions_manager/publisher.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from datetime import datetime
 from typing import Optional
 
 from reconcile.utils.promotion_state import PromotionState
@@ -17,6 +18,7 @@ class DeploymentInfo:
     success: bool
     saas_file: str
     target_config_hash: str
+    check_in: Optional[datetime]
 
 
 class Publisher:
@@ -80,8 +82,14 @@ class Publisher:
             ):
                 continue
 
+            check_in = (
+                datetime.fromisoformat(promotion_data.check_in)
+                if promotion_data.check_in
+                else None
+            )
             self.deployment_info_by_channel[channel] = DeploymentInfo(
                 success=promotion_data.success,
                 saas_file=promotion_data.saas_file,
                 target_config_hash=promotion_data.target_config_hash,
+                check_in=check_in,
             )

reconcile/saas_auto_promotions_manager/subscriber.py

@@ -43,6 +43,7 @@ class Subscriber:
         target_namespace: SaasTargetNamespace,
         use_target_config_hash: bool,
         uid: str,
+        soak_days: int,
     ):
         self.saas_name = saas_name
         self.template_name = template_name
@@ -54,6 +55,7 @@ class Subscriber:
         self.desired_hashes: list[ConfigHash] = []
         self.target_namespace = target_namespace
         self.uid = uid
+        self.soak_days = soak_days
         self._content_hash = ""
         self._use_target_config_hash = use_target_config_hash
 
@@ -85,9 +87,10 @@ class Subscriber:
             use_target_config_hash=data["5"],
             target_namespace=SaasTargetNamespace(**data["6"]),
             uid=data["7"],
+            soak_days=data["8"],
         )
-        subscriber.desired_hashes = data["8"]
-        subscriber.desired_ref = data["9"]
+        subscriber.desired_hashes = data["9"]
+        subscriber.desired_ref = data["10"]
         return subscriber
 
     def to_exportable_dict(self) -> dict[str, Any]:
@@ -103,8 +106,9 @@ class Subscriber:
         data["5"] = self._use_target_config_hash
         data["6"] = self.target_namespace.dict(by_alias=True)
         data["7"] = self.uid
-        data["8"] = self.desired_hashes
-        data["9"] = self.desired_ref
+        data["8"] = self.soak_days
+        data["9"] = self.desired_hashes
+        data["10"] = self.desired_ref
         return data
 
     def __eq__(self, other: object) -> bool:
@@ -143,6 +147,24 @@ class Subscriber:
             return None
         return deployment_info
 
+    def _passed_accumulated_soak_days(self) -> bool:
+        """
+        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
+
     def _compute_desired_ref(self) -> None:
         """
         Compute the desired reference for this subscriber.
@@ -174,8 +196,12 @@ class Subscriber:
                 self.target_file_path,
                 publisher_refs,
             )
-        if len(publisher_refs) != 1 or any_bad_deployment:
-            # We keep current state due to issues/mismatches in publishers
+        if (
+            len(publisher_refs) != 1
+            or any_bad_deployment
+            or not self._passed_accumulated_soak_days()
+        ):
+            # We keep current state
             self.desired_ref = self.ref
         else:
             # We have a common single publisher ref w/o any deployment issues

reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py

@@ -95,6 +95,9 @@ class SaasFilesInventory:
                         continue
                     if not target.promotion.auto:
                         continue
+                    soak_days = (
+                        target.promotion.soak_days if target.promotion.soak_days else 0
+                    )
                     subscriber = Subscriber(
                         uid=target.uid(
                             parent_saas_file_name=saas_file.name,
@@ -105,6 +108,7 @@ class SaasFilesInventory:
                         target_file_path=file_path,
                         ref=target.ref,
                         target_namespace=target.namespace,
+                        soak_days=soak_days,
                         # Note: this will be refactored at a later point.
                         # https://issues.redhat.com/browse/APPSRE-7516
                         use_target_config_hash=bool(saas_file.publish_job_logs),

reconcile/test/saas_auto_promotions_manager/conftest.py

@@ -5,6 +5,7 @@ from collections.abc import (
     Mapping,
     MutableMapping,
 )
+from datetime import datetime, timezone
 from typing import Any
 from unittest.mock import (
     MagicMock,
@@ -139,6 +140,7 @@ def subscriber_builder(
                     success=publisher_data.get("SUCCESSFUL_DEPLOYMENT", True),
                     target_config_hash=publisher_data.get("CONFIG_HASH", ""),
                     saas_file=publisher_name,
+                    check_in=publisher_data.get("CHECK_IN", datetime.now(timezone.utc)),
                 )
                 channel.publishers.append(publisher)
             channels.append(channel)
@@ -155,6 +157,7 @@ def subscriber_builder(
             target_file_path=data.get("TARGET_FILE_PATH", ""),
             template_name="",
             use_target_config_hash=data.get("USE_TARGET_CONFIG_HASH", True),
+            soak_days=data.get("SOAK_DAYS", 0),
         )
         subscriber.channels = channels
         subscriber.config_hashes_by_channel_name = cur_config_hashes_by_channel

reconcile/test/test_saasherder.py

@@ -160,7 +160,11 @@ class TestSaasFileValid(TestCase):
         self.saas_file.resource_templates[0].targets[
             1
         ].promotion = SaasResourceTemplateTargetPromotionV1(
-            auto=True, publish=None, subscribe=None, promotion_data=None
+            auto=True,
+            publish=None,
+            subscribe=None,
+            promotion_data=None,
+            soakDays=0,
         )
         saasherder = SaasHerder(
             [self.saas_file],
@@ -180,7 +184,11 @@ class TestSaasFileValid(TestCase):
         self.saas_file.resource_templates[0].targets[
             1
         ].promotion = SaasResourceTemplateTargetPromotionV1(
-            auto=True, publish=None, subscribe=None, promotion_data=None
+            auto=True,
+            publish=None,
+            subscribe=None,
+            promotion_data=None,
+            soakDays=0,
         )
         saasherder = SaasHerder(
             [self.saas_file],