Merge branch '10159-open-issues-from-alerts-as-gitlab-alert-bot' into 'master'

Resolve "Open issues from alerts as `GitLab Alert Bot`"

Closes #10159

See merge request gitlab-org/gitlab-ee!10460

ee/app/models/ee/user.rb

@@ -74,7 +74,8 @@ module EE
       scope :group_view_details, -> { where('group_view = ? OR group_view IS NULL', group_view[:details]) }
 
       enum bot_type: {
-        support_bot: 1
+        support_bot: 1,
+        alert_bot: 2
       }
     end
 
@@ -90,6 +91,15 @@ module EE
         end
       end
 
+      def alert_bot
+        email_pattern = "alert%s@#{Settings.gitlab.host}"
+
+        unique_internal(where(bot_type: :alert_bot), 'alert-bot', email_pattern) do |u|
+          u.bio = 'The GitLab alert bot'
+          u.name = 'GitLab Alert Bot'
+        end
+      end
+
       override :internal
       def internal
         super.or(where.not(bot_type: nil))

ee/app/services/incident_management/create_issue_service.rb

@@ -24,9 +24,7 @@ module IncidentManagement
 
     def issue_author
       strong_memoize(:issue_author) do
-        # This is a temporary solution before we've implemented User.alert_bot
-        # https://gitlab.com/gitlab-org/gitlab-ee/issues/10159
-        User.ghost
+        User.alert_bot
       end
     end
 

ee/changelogs/unreleased/10159-open-issues-from-alerts-as-gitlab-alert-bot.yml

+---
+title: Let the GitLab Alert bot open incident issues
+merge_request: 10460
+author:
+type: added

ee/spec/models/user_spec.rb

@@ -524,8 +524,9 @@ describe User do
     let!(:user) { create(:user) }
     let!(:ghost) { described_class.ghost }
     let!(:support_bot) { described_class.support_bot }
+    let!(:alert_bot) { described_class.alert_bot }
     let!(:non_internal) { [user] }
-    let!(:internal) { [ghost, support_bot] }
+    let!(:internal) { [ghost, support_bot, alert_bot] }
 
     it 'returns non internal users' do
       expect(described_class.internal).to eq(internal)
@@ -543,6 +544,7 @@ describe User do
         expect(ghost.bot?).to eq(false)
 
         expect(support_bot.bot?).to eq(true)
+        expect(alert_bot.bot?).to eq(true)
       end
     end
   end

ee/spec/services/incident_management/create_issue_service_spec.rb

@@ -28,7 +28,7 @@ describe IncidentManagement::CreateIssueService do
         expect(subject).to include(status: :success)
 
         issue = subject[:issue]
-        expect(issue.author).to eq(User.ghost)
+        expect(issue.author).to eq(User.alert_bot)
         expect(issue.title).to eq(alert_title)
         expect(issue.description).to include('Summary')
         expect(issue.description).to include(alert_title)