diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-25 18:08:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-25 18:08:37 +0300 |
commit | 65f5f75e3a3b0b9f4ea6035294f81977fa8a2bb5 (patch) | |
tree | 586044dafa068c45a77d07ceea8bec15bf9dbcae /lib/gitlab/alert_management | |
parent | 333f76ab664f610fb1c2cc6069c48a570791a792 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/alert_management')
-rw-r--r-- | lib/gitlab/alert_management/alert_params.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/alert_management/fingerprint.rb | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lib/gitlab/alert_management/alert_params.rb b/lib/gitlab/alert_management/alert_params.rb index 789a4fe246a..ce5ba6f0b49 100644 --- a/lib/gitlab/alert_management/alert_params.rb +++ b/lib/gitlab/alert_management/alert_params.rb @@ -8,7 +8,7 @@ module Gitlab }.freeze def self.from_generic_alert(project:, payload:) - parsed_payload = Gitlab::Alerting::NotificationPayloadParser.call(payload).with_indifferent_access + parsed_payload = Gitlab::Alerting::NotificationPayloadParser.call(payload, project).with_indifferent_access annotations = parsed_payload[:annotations] { diff --git a/lib/gitlab/alert_management/fingerprint.rb b/lib/gitlab/alert_management/fingerprint.rb index 6ab47c88ca1..d7842d3b37d 100644 --- a/lib/gitlab/alert_management/fingerprint.rb +++ b/lib/gitlab/alert_management/fingerprint.rb @@ -10,11 +10,14 @@ module Gitlab def generate(data) return unless data.present? - if data.is_a?(Array) - data = flatten_array(data) - end + string = case data + when Array then flatten_array(data) + when Hash then flatten_hash(data) + else + data.to_s + end - Digest::SHA1.hexdigest(data.to_s) + Digest::SHA1.hexdigest(string) end private @@ -22,6 +25,11 @@ module Gitlab def flatten_array(array) array.flatten.map!(&:to_s).join end + + def flatten_hash(hash) + # Sort hash so SHA generated is the same + Gitlab::Utils::SafeInlineHash.merge_keys!(hash).sort.to_s + end end end end |