Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 0 deletions

diff --git a/app/models/incident_management/project_incident_management_setting.rb b/app/models/incident_management/project_incident_management_setting.rb
index bf57c5b883f..61ca5183719 100644
--- a/app/models/incident_management/project_incident_management_setting.rb
+++ b/app/models/incident_management/project_incident_management_setting.rb
@@ -8,6 +8,15 @@ module IncidentManagement
 
     validate :issue_template_exists, if: :create_issue?
 
+    before_validation :ensure_pagerduty_token
+
+    attr_encrypted :pagerduty_token,
+      mode: :per_attribute_iv,
+      key: Settings.attr_encrypted_db_key_base_truncated,
+      algorithm: 'aes-256-gcm',
+      encode: false, # No need to encode for binary column https://github.com/attr-encrypted/attr_encrypted#the-encode-encode_iv-encode_salt-and-default_encoding-options
+      encode_iv: false
+
     def available_issue_templates
       Gitlab::Template::IssueTemplate.all(project)
     end
@@ -30,5 +39,15 @@ module IncidentManagement
       Gitlab::Template::IssueTemplate.find(issue_template_key, project)
     rescue Gitlab::Template::Finders::RepoTemplateFinder::FileNotFoundError
     end
+
+    def ensure_pagerduty_token
+      return unless pagerduty_active
+
+      self.pagerduty_token ||= generate_pagerduty_token
+    end
+
+    def generate_pagerduty_token
+      SecureRandom.hex
+    end
   end
 end