🚒 Fixes for gitlab API update

Author: guyzmo

git_repo/services/ext/gitlab.py

@@ -43,13 +43,13 @@ def connect(self):
 
     def create(self, user, repo, add=False):
         try:
-            group = self.gl.groups.search(user)
-            data = {'name': repo, 'path': repo}
+            group = self.gl.groups.list(search=user)
+            data = {'name': repo}
             if group:
                 data['namespace_id'] = group[0].id
             self.gl.projects.create(data=data)
         except GitlabCreateError as err:
-            if json.loads(err.response_body.decode('utf-8'))['message']['name'][0] == 'has already been taken':
+            if json.loads(err.response_body.decode('utf-8')).get('message', {}).get('name', [None])[0] == 'has already been taken':
                 raise ResourceExistsError("Project already exists.") from err
             else:
                 raise ResourceError("Unhandled error.") from err
@@ -60,7 +60,7 @@ def fork(self, user, repo):
         try:
             return self.gl.projects.get('{}/{}'.format(user, repo)).forks.create({}).path_with_namespace
         except GitlabCreateError as err:
-            if json.loads(err.response_body.decode('utf-8'))['message']['name'][0] == 'has already been taken':
+            if json.loads(err.response_body.decode('utf-8')).get('message', {}).get('name', [None])[0] == 'has already been taken':
                 raise ResourceExistsError("Project already exists.") from err
             else:
                 raise ResourceError("Unhandled error: {}".format(err)) from err
@@ -71,8 +71,8 @@ def delete(self, repo, user=None):
         try:
             repository = self.gl.projects.get('{}/{}'.format(user, repo))
             if repository:
-                result = self.gl.delete(repository.__class__, repository.id)
-            if not repository or not result:
+                result = self.gl.projects.delete(repository.id)
+            if not repository:
                 raise ResourceNotFoundError("Cannot delete: repository {}/{} does not exists.".format(user, repo))
         except GitlabGetError as err:
             if err.response_code == 404:
@@ -197,7 +197,7 @@ def load_file(fname, path='.'):
 
         data = {
             'title': description,
-            'visibility_level': 0 if secret else 20
+            'visibility': 'private' if secret else 'public'
         }
 
         try:
@@ -211,12 +211,11 @@ def load_file(fname, path='.'):
                     namespace = self.username
                 gist_path = gist_pathes[1]
                 data.update({
-                        'project_id': '/'.join([namespace, project]),
                         'code': load_file(gist_path),
                         'file_name': os.path.basename(gist_path),
                     }
                 )
-                gist = self.gl.project_snippets.create(data)
+                gist = self.gl.projects.get('/'.join([namespace, project])).snippets.create(data)
 
             elif len(gist_pathes) == 1:
                 gist_path = gist_pathes[0]
@@ -302,7 +301,7 @@ def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=N
                 if not title and not description:
                     raise ArgumentError('Missing message for request creation')
 
-            request = self.gl.projects.get(project.id).mergerequests.create(
+            request = self.gl.projects.get(from_project.id).mergerequests.create(
                 {
                     'source_branch': from_branch,
                     'target_branch': onto_branch,
@@ -323,14 +322,16 @@ def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=N
 
         except GitlabGetError as err:
             raise ResourceNotFoundError(err) from err
+        except GitlabCreateError as err:
+            raise ResourceError("Creation error: {}".format(err)) from err
         except Exception as err:
             raise ResourceError("Unhandled error: {}".format(err)) from err
 
     def request_list(self, user, repo):
         project = self.gl.projects.get('/'.join([user, repo]))
         yield "{:>3}\t{:<60}\t{:2}"
         yield ('id', 'title', 'URL')
-        for mr in self.gl.projects.get(project.id).mergerequests.list() :
+        for mr in project.mergerequests.list() :
             yield ( str(mr.iid),
                     mr.title,
                     mr.web_url

tests/helpers.py

@@ -654,6 +654,7 @@ def action_request_fetch(self, namespace, repository, request, pull=False, fail=
         with self.recorder.use_cassette(self._make_cassette_name()):
             with self.mockup_git(namespace, repository):
                 self.set_mock_popen_commands([
+                    ('git init', b'Initialized empty Git repository in /tmp/bar/.git/', b'', 0),
                     ('git remote add all {}'.format(local_slug), b'', b'', 0),
                     ('git remote add {} {}'.format(self.service.name, local_slug), b'', b'', 0),
                     ('git remote get-url --all all', local_slug.encode('utf-8'), b'', 0),
@@ -762,15 +763,15 @@ def prepare_project_for_test():
             if will_record:
                 self.repository.git.push(self.service.name, 'master')
                 # create a new branch
-                new_branch = self.repository.create_head(source_branch, 'HEAD')
+                new_branch = self.repository.create_head(source_branch or 'master', 'HEAD')
                 self.repository.head.reference = new_branch
                 self.repository.head.reset(index=True, working_tree=True)
                 # make a modification, commit and push it to that branch
                 with open(os.path.join(self.repository.working_dir, 'second_file'), 'w') as test:
                     test.write('La meilleure façon de ne pas avancer est de suivre une idée fixe. J.Prévert')
                 self.repository.git.add('second_file')
                 self.repository.git.commit(message='Second commit')
-                self.repository.git.push(service, source_branch)
+                self.repository.git.push(self.service.name, source_branch or 'master')
             else:
                 import git
                 self.service._extracts_ref = lambda *a: git.Reference(

tests/integration/cassettes/test_gitlab_test_00_fork.json

@@ -1,7 +1,7 @@
 {
   "http_interactions": [
     {
-      "recorded_at": "2016-10-15T20:46:51",
+      "recorded_at": "2019-08-26T21:13:22",
       "request": {
         "body": {
           "encoding": "utf-8",
@@ -11,37 +11,47 @@
           "Accept": "*/*",
           "Accept-Encoding": "identity",
           "Connection": "keep-alive",
+          "Content-type": "application/json",
           "PRIVATE-TOKEN": "<PRIVATE_KEY_GITLAB>",
-          "User-Agent": "python-requests/2.10.0"
+          "User-Agent": "python-requests/2.22.0"
         },
         "method": "GET",
-        "uri": "https://gitlab.com/api/v3/user"
+        "uri": "https://gitlab.com/api/v4/user"
       },
       "response": {
         "body": {
           "encoding": null,
-          "string": "{\"name\":\"Guyzmo\",\"username\":\"<GITLAB_NAMESPACE>\",\"id\":459552,\"state\":\"active\",\"avatar_url\":\"https://secure.gravatar.com/avatar/917dc55c63895af9953df7d798cdd5f8?s=80&d=identicon\",\"web_url\":\"https://gitlab.com/<GITLAB_NAMESPACE>\",\"created_at\":\"2016-03-21T12:52:59.859Z\",\"is_admin\":false,\"bio\":\": :(){ :|:& };:\",\"location\":\"Earth, Solar system, Milkyway, Universe\",\"skype\":\"\",\"linkedin\":\"\",\"twitter\":\"\",\"website_url\":\"http://i.got.nothing.to/blog\",\"organization\":null,\"last_sign_in_at\":\"2016-10-13T18:28:52.737Z\",\"confirmed_at\":\"2016-03-21T13:48:05.234Z\",\"email\":\"toto@example.org\",\"theme_id\":4,\"color_scheme_id\":4,\"projects_limit\":100000,\"current_sign_in_at\":\"2016-10-13T18:28:55.087Z\",\"identities\":[],\"can_create_group\":true,\"can_create_project\":true,\"two_factor_enabled\":false,\"external\":false}"
+          "string": "{\"id\":459552,\"name\":\"Guyzmo\",\"username\":\"guyzmo\",\"state\":\"active\",\"avatar_url\":\"https://secure.gravatar.com/avatar/917dc55c63895af9953df7d798cdd5f8?s=80\\u0026d=identicon\",\"web_url\":\"https://gitlab.com/guyzmo\",\"created_at\":\"2016-03-21T12:52:59.859Z\",\"bio\":\": :(){ :|:\\u0026 };:\",\"location\":\"Earth, Solar system, Milkyway, Universe\",\"public_email\":\"\",\"skype\":\"\",\"linkedin\":\"\",\"twitter\":\"https://twitter.com/guyzmo\",\"website_url\":\"http://i.got.nothing.to/blog\",\"organization\":\"\",\"last_sign_in_at\":\"2019-08-19T16:34:20.318Z\",\"confirmed_at\":\"2016-03-21T13:48:05.234Z\",\"last_activity_on\":\"2019-08-26\",\"email\":\"guyzmo+gitlab@m0g.net\",\"theme_id\":2,\"color_scheme_id\":2,\"projects_limit\":100000,\"current_sign_in_at\":\"2019-08-26T12:05:47.884Z\",\"identities\":[],\"can_create_group\":true,\"can_create_project\":true,\"two_factor_enabled\":false,\"external\":false,\"private_profile\":false,\"shared_runners_minutes_limit\":2000,\"extra_shared_runners_minutes_limit\":null}"
         },
         "headers": {
           "Cache-Control": "max-age=0, private, must-revalidate",
-          "Content-Length": "775",
+          "Content-Length": "944",
           "Content-Type": "application/json",
-          "Date": "Sat, 15 Oct 2016 20:46:51 GMT",
-          "Etag": "W/\"677a046b34e34176cde8e128968cb26c\"",
+          "Date": "Mon, 26 Aug 2019 21:13:22 GMT",
+          "Etag": "W/\"c277655375af222ec17621ae3125a5fd\"",
+          "RateLimit-Limit": "600",
+          "RateLimit-Observed": "2",
+          "RateLimit-Remaining": "598",
+          "RateLimit-Reset": "1566854062",
+          "RateLimit-ResetTime": "Mon, 26 Aug 2019 21:14:22 GMT",
+          "Referrer-Policy": "strict-origin-when-cross-origin",
           "Server": "nginx",
+          "Strict-Transport-Security": "max-age=31536000",
           "Vary": "Origin",
-          "X-Request-Id": "0d16804f-e0d9-4841-9beb-285fd7c9817a",
-          "X-Runtime": "0.038217"
+          "X-Content-Type-Options": "nosniff",
+          "X-Frame-Options": "SAMEORIGIN",
+          "X-Request-Id": "xyVUzGHFt47",
+          "X-Runtime": "0.026212"
         },
         "status": {
           "code": 200,
           "message": "OK"
         },
-        "url": "https://gitlab.com/api/v3/user"
+        "url": "https://gitlab.com/api/v4/user"
       }
     },
     {
-      "recorded_at": "2016-10-15T20:46:52",
+      "recorded_at": "2019-08-26T21:13:22",
       "request": {
         "body": {
           "encoding": "utf-8",
@@ -51,60 +61,70 @@
           "Accept": "*/*",
           "Accept-Encoding": "identity",
           "Connection": "keep-alive",
+          "Content-type": "application/json",
           "PRIVATE-TOKEN": "<PRIVATE_KEY_GITLAB>",
-          "User-Agent": "python-requests/2.10.0"
+          "User-Agent": "python-requests/2.22.0"
         },
         "method": "GET",
-        "uri": "https://gitlab.com/api/v3/groups?search=<GITLAB_NAMESPACE>"
+        "uri": "https://gitlab.com/api/v4/groups?search=<GITLAB_NAMESPACE>"
       },
       "response": {
         "body": {
           "encoding": null,
-          "string": "[]"
+          "string": "[{\"id\":938543,\"web_url\":\"https://gitlab.com/groups/<GITLAB_NAMESPACE>\",\"name\":\"<GITLAB_NAMESPACE>\",\"path\":\"<GITLAB_NAMESPACE>\",\"description\":\"\",\"visibility\":\"public\",\"lfs_enabled\":true,\"avatar_url\":null,\"request_access_enabled\":true,\"full_name\":\"<GITLAB_NAMESPACE>\",\"full_path\":\"<GITLAB_NAMESPACE>\",\"parent_id\":null,\"ldap_cn\":null,\"ldap_access\":null}]"
         },
         "headers": {
           "Cache-Control": "max-age=0, private, must-revalidate",
-          "Content-Length": "2",
+          "Content-Length": "326",
           "Content-Type": "application/json",
-          "Date": "Sat, 15 Oct 2016 20:46:52 GMT",
-          "Etag": "W/\"d751713988987e9331980363e24189ce\"",
-          "Link": "<https://gitlab.com/api/v3/groups?page=1&per_page=20&search=<GITLAB_NAMESPACE>>; rel=\"first\", <https://gitlab.com/api/v3/groups?page=0&per_page=20&search=<GITLAB_NAMESPACE>>; rel=\"last\"",
+          "Date": "Mon, 26 Aug 2019 21:13:22 GMT",
+          "Etag": "W/\"b808f34f76127c9de5593aaed1627c7c\"",
+          "Link": "<https://gitlab.com/api/v4/groups?order_by=name&owned=false&page=1&per_page=20&search=<GITLAB_NAMESPACE>&sort=asc&statistics=false&with_custom_attributes=false>; rel=\"first\", <https://gitlab.com/api/v4/groups?order_by=name&owned=false&page=1&per_page=20&search=<GITLAB_NAMESPACE>&sort=asc&statistics=false&with_custom_attributes=false>; rel=\"last\"",
+          "RateLimit-Limit": "600",
+          "RateLimit-Observed": "3",
+          "RateLimit-Remaining": "597",
+          "RateLimit-Reset": "1566854062",
+          "RateLimit-ResetTime": "Mon, 26 Aug 2019 21:14:22 GMT",
+          "Referrer-Policy": "strict-origin-when-cross-origin",
           "Server": "nginx",
+          "Strict-Transport-Security": "max-age=31536000",
           "Vary": "Origin",
+          "X-Content-Type-Options": "nosniff",
+          "X-Frame-Options": "SAMEORIGIN",
           "X-Next-Page": "",
           "X-Page": "1",
           "X-Per-Page": "20",
           "X-Prev-Page": "",
-          "X-Request-Id": "b03eada5-dde3-47d7-973a-880905f9965b",
-          "X-Runtime": "0.024603",
-          "X-Total": "0",
-          "X-Total-Pages": "0"
+          "X-Request-Id": "mvsifxECVP7",
+          "X-Runtime": "0.050724",
+          "X-Total": "1",
+          "X-Total-Pages": "1"
         },
         "status": {
           "code": 200,
           "message": "OK"
         },
-        "url": "https://gitlab.com/api/v3/groups?search=<GITLAB_NAMESPACE>"
+        "url": "https://gitlab.com/api/v4/groups?search=<GITLAB_NAMESPACE>"
       }
     },
     {
-      "recorded_at": "2016-10-15T20:46:52",
+      "recorded_at": "2019-08-26T21:13:22",
       "request": {
         "body": {
           "encoding": "utf-8",
-          "string": "{\"name\": \"git-repo\"}"
+          "string": "{\"name\": \"git-repo\", \"namespace_id\": 938543}"
         },
         "headers": {
           "Accept": "*/*",
           "Accept-Encoding": "identity",
           "Connection": "keep-alive",
-          "Content-Length": "20",
+          "Content-Length": "44",
           "Content-type": "application/json",
           "PRIVATE-TOKEN": "<PRIVATE_KEY_GITLAB>",
-          "User-Agent": "python-requests/2.10.0"
+          "User-Agent": "python-requests/2.22.0"
         },
         "method": "POST",
-        "uri": "https://gitlab.com/api/v3/projects"
+        "uri": "https://gitlab.com/api/v4/projects"
       },
       "response": {
         "body": {
@@ -115,17 +135,24 @@
           "Cache-Control": "no-cache",
           "Content-Length": "100",
           "Content-Type": "application/json",
-          "Date": "Sat, 15 Oct 2016 20:46:52 GMT",
+          "Date": "Mon, 26 Aug 2019 21:13:22 GMT",
+          "RateLimit-Limit": "600",
+          "RateLimit-Observed": "4",
+          "RateLimit-Remaining": "596",
+          "RateLimit-Reset": "1566854062",
+          "RateLimit-ResetTime": "Mon, 26 Aug 2019 21:14:22 GMT",
           "Server": "nginx",
           "Vary": "Origin",
-          "X-Request-Id": "30d60bc8-de0c-45fa-abc5-b8547bdbe283",
-          "X-Runtime": "0.069274"
+          "X-Content-Type-Options": "nosniff",
+          "X-Frame-Options": "SAMEORIGIN",
+          "X-Request-Id": "skz73zlMLW4",
+          "X-Runtime": "0.182593"
         },
         "status": {
           "code": 400,
           "message": "Bad Request"
         },
-        "url": "https://gitlab.com/api/v3/projects"
+        "url": "https://gitlab.com/api/v4/projects"
       }
     }
   ],