Add cr remarks

Add cr remarks

Add cr remarks

Add workers data

Add cr remarks

app/services/groups/update_service.rb

@@ -99,11 +99,12 @@ module Groups
 
     def update_two_factor_requirement_for_subgroups
       settings = group.namespace_settings
-      return if settings.allow_mfa_for_subgroups
 
+      return if settings.allow_mfa_for_subgroups
+      binding.pry
       if settings.previous_changes.include?(:allow_mfa_for_subgroups)
         # enque in batches members update
-        DisallowTwoFaWorker.perform_async(group.id)
+        DisallowTwoFactorForSubgroupsWorker.perform_async(group.id)
       end
     end
 
@@ -129,7 +130,7 @@ module Groups
     end
 
     def allowed_settings_params
-      @allowed_settings_params ||= SETTINGS_PARAMS
+      SETTINGS_PARAMS
     end
 
     def valid_share_with_group_lock_change?

app/workers/all_queues.yml

@@ -1393,21 +1393,21 @@
   :weight: 1
   :idempotent:
   :tags: []
-- :name: disallow_two_fa
+- :name: disallow_two_factor_for_group
   :feature_category: :subgroups
   :has_external_dependencies:
   :urgency: :low
   :resource_boundary: :unknown
   :weight: 1
-  :idempotent:
+  :idempotent: true
   :tags: []
-- :name: disallow_two_fa_for_subgroups
+- :name: disallow_two_factor_for_subgroups
   :feature_category: :subgroups
   :has_external_dependencies:
   :urgency: :low
   :resource_boundary: :unknown
   :weight: 1
-  :idempotent:
+  :idempotent: true
   :tags: []
 - :name: email_receiver
   :feature_category: :issue_tracking

app/workers/disallow_two_fa_for_subgroups_worker.rb → app/workers/disallow_two_factor_for_group_worker.rb

 # frozen_string_literal: true
 
-class DisallowTwoFaForSubgroupsWorker # rubocop:disable Scalability/IdempotentWorker
+class DisallowTwoFactorForGroupWorker
   include ApplicationWorker
   include ExceptionBacktrace
 
   feature_category :subgroups
+  idempotent!
 
   def perform(group_id)
     begin

app/workers/disallow_two_fa_worker.rb → app/workers/disallow_two_factor_for_subgroups_worker.rb

 # frozen_string_literal: true
 
-class DisallowTwoFaWorker # rubocop:disable Scalability/IdempotentWorker
+class DisallowTwoFactorForSubgroupsWorker
   include ApplicationWorker
   include ExceptionBacktrace
 
   INTERVAL = 2.seconds.to_i
 
   feature_category :subgroups
+  idempotent!
 
   def perform(group_id)
     begin
@@ -21,7 +22,7 @@ class DisallowTwoFaWorker # rubocop:disable Scalability/IdempotentWorker
       delay = index * INTERVAL
 
       with_context(namespace: subgroup) do
-        DisallowTwoFaForSubgroupsWorker.perform_in(delay, subgroup.id)
+        DisallowTwoFactorForGroupWorker.perform_in(delay, subgroup.id)
       end
     end
     # rubocop: enable CodeReuse/ActiveRecord

config/sidekiq_queues.yml

@@ -84,9 +84,9 @@
   - 1
 - - detect_repository_languages
   - 1
-- - disallow_two_fa
+- - disallow_two_factor_for_group
   - 1
-- - disallow_two_fa_for_subgroups
+- - disallow_two_factor_for_subgroups
   - 1
 - - elastic_commit_indexer
   - 1

ee/app/services/ee/groups/update_service.rb

@@ -116,7 +116,7 @@ module EE
 
       override :allowed_settings_params
       def allowed_settings_params
-        @allowed_settings_params ||= ::Groups::UpdateService::SETTINGS_PARAMS + EE_SETTINGS_PARAMS
+        @allowed_settings_params ||= super + EE_SETTINGS_PARAMS
       end
 
       def log_audit_event

spec/services/groups/update_service_spec.rb

@@ -321,7 +321,7 @@ RSpec.describe Groups::UpdateService do
     end
 
     it 'enqueues update subgroups and its members' do
-      expect(DisallowTwoFaWorker).to receive(:perform_async).with(group.id)
+      expect(DisallowTwoFactorForSubgroupsWorker).to receive(:perform_async).with(group.id)
 
       subject
     end

spec/workers/disallow_two_fa_for_subgroups_worker_spec.rb → spec/workers/disallow_two_factor_for_group_worker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe DisallowTwoFaForSubgroupsWorker do
+RSpec.describe DisallowTwoFactorForGroupWorker do
   let_it_be(:group) { create(:group, require_two_factor_authentication: true) }
   let_it_be(:user) { create(:user, require_two_factor_authentication_from_group: true) }
 

spec/workers/disallow_two_fa_worker_spec.rb → spec/workers/disallow_two_factor_for_subgroups_worker_spec.rb

@@ -2,15 +2,15 @@
 
 require 'spec_helper'
 
-RSpec.describe DisallowTwoFaWorker do
+RSpec.describe DisallowTwoFactorForSubgroupsWorker do
   let_it_be(:group) { create(:group) }
   let_it_be(:subgroup_with_2fa) { create(:group, parent: group, require_two_factor_authentication: true) }
   let_it_be(:subgroup_without_2fa) { create(:group, parent: group, require_two_factor_authentication: false) }
   let_it_be(:subsubgroup_with_2fa) { create(:group, parent: subgroup_with_2fa, require_two_factor_authentication: true) }
 
   it "schedules updating subgroups" do
-    expect(DisallowTwoFaForSubgroupsWorker).to receive(:perform_in).with(0, subgroup_with_2fa.id)
-    expect(DisallowTwoFaForSubgroupsWorker).to receive(:perform_in).with(2, subsubgroup_with_2fa.id)
+    expect(DisallowTwoFactorForGroupWorker).to receive(:perform_in).with(0, subgroup_with_2fa.id)
+    expect(DisallowTwoFactorForGroupWorker).to receive(:perform_in).with(2, subsubgroup_with_2fa.id)
 
     described_class.new.perform(group.id)
   end