qontract-reconcile 0.10.2.dev233__tar.gz → 0.10.2.dev235__tar.gz

{qontract_reconcile-0.10.2.dev233 → qontract_reconcile-0.10.2.dev235}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev233
+Version: 0.10.2.dev235
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile
@@ -43,7 +43,7 @@ Requires-Dist: pygithub<1.59,>=1.58
 Requires-Dist: pyjwt~=2.7
 Requires-Dist: pyopenssl~=23.0
 Requires-Dist: pypd<1.2.0,>=1.1.0
-Requires-Dist: python-gitlab==5.6.0
+Requires-Dist: python-gitlab==6.0.0
 Requires-Dist: requests-oauthlib~=1.3
 Requires-Dist: requests~=2.32
 Requires-Dist: rich<14.0.0,>=13.3.0

{qontract_reconcile-0.10.2.dev233 → qontract_reconcile-0.10.2.dev235}/pyproject.toml

@@ -45,7 +45,7 @@ dependencies = [
     "pyjwt~=2.7",
     "pyOpenSSL~=23.0",
     "pypd>=1.1.0,<1.2.0",
-    "python-gitlab==5.6.0",
+    "python-gitlab==6.0.0",
     "requests-oauthlib~=1.3",
     "requests~=2.32",
     "rich>=13.3.0,<14.0.0",

{qontract_reconcile-0.10.2.dev233 → qontract_reconcile-0.10.2.dev235}/reconcile/change_owners/change_owners.py

@@ -382,7 +382,7 @@ def run(
 
             comments = gl.get_merge_request_comments(merge_request)
             good_to_test_approvers = {
-                c["username"] for c in comments if c["body"].strip() == "/good-to-test"
+                c.username for c in comments if c.body.strip() == "/good-to-test"
             }
 
             change_admitted = is_change_admitted(

{qontract_reconcile-0.10.2.dev233 → qontract_reconcile-0.10.2.dev235}/reconcile/change_owners/decision.py

@@ -1,12 +1,8 @@
-import operator
 from collections import defaultdict
-from collections.abc import (
-    Iterable,
-    Mapping,
-)
+from collections.abc import Iterable
 from dataclasses import dataclass
 from enum import Enum
-from typing import Any
+from operator import attrgetter
 
 from reconcile.change_owners.approver import (
     Approver,
@@ -16,6 +12,7 @@ from reconcile.change_owners.bundle import FileRef
 from reconcile.change_owners.change_types import ChangeTypeContext, DiffCoverage
 from reconcile.change_owners.changes import BundleFileChange
 from reconcile.change_owners.diff import Diff
+from reconcile.utils.gitlab_api import Comment
 
 
 class DecisionCommand(Enum):
@@ -33,12 +30,12 @@ class Decision:
 
 
 def get_approver_decisions_from_mr_comments(
-    comments: Iterable[Mapping[str, Any]],
+    comments: Iterable[Comment],
 ) -> list[Decision]:
     decisions: list[Decision] = []
-    for c in sorted(comments, key=operator.itemgetter("created_at")):
-        commenter = c["username"]
-        comment_body = c.get("body")
+    for c in sorted(comments, key=attrgetter("created_at")):
+        commenter = c.username
+        comment_body = c.body
         for line in comment_body.split("\n") if comment_body else []:
             line = line.strip()
             if line == DecisionCommand.APPROVED.value:

{qontract_reconcile-0.10.2.dev233 → qontract_reconcile-0.10.2.dev235}/reconcile/gitlab_fork_compliance.py

@@ -77,8 +77,7 @@ class GitlabForkCompliance:
                     continue
                 LOG.info([f"adding {member.username} as maintainer"])
                 user_payload = {"user_id": member.id, "access_level": MAINTAINER_ACCESS}
-                member = self.src.project.members.create(user_payload)
-                member.save()
+                self.src.project.members.create(user_payload)
 
         # Last but not least, we remove the blocked label, in case
         # it is set

{qontract_reconcile-0.10.2.dev233 → qontract_reconcile-0.10.2.dev235}/reconcile/gitlab_housekeeping.py

@@ -14,10 +14,12 @@ from operator import itemgetter
 from typing import Any, cast
 
 import gitlab
+from gitlab.const import PipelineStatus
 from gitlab.v4.objects import (
     ProjectCommit,
     ProjectIssue,
     ProjectMergeRequest,
+    ProjectMergeRequestPipeline,
 )
 from prometheus_client import (
     Counter,
@@ -133,11 +135,16 @@ def _calculate_time_since_approval(approved_at: str) -> float:
 
 
 def get_timed_out_pipelines(
-    pipelines: list[dict], pipeline_timeout: int = 60
-) -> list[dict]:
+    pipelines: list[ProjectMergeRequestPipeline],
+    pipeline_timeout: int = 60,
+) -> list[ProjectMergeRequestPipeline]:
     now = datetime.utcnow()
 
-    pending_pipelines = [p for p in pipelines if p["status"] in {"pending", "running"}]
+    pending_pipelines = [
+        p
+        for p in pipelines
+        if p.status in {PipelineStatus.PENDING, PipelineStatus.RUNNING}
+    ]
 
     if not pending_pipelines:
         return []
@@ -145,7 +152,7 @@ def get_timed_out_pipelines(
     timed_out_pipelines = []
 
     for p in pending_pipelines:
-        update_time = datetime.strptime(p["updated_at"], DATE_FORMAT)
+        update_time = datetime.strptime(p.updated_at, DATE_FORMAT)
 
         elapsed = (now - update_time).total_seconds()
 
@@ -160,20 +167,19 @@ def clean_pipelines(
     dry_run: bool,
     gl: GitLabApi,
     fork_project_id: int,
-    pipelines: list[dict],
+    pipelines: list[ProjectMergeRequestPipeline],
 ) -> None:
     if not dry_run:
         gl_piplelines = gl.get_project_by_id(fork_project_id).pipelines
 
     for p in pipelines:
-        logging.info(["canceling", p["web_url"]])
+        logging.info(["canceling", p.web_url])
         if not dry_run:
             try:
-                gl_piplelines.get(p["id"]).cancel()
+                gl_piplelines.get(p.id, lazy=True).cancel()
             except gitlab.exceptions.GitlabPipelineCancelError as err:
                 logging.error(
-                    f"unable to cancel {p['web_url']} - "
-                    f"error message {err.error_message}"
+                    f"unable to cancel {p.web_url} - error message {err.error_message}"
                 )
 
 
@@ -188,9 +194,9 @@ def verify_on_demand_tests(
     Check if MR has passed all necessary test jobs and add comments to indicate test results.
     """
     pipelines = gl.get_merge_request_pipelines(mr)
-    running_pipelines = [p for p in pipelines if p["status"] == "running"]
+    running_pipelines = [p for p in pipelines if p.status == PipelineStatus.RUNNING]
     if running_pipelines:
-        # wait for pipelines complate
+        # wait for pipelines completion
         return False
 
     commit = next(mr.commits())
@@ -510,7 +516,9 @@ def rebase_merge_requests(
                 continue
             # possible statuses:
             # running, pending, success, failed, canceled, skipped
-            running_pipelines = [p for p in pipelines if p["status"] == "running"]
+            running_pipelines = [
+                p for p in pipelines if p.status == PipelineStatus.RUNNING
+            ]
             if running_pipelines:
                 continue
 
@@ -591,7 +599,9 @@ def merge_merge_requests(
         if wait_for_pipeline:
             # possible statuses:
             # running, pending, success, failed, canceled, skipped
-            running_pipelines = [p for p in pipelines if p["status"] == "running"]
+            running_pipelines = [
+                p for p in pipelines if p.status == PipelineStatus.RUNNING
+            ]
             if running_pipelines:
                 if insist:
                     # This raise causes the method to restart due to the usage of
@@ -606,8 +616,8 @@ def merge_merge_requests(
                     )
                 continue
 
-        last_pipeline_result = pipelines[0]["status"]
-        if last_pipeline_result != "success":
+        last_pipeline_result = pipelines[0].status
+        if last_pipeline_result != PipelineStatus.SUCCESS:
             continue
 
         logging.info(["merge", gl.project.name, mr.iid])

{qontract_reconcile-0.10.2.dev233 → qontract_reconcile-0.10.2.dev235}/reconcile/gitlab_members.py

@@ -216,7 +216,7 @@ def reconcile_gitlab_members(
                 gl.get_access_level_string(gitlab_user.access_level),
             ])
             if not dry_run:
-                gl.add_group_member(group, gitlab_user)
+                gl.add_group_member(group, gitlab_user.user, gitlab_user.access_level)
         for key, group_member in diff_data.delete.items():
             logging.info([
                 key,

{qontract_reconcile-0.10.2.dev233 → qontract_reconcile-0.10.2.dev235}/reconcile/gitlab_owners.py

@@ -89,19 +89,19 @@ class MRApproval:
         comments = self.gitlab.get_merge_request_comments(self.mr)
         for comment in comments:
             # Only interested in '/lgtm' comments
-            if comment["body"] != "/lgtm":
+            if comment.body != "/lgtm":
                 continue
 
             # Only interested in comments created after the top commit
             # creation time
-            comment_created_at = dateparser.parse(comment["created_at"])
+            comment_created_at = dateparser.parse(comment.created_at)
             if (
                 comment_created_at < self.top_commit_created_at
                 and not self.persistent_lgtm
             ):
                 continue
 
-            lgtms.append(comment["username"])
+            lgtms.append(comment.username)
         return lgtms
 
     def expand_groups(self, owners: list[str]) -> set[str]:
@@ -173,19 +173,22 @@ class MRApproval:
         comments = self.gitlab.get_merge_request_comments(self.mr)
         for comment in comments:
             # Only interested on our own comments
-            if comment["username"] != self.gitlab.user.username:
+            if comment.username != self.gitlab.user.username:
                 continue
 
             # Ignoring non-approval comments
-            body = comment["body"]
+            body = comment.body
             if not body.startswith(COMMENT_PREFIX):
                 continue
 
             # If the comment was created before the last commit,
             # it means we had a push after the comment. In this case,
             # we delete the comment and move on.
-            comment_created_at = dateparser.parse(comment["created_at"])
-            if comment_created_at < self.top_commit_created_at:
+            comment_created_at = dateparser.parse(comment.created_at)
+            if (
+                comment_created_at < self.top_commit_created_at
+                and comment.note is not None
+            ):
                 # Deleting stale comments
                 _LOG.info([
                     f"Project:{self.gitlab.project.id} "
@@ -193,7 +196,7 @@ class MRApproval:
                     f"- removing stale comment"
                 ])
                 if not self.dry_run:
-                    self.gitlab.delete_comment(comment["note"])
+                    self.gitlab.delete_comment(comment.note)
                 continue
 
             # At this point, we've found an approval comment comment

{qontract_reconcile-0.10.2.dev233 → qontract_reconcile-0.10.2.dev235}/reconcile/gql_definitions/introspection.json

@@ -726,57 +726,6 @@
                             "isDeprecated": false,
                             "deprecationReason": null
                         },
-                        {
-                            "name": "cna_experimental_provisioners_v1",
-                            "description": null,
-                            "args": [
-                                {
-                                    "name": "name",
-                                    "description": null,
-                                    "type": {
-                                        "kind": "SCALAR",
-                                        "name": "String",
-                                        "ofType": null
-                                    },
-                                    "defaultValue": null
-                                },
-                                {
-                                    "name": "path",
-                                    "description": null,
-                                    "type": {
-                                        "kind": "SCALAR",
-                                        "name": "String",
-                                        "ofType": null
-                                    },
-                                    "defaultValue": null
-                                },
-                                {
-                                    "name": "filter",
-                                    "description": null,
-                                    "type": {
-                                        "kind": "SCALAR",
-                                        "name": "JSON",
-                                        "ofType": null
-                                    },
-                                    "defaultValue": null
-                                }
-                            ],
-                            "type": {
-                                "kind": "LIST",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "NON_NULL",
-                                    "name": null,
-                                    "ofType": {
-                                        "kind": "OBJECT",
-                                        "name": "CNAExperimentalProvisioner_v1",
-                                        "ofType": null
-                                    }
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
                         {
                             "name": "clusters_v1",
                             "description": null,
@@ -10638,11 +10587,6 @@
                             "kind": "OBJECT",
                             "name": "GcpProject_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "CNAExperimentalProvisioner_v1",
-                            "ofType": null
                         }
                     ]
                 },
@@ -25411,11 +25355,6 @@
                     "interfaces": null,
                     "enumValues": null,
                     "possibleTypes": [
-                        {
-                            "kind": "OBJECT",
-                            "name": "NamespaceCNAsset_v1",
-                            "ofType": null
-                        },
                         {
                             "kind": "OBJECT",
                             "name": "NamespaceTerraformProviderResourceAWS_v1",
@@ -28125,99 +28064,6 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
-                {
-                    "kind": "OBJECT",
-                    "name": "CNAExperimentalProvisioner_v1",
-                    "description": null,
-                    "fields": [
-                        {
-                            "name": "schema",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "SCALAR",
-                                    "name": "String",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "path",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "SCALAR",
-                                    "name": "String",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "name",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "SCALAR",
-                                    "name": "String",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "description",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "SCALAR",
-                                "name": "String",
-                                "ofType": null
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "ocm",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "OBJECT",
-                                    "name": "OpenShiftClusterManager_v1",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        }
-                    ],
-                    "inputFields": null,
-                    "interfaces": [
-                        {
-                            "kind": "INTERFACE",
-                            "name": "ExternalResourcesProvisioner_v1",
-                            "ofType": null
-                        }
-                    ],
-                    "enumValues": null,
-                    "possibleTypes": null
-                },
                 {
                     "kind": "OBJECT",
                     "name": "VaultInstance_v1",
@@ -40028,185 +39874,6 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
-                {
-                    "kind": "OBJECT",
-                    "name": "NamespaceCNAsset_v1",
-                    "description": null,
-                    "fields": [
-                        {
-                            "name": "provider",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "SCALAR",
-                                    "name": "String",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "provisioner",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "OBJECT",
-                                    "name": "CNAExperimentalProvisioner_v1",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "resources",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "LIST",
-                                    "name": null,
-                                    "ofType": {
-                                        "kind": "NON_NULL",
-                                        "name": null,
-                                        "ofType": {
-                                            "kind": "INTERFACE",
-                                            "name": "CNAsset_v1",
-                                            "ofType": null
-                                        }
-                                    }
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        }
-                    ],
-                    "inputFields": null,
-                    "interfaces": [
-                        {
-                            "kind": "INTERFACE",
-                            "name": "NamespaceExternalResource_v1",
-                            "ofType": null
-                        }
-                    ],
-                    "enumValues": null,
-                    "possibleTypes": null
-                },
-                {
-                    "kind": "INTERFACE",
-                    "name": "CNAsset_v1",
-                    "description": null,
-                    "fields": [
-                        {
-                            "name": "provider",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "SCALAR",
-                                    "name": "String",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        }
-                    ],
-                    "inputFields": null,
-                    "interfaces": null,
-                    "enumValues": null,
-                    "possibleTypes": [
-                        {
-                            "kind": "OBJECT",
-                            "name": "CNANullAsset_v1",
-                            "ofType": null
-                        }
-                    ]
-                },
-                {
-                    "kind": "OBJECT",
-                    "name": "CNANullAsset_v1",
-                    "description": null,
-                    "fields": [
-                        {
-                            "name": "provider",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "SCALAR",
-                                    "name": "String",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "identifier",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "SCALAR",
-                                    "name": "String",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "description",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "SCALAR",
-                                "name": "String",
-                                "ofType": null
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "addr_block",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "SCALAR",
-                                "name": "String",
-                                "ofType": null
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        }
-                    ],
-                    "inputFields": null,
-                    "interfaces": [
-                        {
-                            "kind": "INTERFACE",
-                            "name": "CNAsset_v1",
-                            "ofType": null
-                        }
-                    ],
-                    "enumValues": null,
-                    "possibleTypes": null
-                },
                 {
                     "kind": "OBJECT",
                     "name": "AWSAccountSharingOptionAMI_v1",