Merge branch '25344-fire-webhook-on-new-deployment' into 'master'

Fire webhook on new deployment

See merge request gitlab-org/gitlab!38874

app/models/concerns/triggerable_hooks.rb

@@ -12,7 +12,8 @@ module TriggerableHooks
     merge_request_hooks:      :merge_requests_events,
     job_hooks:                :job_events,
     pipeline_hooks:           :pipeline_events,
-    wiki_page_hooks:          :wiki_page_events
+    wiki_page_hooks:          :wiki_page_events,
+    deployment_hooks:         :deployment_events
   }.freeze
 
   extend ActiveSupport::Concern

app/models/deployment.rb

@@ -148,6 +148,7 @@ class Deployment < ApplicationRecord
 
   def execute_hooks
     deployment_data = Gitlab::DataBuilder::Deployment.build(self)
+    project.execute_hooks(deployment_data, :deployment_hooks) if Feature.enabled?(:deployment_webhooks, project)
     project.execute_services(deployment_data, :deployment_hooks)
   end
 

app/models/hooks/project_hook.rb

@@ -17,7 +17,8 @@ class ProjectHook < WebHook
     :merge_request_hooks,
     :job_hooks,
     :pipeline_hooks,
-    :wiki_page_hooks
+    :wiki_page_hooks,
+    :deployment_hooks
   ]
 
   belongs_to :project

spec/workers/deployments/finished_worker_spec.rb

@@ -49,5 +49,29 @@ RSpec.describe Deployments::FinishedWorker do
 
       expect(ProjectServiceWorker).not_to have_received(:perform_async)
     end
+
+    it 'execute webhooks' do
+      deployment = create(:deployment)
+      project = deployment.project
+      web_hook = create(:project_hook, deployment_events: true, project: project)
+
+      expect_next_instance_of(WebHookService, web_hook, an_instance_of(Hash), "deployment_hooks") do |service|
+        expect(service).to receive(:async_execute)
+      end
+
+      worker.perform(deployment.id)
+    end
+
+    it 'does not execute webhooks if feature flag is disabled' do
+      stub_feature_flags(deployment_webhooks: false)
+
+      deployment = create(:deployment)
+      project = deployment.project
+      create(:project_hook, deployment_events: true, project: project)
+
+      expect(WebHookService).not_to receive(:new)
+
+      worker.perform(deployment.id)
+    end
   end
 end