Merge branch 'mmj-remove-some-inline-jobs' into 'master'

Enqueue async, non-blocking project authorization refresh jobs for group-group share actions

See merge request gitlab-org/gitlab!66349

app/services/groups/group_links/create_service.rb

@@ -24,7 +24,7 @@ module Groups
         )
 
         if link.save
-          shared_with_group.refresh_members_authorized_projects(direct_members_only: true)
+          shared_with_group.refresh_members_authorized_projects(blocking: false, direct_members_only: true)
           success(link: link)
         else
           error(link.errors.full_messages.to_sentence, 409)

app/services/groups/group_links/destroy_service.rb

@@ -16,7 +16,7 @@ module Groups
 
           groups_to_refresh = links.map(&:shared_with_group)
           groups_to_refresh.uniq.each do |group|
-            group.refresh_members_authorized_projects(direct_members_only: true)
+            group.refresh_members_authorized_projects(blocking: false, direct_members_only: true)
           end
         else
           Gitlab::AppLogger.info(

app/services/groups/group_links/update_service.rb

@@ -13,7 +13,7 @@ module Groups
         group_link.update!(group_link_params)
 
         if requires_authorization_refresh?(group_link_params)
-          group_link.shared_with_group.refresh_members_authorized_projects(direct_members_only: true)
+          group_link.shared_with_group.refresh_members_authorized_projects(blocking: false, direct_members_only: true)
         end
       end
 

spec/controllers/groups/group_links_controller_spec.rb

@@ -88,7 +88,7 @@ RSpec.describe Groups::GroupLinksController do
         end
       end
 
-      it 'updates project permissions' do
+      it 'updates project permissions', :sidekiq_inline do
         expect { subject }.to change { group_member.can?(:read_project, project) }.from(false).to(true)
       end
 
@@ -207,7 +207,7 @@ RSpec.describe Groups::GroupLinksController do
         end
       end
 
-      it 'updates project permissions' do
+      it 'updates project permissions', :sidekiq_inline do
         expect { subject }.to change { group_member.can?(:create_release, project) }.from(true).to(false)
       end
     end
@@ -244,7 +244,7 @@ RSpec.describe Groups::GroupLinksController do
         expect { subject }.to change(GroupGroupLink, :count).by(-1)
       end
 
-      it 'updates project permissions' do
+      it 'updates project permissions', :sidekiq_inline do
         expect { subject }.to change { group_member.can?(:create_release, project) }.from(true).to(false)
       end
     end

spec/services/groups/group_links/destroy_service_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe Groups::GroupLinks::DestroyService, '#execute' do
       expect { subject.execute(link) }.to change { shared_group.shared_with_group_links.count }.from(1).to(0)
     end
 
-    it 'revokes project authorization' do
+    it 'revokes project authorization', :sidekiq_inline do
       group.add_developer(user)
 
       expect { subject.execute(link) }.to(
@@ -47,8 +47,8 @@ RSpec.describe Groups::GroupLinks::DestroyService, '#execute' do
 
     it 'updates project authorization once per group' do
       expect(GroupGroupLink).to receive(:delete).and_call_original
-      expect(group).to receive(:refresh_members_authorized_projects).with(direct_members_only: true).once
-      expect(another_group).to receive(:refresh_members_authorized_projects).with(direct_members_only: true).once
+      expect(group).to receive(:refresh_members_authorized_projects).with(direct_members_only: true, blocking: false).once
+      expect(another_group).to receive(:refresh_members_authorized_projects).with(direct_members_only: true, blocking: false).once
 
       subject.execute(links)
     end

spec/services/groups/group_links/update_service_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Groups::GroupLinks::UpdateService, '#execute' do
     expect(link.expires_at).to eq(expiry_date)
   end
 
-  it 'updates project permissions' do
+  it 'updates project permissions', :sidekiq_inline do
     expect { subject }.to change { group_member_user.can?(:create_release, project) }.from(true).to(false)
   end
 

spec/workers/remove_expired_group_links_worker_spec.rb

@@ -51,7 +51,7 @@ RSpec.describe RemoveExpiredGroupLinksWorker do
           subject.perform
         end
 
-        it 'removes project authorization' do
+        it 'removes project authorization', :sidekiq_inline do
           shared_group = group_group_link.shared_group
           shared_with_group = group_group_link.shared_with_group
           project = create(:project, group: shared_group)