diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-15 18:08:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-15 18:08:13 +0300 |
commit | a29eae68f453c371271641899e00ea24339fb1c6 (patch) | |
tree | 5c7d43159cdaee44d3f510db0f42941ed3f3bb90 /lib/gitlab/tracking | |
parent | f58a5001b9c4988d8b95178b028a3d82bb346e28 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/tracking')
-rw-r--r-- | lib/gitlab/tracking/event_definition.rb | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/gitlab/tracking/event_definition.rb b/lib/gitlab/tracking/event_definition.rb index 9d197de454e..ce8263e824b 100644 --- a/lib/gitlab/tracking/event_definition.rb +++ b/lib/gitlab/tracking/event_definition.rb @@ -27,7 +27,7 @@ module Gitlab definition = YAML.safe_load(definition) definition.deep_symbolize_keys! - self.new(path, definition).tap(&:validate!) + self.new(path, definition) rescue StandardError => e Gitlab::ErrorTracking.track_and_raise_for_dev_exception(Gitlab::Tracking::InvalidEventError.new(e.message)) end @@ -51,17 +51,15 @@ module Gitlab path.delete_prefix(Rails.root.to_s) end - def validate! - SCHEMA.validate(attributes.stringify_keys).each do |error| - error_message = <<~ERROR_MSG + def validation_errors + SCHEMA.validate(attributes.stringify_keys).map do |error| + <<~ERROR_MSG + --------------- VALIDATION ERROR --------------- + Definition file: #{path} Error type: #{error['type']} Data: #{error['data']} Path: #{error['data_pointer']} - Details: #{error['details']} - Definition file: #{path} ERROR_MSG - - Gitlab::ErrorTracking.track_and_raise_for_dev_exception(Gitlab::Tracking::InvalidEventError.new(error_message)) end end |