From c17ecc09df4bec4e913d6b971672bc48ad13de28 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Sat, 5 Nov 2016 08:00:07 +0100 Subject: [PATCH] Move deploy key enable/disable to the object To keep things consistent with other objects, action methods are available on the object itself, not the manager. --- docs/gl_objects/deploy_keys.py | 4 ++-- gitlab/objects.py | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/gl_objects/deploy_keys.py b/docs/gl_objects/deploy_keys.py index 40da95c94..f144d9ef9 100644 --- a/docs/gl_objects/deploy_keys.py +++ b/docs/gl_objects/deploy_keys.py @@ -36,9 +36,9 @@ # end delete # enable -key = project.keys.enable(key_id) +deploy_key.enable() # end enable # disable -key = project.keys.disable(key_id) +deploy_key.disable() # end disable diff --git a/gitlab/objects.py b/gitlab/objects.py index 48dd257b0..1a916ae5f 100644 --- a/gitlab/objects.py +++ b/gitlab/objects.py @@ -1249,21 +1249,21 @@ class ProjectKey(GitlabObject): requiredUrlAttrs = ['project_id'] requiredCreateAttrs = ['title', 'key'] - -class ProjectKeyManager(BaseManager): - obj_cls = ProjectKey - - def enable(self, key_id): + def enable(self): """Enable a deploy key for a project.""" - url = '/projects/%s/deploy_keys/%s/enable' % (self.parent.id, key_id) + url = '/projects/%s/deploy_keys/%s/enable' % (self.project_id, self.id) r = self.gitlab._raw_post(url) raise_error_from_response(r, GitlabProjectDeployKeyError, 201) - def disable(self, key_id): + def disable(self): """Disable a deploy key for a project.""" - url = '/projects/%s/deploy_keys/%s/disable' % (self.parent.id, key_id) + url = '/projects/%s/deploy_keys/%s/disable' % (self.project_id, self.id) r = self.gitlab._raw_delete(url) - raise_error_from_response(r, GitlabProjectDeployKeyError, 201) + raise_error_from_response(r, GitlabProjectDeployKeyError, 200) + + +class ProjectKeyManager(BaseManager): + obj_cls = ProjectKey class ProjectEvent(GitlabObject):