qontract-reconcile 0.10.1rc1008__py3-none-any.whl → 0.10.1rc1010__py3-none-any.whl

{qontract_reconcile-0.10.1rc1008.dist-info → qontract_reconcile-0.10.1rc1010.dist-info}/METADATA

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

@@ -765,7 +765,7 @@ reconcile/utils/membershipsources/resolver.py,sha256=meERrCZqeVJZR2lHdZEznaZDsCs
 reconcile/utils/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/merge_request_manager/merge_request_manager.py,sha256=3EP6Yw_zB7nY0OkU8D_32nDqta1TITgtRI0cSmOlNQg,3332
 reconcile/utils/merge_request_manager/parser.py,sha256=5pGoz8Q6EuYXlUc1z-D0FahdRP2YLO8CpACoa9HcgtQ,2098
-reconcile/utils/mr/__init__.py,sha256=JQS8xmLZdG4TgjAFZp2ltuV9c1sDFHIHJmpn1bkY9rM,2386
+reconcile/utils/mr/__init__.py,sha256=uvqxcp-uSlJExaH00XNCX9DSvA57jHTlPTg5dbZ_xvk,2487
 reconcile/utils/mr/app_interface_reporter.py,sha256=6Kpg93V9FvcOke9Jimkva359MQ-ZyBIkUpf8QIA6-to,1793
 reconcile/utils/mr/aws_access.py,sha256=w-UJutB_OfBJOvr-gsPzhtBPkDfKcNZZWGGuI9cN3HI,2605
 reconcile/utils/mr/base.py,sha256=TP6xaxznxsF_v2KcC_D3ut1cX_4KCcx4pjIC1-4eZUY,7307
@@ -775,6 +775,7 @@ reconcile/utils/mr/labels.py,sha256=9QRTRjZAtq45zELd9SwavaraczMjwjn5no3RK1YxFTg,
 reconcile/utils/mr/notificator.py,sha256=cp80wFzu_ZzrJPye7L1pI0H6JRGb7hOGuNxJYUq4Yr8,2967
 reconcile/utils/mr/ocm_update_recommended_version.py,sha256=p_aVP0TGrlKk9WBwgQnYWqUDsED_Hg6G5Bqj0UvtRwA,1536
 reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=ojnIjw-8vRnmCCxOGBOEgPZLH4nC1hcuef74LWw2Rpk,3004
+reconcile/utils/mr/promote_qontract.py,sha256=AgA7AXizYvUoycLMZb1zaa4BCLi4stsokWfEH4B0eWY,1266
 reconcile/utils/mr/user_maintenance.py,sha256=cHPBn8zrReWLHalyk-EFdkFJe9zjVjRoZhT4t2zZfGE,3956
 reconcile/utils/ocm/__init__.py,sha256=xv7CJp7K9LCQfa4gL_W0MMCOD1P4qOy8t5aZj1xXNUE,808
 reconcile/utils/ocm/addons.py,sha256=_LDdJ-gapM3s5exKlIUt-MlXZTAUoHezbYBU0QmvfWQ,7335
@@ -807,7 +808,7 @@ reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFc
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
 reconcile/utils/saasherder/interfaces.py,sha256=C2wrw34OXypshVocAsPrVZsSHptgw4g9u7Haa2wulZQ,9087
 reconcile/utils/saasherder/models.py,sha256=z8ln03zi2a8cu716NcNUDHp8Dv1VcVbhqdWVxCl7x9A,10148
-reconcile/utils/saasherder/saasherder.py,sha256=vaTQtDrJdm5wU8z0ROqEI-ewbzCkKAlHsEpP01Royvg,85048
+reconcile/utils/saasherder/saasherder.py,sha256=rTsBaQrCY7StLWkkHnMLVil8luLMsZ9hRED6SDw4Cds,85698
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=gRL1rQ0AqvShei_rcGqC3HDYGskOFKE1nPrJyJE9yno,4676
@@ -858,8 +859,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.1rc1008.dist-info/METADATA,sha256=VmMKYU9MT90uAli1QKXS-ONvBiTqQC9yJ8yyltbFB0I,2263
-qontract_reconcile-0.10.1rc1008.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc1008.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1008.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1008.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1010.dist-info/METADATA,sha256=7cFnKb9RaHgWUrwtmYqUUsZ2MHpPoQNg5MZJ6U8U8Qg,2263
+qontract_reconcile-0.10.1rc1010.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc1010.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1010.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1010.dist-info/RECORD,,

reconcile/utils/mr/__init__.py

@@ -12,6 +12,7 @@ from reconcile.utils.mr.ocm_update_recommended_version import (
 from reconcile.utils.mr.ocm_upgrade_scheduler_org_updates import (
     CreateOCMUpgradeSchedulerOrgUpdates,
 )
+from reconcile.utils.mr.promote_qontract import PromoteQontractSchemas
 from reconcile.utils.mr.user_maintenance import (
     CreateDeleteUserAppInterface,
     CreateDeleteUserInfra,
@@ -29,6 +30,7 @@ __all__ = [
     "CreateAppInterfaceNotificator",
     "CreateDeleteUserAppInterface",
     "CreateDeleteUserInfra",
+    "PromoteQontractSchemas",
 ]
 
 

reconcile/utils/mr/promote_qontract.py

@@ -0,0 +1,41 @@
+from reconcile.utils.gitlab_api import GitLabApi
+from reconcile.utils.mr.base import MergeRequestBase
+
+
+class PromoteQontractSchemas(MergeRequestBase):
+    name = "promote_qontract_schemas"
+
+    def __init__(self, version: str):
+        self.path = ".env"
+        self.version = version
+
+        super().__init__()
+
+        self.labels = []
+
+    @property
+    def title(self) -> str:
+        return f"[{self.name}] promote qontract-schemas to version {self.version}"
+
+    @property
+    def description(self) -> str:
+        return f"promote qontract-schemas to version {self.version}"
+
+    def process(self, gitlab_cli: GitLabApi) -> None:
+        raw_file = gitlab_cli.project.files.get(
+            file_path=self.path, ref=gitlab_cli.main_branch
+        )
+        content = raw_file.decode().decode("utf-8")
+        lines = content.splitlines()
+        for index, text in enumerate(lines):
+            if text.startswith("export SCHEMAS_IMAGE_TAG="):
+                lines[index] = f"export SCHEMAS_IMAGE_TAG={self.version}"
+
+        new_content = "\n".join(lines) + "\n"
+
+        gitlab_cli.update_file(
+            branch_name=self.branch,
+            file_path=self.path,
+            commit_message=self.description,
+            content=new_content,
+        )

reconcile/utils/saasherder/saasherder.py

@@ -1947,6 +1947,21 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     if current_state and current_state.has_succeeded_once:
                         has_succeeded_once = True
 
+                    check_in = str(now)
+                    if (
+                        success
+                        and current_state
+                        and current_state.check_in
+                        and current_state.success
+                    ):
+                        # We want to avoid an override of the timestamp.
+                        # This can happen on re-deployments of the same ref.
+                        # We only re-use the check_in time if the previous
+                        # and current deployment was successful.
+                        # On unsuccessful deployments, we
+                        # update the check_in time to current time.
+                        check_in = current_state.check_in
+
                     # publish to state to pass promotion gate
                     self._promotion_state.publish_promotion_data(
                         sha=promotion.commit_sha,
@@ -1957,8 +1972,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                             success=success,
                             target_config_hash=promotion.target_config_hash,
                             has_succeeded_once=has_succeeded_once,
-                            # TODO: do not override - check if timestamp already exists
-                            check_in=str(now),
+                            check_in=check_in,
                         ),
                     )
                     logging.info(