peoplegroup-connectors 0.1.21 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7c2cd36966b5ee976f81e53150257aecb72cf423ca7b45ea90e0a24ec45e2e8
-  data.tar.gz: 4dae4fecfd2e942bfd39775e3f32fb1875e9f4b4a6e107148ccac9c047e48c31
+  metadata.gz: c51711afa3c65e5a9c502191e2be499379f23874fcd9dc2474e47c4cbb9d05f0
+  data.tar.gz: e25cfbb760e93545fd6d45bd623cf56353405172bd068bbda26446e9986b89db
 SHA512:
-  metadata.gz: d637c670afa1999c55401d0bba8ba93000a8ee93c5402ac29e4486541206bd26ab1a6c42afb9d2c5ae44b6e820874ea01d839bf5336c61ee40dd18cb5a7b00b8
-  data.tar.gz: bf02e6c981836a92dbf937251b85c6ece2b39942be0495c8293452d3e5241a616140ed855bdc5185ca8bbf1667fb524822e04a207cbbbbfeceef6a5d8ffb0eb1
+  metadata.gz: a884ff041804f3fa6036d600f5b5ea23eb9ef93c962c1593eb8402b0815605af3888f5e5102eefeda630da7a4e6f9a18dd0a77f4f9db6c33286a1af6b99529d5
+  data.tar.gz: 585534f1e50e37783be491281aeeeb6cfcc3cc7498889d83ca0e8a511ab0968c516146b2608fae2d71d6b72d6917e3f607d0138a8995bcd66fc14256aa3a4230

data/lib/peoplegroup/connectors/bamboo.rb

@@ -98,6 +98,10 @@ module PeopleGroup
         @client.employee.table_data(employee_id, 'customEquity')
       end
 
+      def add_job_details(employee_id, data)
+        @client.employee.add_table_row(employee_id, 'jobInfo', data)
+      end
+
       def update_job_details(employee_id, data)
         current_data = job_details(employee_id) # it should only be one row as we just created this user
         row_id = current_data.first.dig('id')

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/slack.rb

@@ -33,8 +33,8 @@ module PeopleGroup
         @client.chat_getPermalink(channel: channel, message_ts: timestamp)
       end
 
-      def send_message(channel:, text:, as_user: true, attachments: [], thread_ts: nil, reply_broadcast: false)
-        @client.chat_postMessage(channel: channel, text: text, as_user: true, attachments: attachments, unfurl_links: false, thread_ts: thread_ts, reply_broadcast: reply_broadcast)
+      def send_message(channel:, text: '', as_user: true, attachments: [], thread_ts: nil, reply_broadcast: false, formatted_message: [])
+        @client.chat_postMessage(channel: channel, text: text, as_user: true, attachments: attachments, unfurl_links: false, thread_ts: thread_ts, reply_broadcast: reply_broadcast, blocks: formatted_message)
       end
 
       def update_message(channel:, timestamp:, text:, attachments: [])

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.21'
+    VERSION = '0.1.28'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peoplegroup-connectors
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.28
 platform: ruby
 authors:
 - lien van den steen
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -173,7 +173,7 @@ metadata:
   homepage_uri: https://gitlab.com/gitlab-com/people-group/peopleops-eng/connectors-gem
   source_code_uri: https://gitlab.com/gitlab-com/people-group/peopleops-eng/connectors-gem
   changelog_uri: https://gitlab.com/gitlab-com/people-group/peopleops-eng/connectors-gem
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Library for our shared connectors.
 test_files: []