Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only fetch projects with min access level #166

Merged
merged 2 commits into from
Mar 11, 2019
Merged

Only fetch projects with min access level #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baffa7d
Use IntEnum for AccessLevel
JaimeLennox Mar 9, 2019
5f9a4a9
Only fetch projects with min access level
JaimeLennox Mar 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion marge/bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def _process_projects(
for project in projects:
project_name = project.path_with_namespace

if project.access_level.value < AccessLevel.reporter.value:
if project.access_level < AccessLevel.reporter:
log.warning("Don't have enough permissions to browse merge requests in %s!", project_name)
continue
merge_requests = self._get_merge_requests(project, project_name)
Expand Down
20 changes: 16 additions & 4 deletions marge/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import logging as log
from enum import Enum, unique
from enum import IntEnum, unique
from functools import partial

from . import gitlab
Expand Down Expand Up @@ -27,9 +27,17 @@ def filter_by_path_with_namespace(projects):

@classmethod
def fetch_all_mine(cls, api):
projects_kwargs = {'membership': True, 'with_merge_requests_enabled': True}

# GitLab has an issue where projects may not show appropriate permissions in nested groups. Using
# `min_access_level` is known to provide the correct projects, so we'll prefer this method
# if it's available. See #156 for more details.
if api.version().release >= (11, 2):
projects_kwargs["min_access_level"] = int(AccessLevel.developer)

projects_info = api.collect_all_pages(GET(
'/projects',
{'membership': True, 'with_merge_requests_enabled': True},
projects_kwargs,
))

def project_seems_ok(project_info):
Expand All @@ -43,7 +51,11 @@ def project_seems_ok(project_info):

return permissions_ok

return [cls(api, project_info) for project_info in projects_info if project_seems_ok(project_info)]
return [
cls(api, project_info)
for project_info in projects_info
if "min_access_level" in projects_kwargs or project_seems_ok(project_info)
]

@property
def path_with_namespace(self):
Expand Down Expand Up @@ -78,7 +90,7 @@ def access_level(self):


@unique
class AccessLevel(Enum):
class AccessLevel(IntEnum):
# See https://docs.gitlab.com/ce/api/access_requests.html
guest = 10
reporter = 20
Expand Down
8 changes: 3 additions & 5 deletions tests/test_project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from unittest.mock import Mock
import pytest

from marge.gitlab import Api, GET
from marge.gitlab import Api, GET, Version
from marge.project import AccessLevel, Project


Expand Down Expand Up @@ -67,12 +67,10 @@ def test_fetch_all_mine(self):

api = self.api
api.collect_all_pages = Mock(return_value=[prj1, prj2])
api.version = Mock(return_value=Version.parse("11.2.0-ee"))

result = Project.fetch_all_mine(api)
api.collect_all_pages.assert_called_once_with(GET(
'/projects',
{'membership': True, 'with_merge_requests_enabled': True},
))
api.collect_all_pages.assert_called_once()
assert [prj.info for prj in result] == [prj1, prj2]

def test_properties(self):
Expand Down