qontract-reconcile 0.10.1rc926__py3-none-any.whl → 0.10.1rc927__py3-none-any.whl

{qontract_reconcile-0.10.1rc926.dist-info → qontract_reconcile-0.10.1rc927.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc926
+Version: 0.10.1rc927
 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
@@ -20,7 +20,7 @@ Requires-Dist: PyGithub <1.59,>=1.58
 Requires-Dist: hvac <0.8.0,>=0.7.0
 Requires-Dist: ldap3 <2.10.0,>=2.9.1
 Requires-Dist: anymarkup <0.9.0,>=0.7.0
-Requires-Dist: python-gitlab <1.12.0,>=1.11.0
+Requires-Dist: python-gitlab ~=4.6
 Requires-Dist: semver ~=3.0
 Requires-Dist: boto3 ==1.34.94
 Requires-Dist: botocore ==1.34.94

{qontract_reconcile-0.10.1rc926.dist-info → qontract_reconcile-0.10.1rc927.dist-info}/RECORD

@@ -29,8 +29,8 @@ reconcile/github_repo_invites.py,sha256=3GOBGZq1DKMIuyYsDxHqXDnMTWlJfeu248-m3ajf
 reconcile/github_repo_permissions_validator.py,sha256=dcbXdUx6imjNchjp3pg9-z1i7lFEGOr_28GvsiwO5Xw,1734
 reconcile/github_users.py,sha256=nfTq78QRONIfDVj-5O3bD6psllJjzWFnog-EJ1WqFPU,3672
 reconcile/github_validator.py,sha256=cVTVxJIGR4a1Jz8wrdXEAb_CMpXUzvykVmUURX4cook,917
-reconcile/gitlab_fork_compliance.py,sha256=5h9yovk_21SPvv-bDjF02TW4C3uuDBS20I3UQXo7RPI,4154
-reconcile/gitlab_housekeeping.py,sha256=3swjgFPhQC5M1Dthyf6Xu-ZcWdE3-2cvDpoLvr3Gvls,21181
+reconcile/gitlab_fork_compliance.py,sha256=EuF86CSUlzUQERu3CFjRujtX_dXAwSXBaWDl9Ij0LM8,4165
+reconcile/gitlab_housekeeping.py,sha256=gwykuBGFpCAWAl6mwbZDuGoN1Zb3zkA4szUrgZ438Eg,21288
 reconcile/gitlab_labeler.py,sha256=a7HToXqv4S72TBp6Dmu2OkjjO60k81kH3B0J4UXHs3A,4768
 reconcile/gitlab_members.py,sha256=PrJE9OhDRdGG_gHM_77nQojLb4B18jtUu8DxgLsRS88,8417
 reconcile/gitlab_mr_sqs_consumer.py,sha256=O46mdziPgGOndbU-0_UJKJVUaiEoVzJPEgKm4_UvYoI,2571
@@ -139,7 +139,7 @@ reconcile/aus/version_gates/ocp_gate_handler.py,sha256=RW1ppDaCZXVegV9AzzqYXxDUu
 reconcile/aus/version_gates/sts_version_gate_handler.py,sha256=swwwz0YyvrEBf_InqrRRBCt2QzHYNvvq8jz9aYwElh4,3663
 reconcile/aws_account_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_account_manager/integration.py,sha256=tdIXqHyd0QLZOX_7_jyU7eEil-jYJbAv4I4V1c3KhVk,14981
-reconcile/aws_account_manager/merge_request_manager.py,sha256=zZct3NxWMBQupl4QfD7ULxnt4ipt_2FBoH_NusboIuw,3781
+reconcile/aws_account_manager/merge_request_manager.py,sha256=eLRf7D6j9sPvJh3xpYRkrckleGrZcr6J0aED7xmNbXI,3815
 reconcile/aws_account_manager/metrics.py,sha256=YB10ea4kIGwJfs5N14RF-RoXPb-QQWaDBz1jLZ3YWE0,917
 reconcile/aws_account_manager/reconciler.py,sha256=5YG7nZ4GG1SY2Pe_OxetdtzOnl37MllZMu_ca22vRSo,15025
 reconcile/aws_account_manager/utils.py,sha256=iYPPOtbZ7FiKkz9v5f1YXRIHw5YFOtSavUkF8oMwfJY,1439
@@ -437,7 +437,7 @@ reconcile/saas_auto_promotions_manager/merge_request_manager/desired_state.py,sh
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request.py,sha256=BeAJWLow7b4HQyZ9zz398sQkPeIz8chpMkCts2NU27c,1282
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=-zWK-cqr_8o9ZEnNfD3cfkv3hrrU4HJ4UMzi4J2Hjhw,6223
 reconcile/saas_auto_promotions_manager/merge_request_manager/metrics.py,sha256=sdHp71Wl87tFM-Z_QvqvdHhyrppFLGi4ekksCi_e_bs,977
-reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py,sha256=WDpClngRA7o9j9o8WsTDDU42p_xVqkmr6dERxQXBIAA,8579
+reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py,sha256=UoTw_UpyIsqCJoER77xtTI8kZTVaWhMJqSrkOfAQU_I,8629
 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
@@ -501,7 +501,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=j3KeB4OnSln1gm2hidce49xdMru-j75NS3cM-AEgzZc,4511
 reconcile/test/test_github_repo_invites.py,sha256=UVaDlxSxi5iooyUbz8F11d7cvINHLK32Qx9b7xrDd-k,3347
-reconcile/test/test_gitlab_housekeeping.py,sha256=Sn5rERCp28sMiBx5vJaQ5yy80y37GouMClejmXocsT8,10068
+reconcile/test/test_gitlab_housekeeping.py,sha256=3n5X7aedrwFULpEtzSpfJf2Ky0cNn26zybh9KWr6N0k,10048
 reconcile/test/test_gitlab_labeler.py,sha256=PmYXiU2g0_O5OTdMGPzdeqBAfat92U9bhjjfeyiGSmQ,4336
 reconcile/test/test_gitlab_members.py,sha256=kaCOA02eZSrSMkzHmaLwWW3LY6Af0ciLSEP4PlMLvOU,9949
 reconcile/test/test_gitlab_permissions.py,sha256=vPFEsdjyP-lO8pc2rN6acMns3Sjz9YJs16msbBR8DZc,2736
@@ -657,7 +657,7 @@ reconcile/utils/filtering.py,sha256=S4PbMHuFr3ED0P2Q_ea5CAaB7FimI62B-F5YTaKrphA,
 reconcile/utils/git.py,sha256=actOWI2HiNpMIV6nHCzinhRa6b04Y9plWOCcPQa8lNA,1437
 reconcile/utils/git_secrets.py,sha256=y1rEhwA8DyDpBSAEuhMS7Y2X3mpxT2zQ4zyDFkhLe_g,1936
 reconcile/utils/github_api.py,sha256=R8OvqyPdnRqvP-Efnv9RvIcbBlb4M0KC4RlbnJMD0Tg,2426
-reconcile/utils/gitlab_api.py,sha256=T4kAaiXRztgxTMpyR0XND_6Wm0WThRoHUNULzNZxNBA,29285
+reconcile/utils/gitlab_api.py,sha256=ZR71p2WcKtyb4aq_K-CkWPcjtaBf64Lv6Vi79LIHvIw,30180
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=IGhxzBcuebbapDKLseevEThSsxa_eDCPNpo3A4VnOS4,14066
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
@@ -750,7 +750,7 @@ reconcile/utils/membershipsources/app_interface_resolver.py,sha256=MqDFvK3aXhmmM
 reconcile/utils/membershipsources/models.py,sha256=r733cJUTne1ZKBBB8iMyxZxlk6ut2OmJUK68ui8OUq0,1929
 reconcile/utils/membershipsources/resolver.py,sha256=meERrCZqeVJZR2lHdZEznaZDsCsUb194UEMOjbE4aYA,3168
 reconcile/utils/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/merge_request_manager/merge_request_manager.py,sha256=6i2uwSJoeYiZSRwcnBG5ICQXyIC8umvQ_TzubR7_jvA,3374
+reconcile/utils/merge_request_manager/merge_request_manager.py,sha256=UVGkCo9RZJaCynBqqITW7cTDXFsHIoyh9kSvobmQVT0,3385
 reconcile/utils/merge_request_manager/parser.py,sha256=5pGoz8Q6EuYXlUc1z-D0FahdRP2YLO8CpACoa9HcgtQ,2098
 reconcile/utils/mr/__init__.py,sha256=JQS8xmLZdG4TgjAFZp2ltuV9c1sDFHIHJmpn1bkY9rM,2386
 reconcile/utils/mr/app_interface_reporter.py,sha256=6Kpg93V9FvcOke9Jimkva359MQ-ZyBIkUpf8QIA6-to,1793
@@ -844,8 +844,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.1rc926.dist-info/METADATA,sha256=eqpGD1LsAnd-3_U8CIfVPdBtlGf52mIqcTnfrhGHdFE,2273
-qontract_reconcile-0.10.1rc926.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc926.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc926.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc926.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc927.dist-info/METADATA,sha256=HBpJZqOcu2pa9PE_ZhB7OJrO3SGCKtUWQtZ6absL3gs,2262
+qontract_reconcile-0.10.1rc927.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc927.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc927.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc927.dist-info/RECORD,,

reconcile/aws_account_manager/merge_request_manager.py

@@ -1,4 +1,5 @@
 import logging
+from typing import cast
 
 from gitlab.exceptions import GitlabGetError
 from gitlab.v4.objects import ProjectMergeRequest
@@ -61,11 +62,11 @@ class MergeRequestManager:
         self._vcs = vcs
         self._auto_merge_enabled = auto_merge_enabled
 
-    def _merge_request_already_exists(self, aws_acccount_file_path: str) -> bool:
+    def _merge_request_already_exists(self, aws_account_file_path: str) -> bool:
         return any(
-            aws_acccount_file_path == diff["new_path"]
+            aws_account_file_path == diff["new_path"]
             for mr in self._open_mrs
-            for diff in mr.changes()["changes"]
+            for diff in cast(dict, mr.changes())["changes"]
         )
 
     def fetch_open_merge_requests(self) -> None:

reconcile/gitlab_fork_compliance.py

@@ -1,10 +1,8 @@
 import logging
 import sys
 
-from gitlab import (
-    MAINTAINER_ACCESS,
-    GitlabGetError,
-)
+from gitlab import GitlabGetError
+from gitlab.const import MAINTAINER_ACCESS
 
 from reconcile import queries
 from reconcile.utils.gitlab_api import GitLabApi

reconcile/gitlab_housekeeping.py

@@ -232,9 +232,10 @@ def handle_stale_items(
                 continue
 
             # if item has 'stale' label - check the notes
+            # TODO: add request count metrics and maybe server side filter to reduce requests
             cancel_notes = [
                 n
-                for n in item.notes.list()
+                for n in item.notes.list(iterator=True)
                 if n.attributes.get("body") == f"/{LABEL} cancel"
             ]
             if not cancel_notes:

reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py

@@ -68,13 +68,15 @@ class MRParser:
         - MR has merge conflicts
         """
         all_open_mrs = self._vcs.get_open_app_interface_merge_requests()
-        sapm_mrs = [mr for mr in all_open_mrs if label in mr.attributes.get("labels")]
+        sapm_mrs = [
+            mr for mr in all_open_mrs if label in mr.attributes.get("labels", [])
+        ]
         open_batcher_mrs: list[ProjectMergeRequest] = []
         open_scheduler_mrs: list[ProjectMergeRequest] = []
 
         for mr in sapm_mrs:
             attrs = mr.attributes
-            desc = attrs.get("description")
+            desc = str(attrs.get("description", ""))
             parts = desc.split(PROMOTION_DATA_SEPARATOR)
             if not len(parts) == 2:
                 logging.info(
@@ -142,10 +144,10 @@ class MRParser:
         seen: set[tuple[str, str]] = set()
         for mr in mrs:
             attrs = mr.attributes
-            desc = attrs.get("description")
+            desc = str(attrs.get("description", ""))
             parts = desc.split(PROMOTION_DATA_SEPARATOR)
             promotion_data = parts[1]
-            has_conflicts = attrs.get("has_conflicts", False)
+            has_conflicts = bool(attrs.get("has_conflicts", False))
             if has_conflicts:
                 logging.info(
                     "Merge-conflict detected. Closing %s",

reconcile/test/test_gitlab_housekeeping.py

@@ -3,6 +3,7 @@ from datetime import (
     timedelta,
 )
 from unittest.mock import (
+    Mock,
     create_autospec,
     patch,
 )
@@ -172,7 +173,7 @@ def project() -> Project:
 
 
 @pytest.fixture
-def can_be_merged_merge_request() -> ProjectMergeRequest:
+def can_be_merged_merge_request() -> Mock:
     mr = create_autospec(ProjectMergeRequest)
     mr.merge_status = "can_be_merged"
     mr.work_in_progress = False
@@ -205,7 +206,7 @@ def success_merge_request_pipeline() -> dict:
 
 def test_merge_merge_requests(
     project: Project,
-    can_be_merged_merge_request: ProjectMergeRequest,
+    can_be_merged_merge_request: Mock,
     add_lgtm_merge_request_resource_label_event: ProjectMergeRequestResourceLabelEvent,
     success_merge_request_pipeline: dict,
 ) -> None:

reconcile/utils/gitlab_api.py

@@ -13,6 +13,7 @@ from operator import (
 from typing import (
     Any,
     TypedDict,
+    cast,
 )
 from urllib.parse import urlparse
 
@@ -30,7 +31,9 @@ from gitlab.v4.objects import (
     Group,
     Project,
     ProjectIssue,
+    ProjectIssueManager,
     ProjectMergeRequest,
+    ProjectMergeRequestManager,
     ProjectMergeRequestNote,
 )
 from sretoolbox.utils import retry
@@ -242,9 +245,9 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
         if project is None:
             return None
         if query:
-            members = self.get_items(project.members.all, query_parameters=query)
+            members = self.get_items(project.members_all.list, query_parameters=query)
         else:
-            members = self.get_items(project.members.all)
+            members = self.get_items(project.members_all.list)
         return [m.username for m in members if m.access_level >= 40]
 
     def get_app_sre_group_users(self):
@@ -273,7 +276,7 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
         access_level = self.get_access_level(access)
         # check if we have 'access_level' access so we can  add the group with same role.
         members = self.get_items(
-            project.members.all, query_parameters={"user_ids": self.user.id}
+            project.members_all.list, query_parameters={"user_ids": self.user.id}
         )
         if not any(
             self.user.id == member.id and member.access_level >= access_level
@@ -450,8 +453,13 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
         return self.get_items(mr.resourcelabelevents.list)
 
     def get_merge_request_pipelines(self, mr: ProjectMergeRequest) -> list[dict]:
+        # TODO: use typed object in return
+        # TODO: use server side order_by
+        items = self.get_items(mr.pipelines.list)
         return sorted(
-            self.get_items(mr.pipelines), key=lambda x: x["created_at"], reverse=True
+            [i.asdict() for i in items],
+            key=lambda x: x["created_at"],
+            reverse=True,
         )
 
     @staticmethod
@@ -459,7 +467,8 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
         merge_request: ProjectMergeRequest,
     ) -> list[str]:
         gitlab_request.labels(integration=INTEGRATION_NAME).inc()
-        changes = merge_request.changes()["changes"]
+        result = merge_request.changes()
+        changes = cast(dict, result)["changes"]
         changed_paths = set()
         for change in changes:
             old_path = change["old_path"]
@@ -587,6 +596,7 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
         gitlab_request.labels(integration=INTEGRATION_NAME).inc()
         merge_request.notes.create({"body": body})
 
+    # TODO: deprecated this method as new support of list(get_all=True), and figure out request counter metrics
     @staticmethod
     def get_items(method, **kwargs):
         all_items = []
@@ -608,7 +618,18 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
     @staticmethod
     def refresh_labels(item: ProjectMergeRequest | ProjectIssue):
         gitlab_request.labels(integration=INTEGRATION_NAME).inc()
-        refreshed_item = item.manager.get(item.get_id())
+        manager: ProjectMergeRequestManager | ProjectIssueManager
+        match item:
+            case ProjectMergeRequest():
+                manager = cast(ProjectMergeRequestManager, item.manager)
+            case ProjectIssue():
+                manager = cast(ProjectIssueManager, item.manager)
+            case _:
+                raise ValueError("item must be a ProjectMergeRequest or ProjectIssue")
+        item_id = item.get_id()
+        if item_id is None:
+            raise ValueError("item must have an id")
+        refreshed_item = manager.get(item_id)
         item.labels = refreshed_item.labels
 
     @staticmethod

reconcile/utils/merge_request_manager/merge_request_manager.py

@@ -67,7 +67,7 @@ class MergeRequestManagerBase(Generic[T]):
         """
         for mr in self._fetch_managed_open_merge_requests():
             attrs = mr.attributes
-            desc = attrs.get("description")
+            desc = str(attrs.get("description") or "")
             has_conflicts = attrs.get("has_conflicts", False)
             if has_conflicts:
                 logging.info(