From c10eac33abd1b8ff5f296b200bec852e5714dac2 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 11 Jul 2022 15:08:34 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../javascripts/integrations/constants.js     |  8 ++++++
 .../edit/components/trigger_fields.vue        | 12 +--------
 app/workers/authorized_projects_worker.rb     | 11 --------
 app/workers/concerns/waitable_worker.rb       | 22 ++--------------
 ...nc_only_project_authorizations_refresh.yml |  8 ------
 spec/workers/concerns/waitable_worker_spec.rb | 25 ++-----------------
 6 files changed, 13 insertions(+), 73 deletions(-)
 delete mode 100644 config/feature_flags/development/async_only_project_authorizations_refresh.yml

diff --git a/app/assets/javascripts/integrations/constants.js b/app/assets/javascripts/integrations/constants.js
index 1973a3c91ef..437bcc39886 100644
--- a/app/assets/javascripts/integrations/constants.js
+++ b/app/assets/javascripts/integrations/constants.js
@@ -83,3 +83,11 @@ export const billingPlanNames = {
   [billingPlans.PREMIUM]: s__('BillingPlans|Premium'),
   [billingPlans.ULTIMATE]: s__('BillingPlans|Ultimate'),
 };
+
+const INTEGRATION_TYPE_SLACK = 'slack';
+const INTEGRATION_TYPE_MATTERMOST = 'mattermost';
+
+export const placeholderForType = {
+  [INTEGRATION_TYPE_SLACK]: __('#general, #development'),
+  [INTEGRATION_TYPE_MATTERMOST]: __('my-channel'),
+};
diff --git a/app/assets/javascripts/integrations/edit/components/trigger_fields.vue b/app/assets/javascripts/integrations/edit/components/trigger_fields.vue
index 92042a5c981..67647cadf19 100644
--- a/app/assets/javascripts/integrations/edit/components/trigger_fields.vue
+++ b/app/assets/javascripts/integrations/edit/components/trigger_fields.vue
@@ -1,17 +1,7 @@
 <script>
 import { GlFormGroup, GlFormCheckbox, GlFormInput } from '@gitlab/ui';
 import { mapGetters } from 'vuex';
-import { __ } from '~/locale';
-
-const typeWithPlaceholder = {
-  SLACK: 'slack',
-  MATTERMOST: 'mattermost',
-};
-
-const placeholderForType = {
-  [typeWithPlaceholder.SLACK]: __('#general, #development'),
-  [typeWithPlaceholder.MATTERMOST]: __('my-channel'),
-};
+import { placeholderForType } from 'jh_else_ce/integrations/constants';
 
 export default {
   name: 'TriggerFields',
diff --git a/app/workers/authorized_projects_worker.rb b/app/workers/authorized_projects_worker.rb
index afe14369d43..4312ba41367 100644
--- a/app/workers/authorized_projects_worker.rb
+++ b/app/workers/authorized_projects_worker.rb
@@ -14,17 +14,6 @@ class AuthorizedProjectsWorker
   idempotent!
   loggable_arguments 1 # For the job waiter key
 
-  # This is a workaround for a Ruby 2.3.7 bug. rspec-mocks cannot restore the
-  # visibility of prepended modules. See https://github.com/rspec/rspec-mocks/issues/1231
-  # for more details.
-  if Rails.env.test?
-    def self.bulk_perform_and_wait(args_list, timeout: 10)
-    end
-
-    def self.bulk_perform_inline(args_list)
-    end
-  end
-
   def perform(user_id)
     user = User.find_by_id(user_id)
 
diff --git a/app/workers/concerns/waitable_worker.rb b/app/workers/concerns/waitable_worker.rb
index 3a38b2d8c04..a69028e2a2c 100644
--- a/app/workers/concerns/waitable_worker.rb
+++ b/app/workers/concerns/waitable_worker.rb
@@ -5,27 +5,13 @@ module WaitableWorker
 
   class_methods do
     # Schedules multiple jobs and waits for them to be completed.
-    def bulk_perform_and_wait(args_list, timeout: 10)
+    def bulk_perform_and_wait(args_list)
       # Short-circuit: it's more efficient to do small numbers of jobs inline
       if args_list.size == 1 || (args_list.size <= 3 && !inline_refresh_only_for_single_element?)
         return bulk_perform_inline(args_list)
       end
 
-      # Don't wait if there's too many jobs to be waited for. Not including the
-      # waiter allows them to be deduplicated and it skips waiting for jobs that
-      # are not likely to finish within the timeout. This assumes we can process
-      # 10 jobs per second:
-      # https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/205
-      return bulk_perform_async(args_list) if (args_list.length >= 10 * timeout) || async_only_refresh?
-
-      waiter = Gitlab::JobWaiter.new(args_list.size, worker_label: self.to_s)
-
-      # Point all the bulk jobs at the same JobWaiter. Converts, [[1], [2], [3]]
-      # into [[1, "key"], [2, "key"], [3, "key"]]
-      waiting_args_list = args_list.map { |args| [*args, waiter.key] }
-      bulk_perform_async(waiting_args_list)
-
-      waiter.wait(timeout)
+      bulk_perform_async(args_list)
     end
 
     # Performs multiple jobs directly. Failed jobs will be put into sidekiq so
@@ -44,10 +30,6 @@ module WaitableWorker
       bulk_perform_async(failed) if failed.present?
     end
 
-    def async_only_refresh?
-      Feature.enabled?(:async_only_project_authorizations_refresh)
-    end
-
     def inline_refresh_only_for_single_element?
       Feature.enabled?(:inline_project_authorizations_refresh_only_for_single_element)
     end
diff --git a/config/feature_flags/development/async_only_project_authorizations_refresh.yml b/config/feature_flags/development/async_only_project_authorizations_refresh.yml
deleted file mode 100644
index 4facaf5f84a..00000000000
--- a/config/feature_flags/development/async_only_project_authorizations_refresh.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: async_only_project_authorizations_refresh
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90495
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365585
-milestone: '15.2'
-type: development
-group: group::workspace
-default_enabled: false
diff --git a/spec/workers/concerns/waitable_worker_spec.rb b/spec/workers/concerns/waitable_worker_spec.rb
index 8cc12b0cb30..1c23c4e3758 100644
--- a/spec/workers/concerns/waitable_worker_spec.rb
+++ b/spec/workers/concerns/waitable_worker_spec.rb
@@ -76,33 +76,12 @@ RSpec.describe WaitableWorker do
     end
 
     context '>= 4 jobs' do
-      it 'runs jobs using sidekiq and no waiter key' do
+      it 'runs jobs using sidekiq' do
         arguments = 1.upto(5).map { |i| [i] }
 
         expect(worker).to receive(:bulk_perform_async).with(arguments)
 
-        worker.bulk_perform_and_wait(arguments, timeout: 2)
-      end
-
-      it 'runs > 10 * timeout jobs using sidekiq and no waiter key' do
-        arguments = 1.upto(21).map { |i| [i] }
-
-        expect(worker).to receive(:bulk_perform_async).with(arguments)
-
-        worker.bulk_perform_and_wait(arguments, timeout: 2)
-      end
-
-      context 'when the feature flag `async_only_project_authorizations_refresh` is turned off' do
-        before do
-          stub_feature_flags(async_only_project_authorizations_refresh: false)
-        end
-
-        it 'runs > 3 jobs using sidekiq and a waiter key' do
-          expect(worker).to receive(:bulk_perform_async)
-                              .with([[1, anything], [2, anything], [3, anything], [4, anything]])
-
-          worker.bulk_perform_and_wait([[1], [2], [3], [4]])
-        end
+        worker.bulk_perform_and_wait(arguments)
       end
     end
   end