peoplegroup-connectors 0.1.25 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b82bb7402d7a7f77279b5c9e93003b6731a090005a23f352eef0e3e78c40e6e7
-  data.tar.gz: b9cef9752cd98dfbd93895077bf9bb0d5458c2a7381ba8c3c9c7340163658f62
+  metadata.gz: f994474d203d3b0378a04c12102c9be7c1f5f4348e7f9c3cea3c21102dceb75a
+  data.tar.gz: 033f8fcc352ef7fa070ca38794ec60426862863808506536a9f543fd34a819cb
 SHA512:
-  metadata.gz: 7922255e4f0c772de67e426e2ff30612e84fe9b6885b7c0e772e3abc2b89c8f427c4686a4da4b21c9f743edb71725d6a60a059f57ddf552f1c5b087c844a0d75
-  data.tar.gz: 6938b46769b98422d3d9c8fd815d0160e3ab0994b8677dbe4f2b03684aa123491457a6971ecbe6bafefccbda6bfb48b4015006dbd472508f37ce5b40557d10a0
+  metadata.gz: 4fac233e33783e75022e6d453e01ae27f550d1f66203378830e3eaa592cc3427a81a922cf9211e367905d3fa9ea7a51000f46576c4dbd0543adea8412f826df0
+  data.tar.gz: 7e79bb3ec0832fafc01cbc5aaa4e2a362e51d8a7367fcd4bceb8ba19dff59ed11bb665c48ca54069b76176e9b90446172366436650d234d4292c0e5fde4f87a8

data/lib/peoplegroup/connectors/gitlab.rb

@@ -5,6 +5,10 @@ require 'gitlab'
 module PeopleGroup
   module Connectors
     class GitLab
+      attr_accessor :client
+
+      MAX_RETRIES = 3
+
       API_URL = ENV['GITLAB_API_V4_URL'] || 'https://gitlab.com/api/v4'
 
       def initialize(token: ENV['GITLAB_API_TOKEN'])
@@ -14,7 +18,18 @@ module PeopleGroup
       def find_gitlabber(field, query)
         return if !query || query.empty?
 
-        possible_members = @client.group_members('gitlab-com', query: query)
+        possible_members = retry_on_error { @client.group_members('gitlab-com', query: query) }
+        if field === :email
+          possible_members.first
+        else
+          possible_members.find { |team_member| team_member.public_send(field) === query }
+        end
+      end
+
+      def find_gitlabber_on(field, query, group)
+        return if !query || query.empty?
+
+        possible_members = retry_on_error { @client.group_members(group, query: query) }
         if field === :email
           possible_members.first
         else
@@ -22,31 +37,37 @@ module PeopleGroup
         end
       end
 
+      def remove_group_member(group, user_id)
+        retry_on_error { @client.remove_group_member(group, user_id) }
+      end
+
       def create_issue(project, title, options = {})
-        @client.create_issue(project, title, options)
+        retry_on_error do
+          @client.create_issue(project, title, options)
+        end
       end
 
       def create_issue_note(project, id, text)
-        @client.create_issue_note(project, id, text)
+        retry_on_error { @client.create_issue_note(project, id, text) }
       end
 
       def get_onboarding_issues(project, args)
-        @client.issues(project, args).auto_paginate
+        retry_on_error { @client.issues(project, args).auto_paginate }
       end
 
       def get_issues(project, args)
-        @client.issues(project, args).auto_paginate
+        retry_on_error { @client.issues(project, args).auto_paginate }
       end
 
       def find_or_create_epic(group_id, title, options = {})
         epic = find_epic(group_id, title)
         reopen_epic(epic) if epic && epic.state == 'closed'
         options[:confidential] = true
-        epic || @client.create_epic(group_id, title, options)
+        epic || retry_on_error { @client.create_epic(group_id, title, options) }
       end
 
       def commit_new_files_to_new_merge_request(project_id, branch_name, new_files, commit_message, description = nil)
-        @client.create_branch(project_id, branch_name, 'master')
+        retry_on_error { @client.create_branch(project_id, branch_name, 'master') }
         actions = []
         new_files.each do |file|
           actions << {
@@ -56,11 +77,11 @@ module PeopleGroup
           }
         end
 
-        @client.create_commit(project_id, branch_name, commit_message, actions)
+        retry_on_error { @client.create_commit(project_id, branch_name, commit_message, actions) }
 
         options = { source_branch: branch_name, target_branch: 'master', remove_source_branch: true }
         options[:description] = description if description
-        @client.create_merge_request(project_id, commit_message, options)
+        retry_on_error { @client.create_merge_request(project_id, commit_message, options) }
       end
 
       def commit_change_to_new_merge_request_v2(project_id, branch_name, commit_message, description = nil, files_to_delete = [], files_to_update = [])
@@ -85,16 +106,16 @@ module PeopleGroup
 
         return unless actions.any?
 
-        @client.create_branch(project_id, branch_name, 'master')
-        @client.create_commit(project_id, branch_name, commit_message, actions)
+        retry_on_error { @client.create_branch(project_id, branch_name, 'master') }
+        retry_on_error { @client.create_commit(project_id, branch_name, commit_message, actions) }
 
         options = { source_branch: branch_name, target_branch: 'master', remove_source_branch: true }
         options[:description] = description if description
-        @client.create_merge_request(project_id, commit_message, options)
+        retry_on_error { @client.create_merge_request(project_id, commit_message, options) }
       end
 
       def commit_change_to_new_merge_request(project_id, branch_name, file_path, file_with_change, commit_message, description = nil)
-        @client.create_branch(project_id, branch_name, 'master')
+        retry_on_error { @client.create_branch(project_id, branch_name, 'master') }
         actions = [
           {
             action: 'update',
@@ -102,49 +123,59 @@ module PeopleGroup
             content: file_with_change
           }
         ]
-        @client.create_commit(project_id, branch_name, commit_message, actions)
+        retry_on_error { @client.create_commit(project_id, branch_name, commit_message, actions) }
 
         options = { source_branch: branch_name, target_branch: 'master', remove_source_branch: true }
         options[:description] = description if description
-        @client.create_merge_request(project_id, commit_message, options)
+        retry_on_error { @client.create_merge_request(project_id, commit_message, options) }
       end
 
       def create_epic_note(group_id, epic_id, text)
-        @client.create_epic_note(group_id, epic_id, text)
+        retry_on_error { @client.create_epic_note(group_id, epic_id, text) }
       end
 
       def get_epics(group_id, options = {})
-        @client.epics(group_id, options).auto_paginate
+        retry_on_error { @client.epics(group_id, options).auto_paginate }
       end
 
       def get_issue_epics(group_id, epic_iid)
-        @client.epic_issues(group_id, epic_iid)
+        retry_on_error { @client.epic_issues(group_id, epic_iid) }
       end
 
       private
 
+      def retry_on_error
+        retries = 0
+
+        begin
+          yield
+        rescue Gitlab::Error::InternalServerError
+          retry if (retries += 1) < MAX_RETRIES
+        end
+      end
+
       def find_epic(group_id, title)
         args = {
           search: title
         }
-        epics = @client.epics(group_id, args).auto_paginate
+        epics = retry_on_error { @client.epics(group_id, args).auto_paginate }
         epics.first
       end
 
       def create_branch(project_id, branch_name)
-        @client.create_branch(project_id, branch_name, 'master')
+        retry_on_error { @client.create_branch(project_id, branch_name, 'master') }
       end
 
       def create_merge_request(project_id, title, options = {})
-        @client.create_merge_request(project_id, title, options)
+        retry_on_error { @client.create_merge_request(project_id, title, options) }
       end
 
       def create_commit(project_id, branch, commit_message, actions)
-        @client.create_commit(project_id, branch, commit_message, actions, {})
+        retry_on_error { @client.create_commit(project_id, branch, commit_message, actions, {}) }
       end
 
       def reopen_epic(epic)
-        @client.edit_epic(epic.group_id, epic.iid, { state_event: 'reopen' })
+        retry_on_error { @client.edit_epic(epic.group_id, epic.iid, { state_event: 'reopen' }) }
       end
     end
   end

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.25'
+    VERSION = '0.1.30'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peoplegroup-connectors
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.30
 platform: ruby
 authors:
 - lien van den steen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab