qontract-reconcile 0.10.1rc1007__py3-none-any.whl → 0.10.1rc1009__py3-none-any.whl

{qontract_reconcile-0.10.1rc1007.dist-info → qontract_reconcile-0.10.1rc1009.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1007
+Version: 0.10.1rc1009
 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.1rc1007.dist-info → qontract_reconcile-0.10.1rc1009.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=BjqIwA3rJQYMh-v0fr2s5L_BkFvtW4fRGHuHY5pcwf4,22099
+reconcile/gitlab_housekeeping.py,sha256=nvClNzehph010hRTIMGDQc-3ag08aBXNUhzEJ2KW22c,22088
 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
@@ -509,7 +509,7 @@ reconcile/test/test_gabi_authorized_users.py,sha256=6XnV5Q9inxP81ktGMVKyWucjBTUj
 reconcile/test/test_gcr_mirror.py,sha256=A0y8auKZzr62-mGoxSQ__JnN0-ijZUltzjwR5miBgso,490
 reconcile/test/test_github_org.py,sha256=aGWeMhkz1fjogvaAQGjemSKR201L5gEZZOe0iMQqj-Y,4487
 reconcile/test/test_github_repo_invites.py,sha256=WrPn5ROAoJYK0ihzlZcFR0V9Pu2HcMs13I6nazf7hq4,3307
-reconcile/test/test_gitlab_housekeeping.py,sha256=WQJ79gGQ-OixLH9JIo16fyTZC7QG7ItlCY16MGEkV-s,10064
+reconcile/test/test_gitlab_housekeeping.py,sha256=ScD9Tgf9OOgGfAFfTy6Kn2222l2wH_A3gMRKdpvoWe0,10053
 reconcile/test/test_gitlab_labeler.py,sha256=PmYXiU2g0_O5OTdMGPzdeqBAfat92U9bhjjfeyiGSmQ,4336
 reconcile/test/test_gitlab_members.py,sha256=yjfQRUFG_F0kLYegax4_ec5VIBAnCPrvAgqMcN1GXzc,9985
 reconcile/test/test_gitlab_permissions.py,sha256=vPFEsdjyP-lO8pc2rN6acMns3Sjz9YJs16msbBR8DZc,2736
@@ -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
@@ -827,7 +828,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=1ZP58LYV6ww3XOLVxgy8NKasMb1jQmp4BNqzTEB0VBE,17723
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=UabU_2Q4DFahWv4sG-iLYWO4B-zAZ6AnL9iV6W89k2g,126981
+tools/qontract_cli.py,sha256=iY_ORJiPBF2CShM33AtPdRPX-1f8PFM4Kfbe4M5TlPQ,126959
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.1rc1007.dist-info/METADATA,sha256=gP5suifzGZDXBmQ_gMspWC9QNg7awg3hO3sxhIhzfcY,2263
-qontract_reconcile-0.10.1rc1007.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc1007.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1007.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1007.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1009.dist-info/METADATA,sha256=kaExAbwxrmdFEH6fxY0-AV4mlc67NsMZyobWXQeLRGY,2263
+qontract_reconcile-0.10.1rc1009.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc1009.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1009.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1009.dist-info/RECORD,,

reconcile/gitlab_housekeeping.py

@@ -313,7 +313,7 @@ def preprocess_merge_requests(
             MRStatus.CANNOT_BE_MERGED_RECHECK,
         }:
             continue
-        if mr.work_in_progress:
+        if mr.draft:
             continue
         if len(mr.commits()) == 0:
             continue

reconcile/test/test_gitlab_housekeeping.py

@@ -177,7 +177,7 @@ def project() -> Project:
 def can_be_merged_merge_request() -> Mock:
     mr = create_autospec(ProjectMergeRequest)
     mr.merge_status = "can_be_merged"
-    mr.work_in_progress = False
+    mr.draft = False
     mr.commits.return_value = [create_autospec(ProjectCommit)]
     mr.labels = ["lgtm"]
     mr.iid = 1

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,
+        )

tools/qontract_cli.py

@@ -2017,7 +2017,7 @@ def app_interface_review_queue(ctx) -> None:
 
         queue_data = []
         for mr in merge_requests:
-            if mr.work_in_progress:
+            if mr.draft:
                 continue
             if len(mr.commits()) == 0:
                 continue
@@ -2116,7 +2116,7 @@ def app_interface_open_selfserviceable_mr_queue(ctx):
     ]
     queue_data = []
     for mr in merge_requests:
-        if mr.work_in_progress:
+        if mr.draft:
             continue
         if len(mr.commits()) == 0:
             continue