Merge branch 'sh-fix-plugins-not-executing' into 'master'

Fix GitLab plugins not working without hooks configured

Closes #194131

See merge request gitlab-org/gitlab!22409

app/models/project.rb

@@ -1318,7 +1318,7 @@ class Project < ApplicationRecord
   end
 
   def has_active_hooks?(hooks_scope = :push_hooks)
-    hooks.hooks_for(hooks_scope).any? || SystemHook.hooks_for(hooks_scope).any?
+    hooks.hooks_for(hooks_scope).any? || SystemHook.hooks_for(hooks_scope).any? || Gitlab::Plugin.any?
   end
 
   def has_active_services?(hooks_scope = :push_hooks)

changelogs/unreleased/sh-fix-plugins-not-executing.yml

+---
+title: Fix GitLab plugins not working without hooks configured
+merge_request: 22409
+author:
+type: fixed

lib/gitlab/plugin.rb

@@ -2,10 +2,16 @@
 
 module Gitlab
   module Plugin
+    def self.any?
+      plugin_glob.any? { |entry| File.file?(entry) }
+    end
+
     def self.files
-      Dir.glob(Rails.root.join('plugins/*')).select do |entry|
-        File.file?(entry)
+      plugin_glob.select { |entry| File.file?(entry) }
     end
+
+    def self.plugin_glob
+      Dir.glob(Rails.root.join('plugins/*'))
     end
 
     def self.execute_all_async(data)

spec/lib/gitlab/plugin_spec.rb

@@ -3,13 +3,8 @@
 require 'spec_helper'
 
 describe Gitlab::Plugin do
-  describe '.execute' do
-    let(:data) { Gitlab::DataBuilder::Push::SAMPLE_DATA }
   let(:plugin) { Rails.root.join('plugins', 'test.rb') }
   let(:tmp_file) { Tempfile.new('plugin-dump') }
-    let(:result) { described_class.execute(plugin.to_s, data) }
-    let(:success) { result.first }
-    let(:message) { result.last }
 
   let(:plugin_source) do
     <<~EOS
@@ -19,6 +14,48 @@ describe Gitlab::Plugin do
     EOS
   end
 
+  context 'with plugins present' do
+    before do
+      File.write(plugin, plugin_source)
+    end
+
+    after do
+      FileUtils.rm(plugin)
+    end
+
+    describe '.any?' do
+      it 'returns true' do
+        expect(described_class.any?).to be true
+      end
+    end
+
+    describe '.files?' do
+      it 'returns a list of plugins' do
+        expect(described_class.files).to match_array([plugin.to_s])
+      end
+    end
+  end
+
+  context 'without any plugins' do
+    describe '.any?' do
+      it 'returns false' do
+        expect(described_class.any?).to be false
+      end
+    end
+
+    describe '.files' do
+      it 'returns an empty list' do
+        expect(described_class.files).to be_empty
+      end
+    end
+  end
+
+  describe '.execute' do
+    let(:data) { Gitlab::DataBuilder::Push::SAMPLE_DATA }
+    let(:result) { described_class.execute(plugin.to_s, data) }
+    let(:success) { result.first }
+    let(:message) { result.last }
+
     before do
       File.write(plugin, plugin_source)
     end

spec/models/project_spec.rb

@@ -4721,6 +4721,13 @@ describe Project do
       expect(project.has_active_hooks?(:merge_request_events)).to be_falsey
       expect(project.has_active_hooks?).to be_truthy
     end
+
+    it 'returns true when a plugin exists' do
+      expect(Gitlab::Plugin).to receive(:any?).twice.and_return(true)
+
+      expect(project.has_active_hooks?(:merge_request_events)).to be_truthy
+      expect(project.has_active_hooks?).to be_truthy
+    end
   end
 
   describe '#has_active_services?' do