gitlab_mr_check 1.3.0__tar.gz → 1.4.1__tar.gz

{gitlab_mr_check-1.3.0 → gitlab_mr_check-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitlab_mr_check
-Version: 1.3.0
+Version: 1.4.1
 Summary: GitLab Merge Request 4-Eyes Approval Audit Tool
 Author: Yorick Hoorneman
 Author-email: Yorick Hoorneman <yhoorneman@schubergphilis.com>
@@ -29,8 +29,8 @@ Description-Content-Type: text/markdown
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
 [![Changelog](https://img.shields.io/badge/changelog-Keep%20a%20Changelog%201.1.0-orange)](https://keepachangelog.com/en/1.1.0/)
-[![Build](https://img.shields.io/badge/build-unknown-lightgrey)]()
-[![Coverage](https://img.shields.io/badge/coverage-33%25-red)](https://coverage.readthedocs.io/)
+[![Build](https://img.shields.io/badge/build-passing-brightgreen)]()
+[![Coverage](https://img.shields.io/badge/coverage-0%25-red)](https://coverage.readthedocs.io/)
 [![pyscn quality](https://img.shields.io/badge/pyscn-not%20rated-lightgrey)](https://pyscn.ludo-tech.org)
 
 GitLab Merge Request 4-Eyes Approval Audit Tool

{gitlab_mr_check-1.3.0 → gitlab_mr_check-1.4.1}/README.md

@@ -14,8 +14,8 @@
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
 [![Changelog](https://img.shields.io/badge/changelog-Keep%20a%20Changelog%201.1.0-orange)](https://keepachangelog.com/en/1.1.0/)
-[![Build](https://img.shields.io/badge/build-unknown-lightgrey)]()
-[![Coverage](https://img.shields.io/badge/coverage-33%25-red)](https://coverage.readthedocs.io/)
+[![Build](https://img.shields.io/badge/build-passing-brightgreen)]()
+[![Coverage](https://img.shields.io/badge/coverage-0%25-red)](https://coverage.readthedocs.io/)
 [![pyscn quality](https://img.shields.io/badge/pyscn-not%20rated-lightgrey)](https://pyscn.ludo-tech.org)
 
 GitLab Merge Request 4-Eyes Approval Audit Tool

{gitlab_mr_check-1.3.0 → gitlab_mr_check-1.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gitlab_mr_check"
-version = "1.3.0"
+version = "1.4.1"
 description = "GitLab Merge Request 4-Eyes Approval Audit Tool"
 readme = "README.md"
 authors = [
@@ -254,7 +254,7 @@ branch = true
 [tool.coverage.report]
 show_missing = true
 skip_covered = true
-fail_under = 33
+fail_under = 34
 exclude_lines = [
     "pragma: no cover",
     "if __name__ == .__main__.",

{gitlab_mr_check-1.3.0 → gitlab_mr_check-1.4.1}/src/gitlab_mr_check/gitlab_mr_check.py

@@ -48,6 +48,11 @@ class MRApprovalResult:
     iid: int
     passed: bool
     reasoning: str
+    title: str = ''
+    web_url: str = ''
+    state: str = ''
+    created_at: str = ''
+    updated_at: str = ''
 
 
 @dataclass
@@ -111,7 +116,16 @@ def has_4eyes_approval(mr: gitlab.v4.objects.ProjectMergeRequest) -> MRApprovalR
     approvers = {user['user']['username'] for user in approved_by}
     passed = bool(approvers - {author})
     reasoning = f'MR !{mr.iid} by {author} approved by {", ".join(approvers)} - 4-eyes approval: {passed}'
-    return MRApprovalResult(iid=mr.iid, passed=passed, reasoning=reasoning)
+    return MRApprovalResult(
+        iid=mr.iid,
+        passed=passed,
+        reasoning=reasoning,
+        title=mr.title,
+        web_url=mr.web_url,
+        state=mr.state,
+        created_at=mr.created_at,
+        updated_at=mr.updated_at,
+    )
 
 
 def mr_is_merged(mr: gitlab.v4.objects.ProjectMergeRequest) -> bool:
@@ -176,20 +190,16 @@ def audit(url: str, token: str, config: Config) -> list[ProjectMRAuditResult]:
     LOGGER.info('Getting the projects under the groups')
     gl_projects = []
     for group in gl_groups:
-        group_projects = group.projects.list(all=True)
+        group_projects = group.projects.list(all=True, archived=False)
         LOGGER.info('  Group %s: %d project(s)', group.full_path, len(group_projects))
         for project in group_projects:
-            LOGGER.info('    Project: %s (archived: %s)', project.path_with_namespace, project.archived)
-            gl_projects.append(gl.projects.get(project.id))
-    LOGGER.info(
-        'Found %d project(s) (%d after excluding archived)',
-        len(gl_projects),
-        sum(1 for p in gl_projects if not p.archived),
-    )
+            LOGGER.info('    Project: %s', project.path_with_namespace)
+            gl_projects.append(gl.projects.get(project.id, lazy=True))
+    LOGGER.info('Found %d project(s)', len(gl_projects))
 
     LOGGER.info('Getting the merge requests under the projects')
     gl_project_mrs = get_mrs_by_projects(
-        projects=[p for p in gl_projects if not p.archived],
+        projects=gl_projects,
         filters=[mr_is_merged, partial(mr_updated_in_years, years=config.gitlab.audit.years)],
     )