summaryrefslogtreecommitdiff
path: root/gitlab
diff options
context:
space:
mode:
Diffstat (limited to 'gitlab')
-rw-r--r--gitlab/__init__.py19
-rw-r--r--gitlab/exceptions.py4
-rw-r--r--gitlab/v4/objects.py42
3 files changed, 65 insertions, 0 deletions
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
index 3a36bf2..c0562da 100644
--- a/gitlab/__init__.py
+++ b/gitlab/__init__.py
@@ -555,6 +555,25 @@ class Gitlab(object):
"""
return self.http_request('delete', path, **kwargs)
+ @on_http_error(GitlabSearchError)
+ def search(self, scope, search, **kwargs):
+ """Search GitLab resources matching the provided string.'
+
+ Args:
+ scope (str): Scope of the search
+ search (str): Search string
+ **kwargs: Extra options to send to the server (e.g. sudo)
+
+ Raises:
+ GitlabAuthenticationError: If authentication is not correct
+ GitlabSearchError: If the server failed to perform the request
+
+ Returns:
+ GitlabList: A list of dicts describing the resources found.
+ """
+ data = {'scope': scope, 'search': search}
+ return self.http_list('/search', query_data=data, **kwargs)
+
class GitlabList(object):
"""Generator representing a list of remote objects.
diff --git a/gitlab/exceptions.py b/gitlab/exceptions.py
index 744890f..00d99c6 100644
--- a/gitlab/exceptions.py
+++ b/gitlab/exceptions.py
@@ -197,6 +197,10 @@ class GitlabOwnershipError(GitlabOperationError):
pass
+class GitlabSearchError(GitlabOperationError):
+ pass
+
+
def on_http_error(error):
"""Manage GitlabHttpError exceptions.
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
index ac25f1e..6f40dc8 100644
--- a/gitlab/v4/objects.py
+++ b/gitlab/v4/objects.py
@@ -713,6 +713,27 @@ class Group(SaveMixin, ObjectDeleteMixin, RESTObject):
path = '/groups/%d/projects/%d' % (self.id, to_project_id)
self.manager.gitlab.http_post(path, **kwargs)
+ @cli.register_custom_action('Group', ('scope', 'search'))
+ @exc.on_http_error(exc.GitlabSearchError)
+ def search(self, scope, search, **kwargs):
+ """Search the group resources matching the provided string.'
+
+ Args:
+ scope (str): Scope of the search
+ search (str): Search string
+ **kwargs: Extra options to send to the server (e.g. sudo)
+
+ Raises:
+ GitlabAuthenticationError: If authentication is not correct
+ GitlabSearchError: If the server failed to perform the request
+
+ Returns:
+ GitlabList: A list of dicts describing the resources found.
+ """
+ data = {'scope': scope, 'search': search}
+ path = '/groups/%d/search' % self.get_id()
+ return self.manager.gitlab.http_list(path, query_data=data, **kwargs)
+
class GroupManager(CRUDMixin, RESTManager):
_path = '/groups'
@@ -2867,6 +2888,27 @@ class Project(SaveMixin, ObjectDeleteMixin, RESTObject):
"markdown": data['markdown']
}
+ @cli.register_custom_action('Project', ('scope', 'search'))
+ @exc.on_http_error(exc.GitlabSearchError)
+ def search(self, scope, search, **kwargs):
+ """Search the project resources matching the provided string.'
+
+ Args:
+ scope (str): Scope of the search
+ search (str): Search string
+ **kwargs: Extra options to send to the server (e.g. sudo)
+
+ Raises:
+ GitlabAuthenticationError: If authentication is not correct
+ GitlabSearchError: If the server failed to perform the request
+
+ Returns:
+ GitlabList: A list of dicts describing the resources found.
+ """
+ data = {'scope': scope, 'search': search}
+ path = '/projects/%d/search' % self.get_id()
+ return self.manager.gitlab.http_list(path, query_data=data, **kwargs)
+
class ProjectManager(CRUDMixin, RESTManager):
_path = '/projects'