From c97dfe849071d84546ec44b7f5b12cd5c545511e Mon Sep 17 00:00:00 2001 From: David Elizondo Date: Thu, 1 Dec 2022 22:40:23 +0000 Subject: [PATCH 1/8] Add event type information for max_file_size attribute When editing the max_file_size attribute in the group push rules, now the event_type attribute of the streamming event sent to external targets contains a meaninful value and not the default value of audit_operation. Changelog: changed MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105791 EE: true --- ee/lib/audit/group_push_rules_changes_auditor.rb | 13 ++++++++++++- .../audit/group_push_rules_changes_auditor_spec.rb | 14 ++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ee/lib/audit/group_push_rules_changes_auditor.rb b/ee/lib/audit/group_push_rules_changes_auditor.rb index a82a0fe525ecf9..efdb41951f52b2 100644 --- a/ee/lib/audit/group_push_rules_changes_auditor.rb +++ b/ee/lib/audit/group_push_rules_changes_auditor.rb @@ -7,11 +7,22 @@ class GroupPushRulesChangesAuditor < BaseChangesAuditor :file_name_regex, :max_file_size ].freeze + EVENT_TYPE_PER_ATTR = { + :max_file_size => 'group_push_rules_max_file_size_updated' + }.freeze + def execute return if model.blank? || model.group.nil? ::PushRule::AUDIT_LOG_ALLOWLIST.each do |attr, desc| - audit_changes(attr, as: desc, entity: model.group, model: model) + entity_type = if EVENT_TYPE_PER_ATTR.has_key?(attr) + EVENT_TYPE_PER_ATTR[attr] + else + 'audit_operation' + end + + audit_changes(attr, as: desc, entity: model.group, model: model, + event_type: entity_type) end end diff --git a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb index ddcaed8747e8b6..5cf1da63830339 100644 --- a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb +++ b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb @@ -59,4 +59,18 @@ end end end + + context 'auditing group-level events to external stream' do + before do + stub_licensed_features(audit_events: true, external_audit_events: true) + group.external_audit_event_destinations.create!(destination_url: 'http://example.com') + end + + it 'streams correct audit event for max_file_size', :aggregate_failures do + push_rule.update!('max_file_size' => 50) + expect(AuditEvents::AuditEventStreamingWorker).to receive(:perform_async) + .with('group_push_rules_max_file_size_updated', anything, anything) + subject.execute + end + end end -- GitLab From c2fab4fc3f3b9ed0697d41f9fd36358caf451d8a Mon Sep 17 00:00:00 2001 From: David Elizondo Date: Thu, 1 Dec 2022 22:58:01 +0000 Subject: [PATCH 2/8] Add event type information for file_name_regex attribute When editing the file_name_regex attribute in the group push rules, now the event_type attribute of the streamming event sent to external targets contains a meaninful value and not the default value of audit_operation. Changelog: changed MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105791 EE: true --- ee/lib/audit/group_push_rules_changes_auditor.rb | 3 ++- ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ee/lib/audit/group_push_rules_changes_auditor.rb b/ee/lib/audit/group_push_rules_changes_auditor.rb index efdb41951f52b2..33e839aa6b022a 100644 --- a/ee/lib/audit/group_push_rules_changes_auditor.rb +++ b/ee/lib/audit/group_push_rules_changes_auditor.rb @@ -8,7 +8,8 @@ class GroupPushRulesChangesAuditor < BaseChangesAuditor ].freeze EVENT_TYPE_PER_ATTR = { - :max_file_size => 'group_push_rules_max_file_size_updated' + :max_file_size => 'group_push_rules_max_file_size_updated', + :file_name_regex => 'group_push_rules_file_name_regex_updated' }.freeze def execute diff --git a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb index 5cf1da63830339..fd81c94a3c9513 100644 --- a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb +++ b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb @@ -72,5 +72,12 @@ .with('group_push_rules_max_file_size_updated', anything, anything) subject.execute end + + it 'streams correct audit event for file_name_regex', :aggregate_failures do + push_rule.update!('file_name_regex' => '.*\\w{2}') + expect(AuditEvents::AuditEventStreamingWorker).to receive(:perform_async) + .with('group_push_rules_file_name_regex_updated', anything, anything) + subject.execute + end end end -- GitLab From af95073fdcdf4cc49c682bbdfc5ef2617dd4d7a7 Mon Sep 17 00:00:00 2001 From: David Elizondo Date: Thu, 1 Dec 2022 23:02:17 +0000 Subject: [PATCH 3/8] Add event type information for author_email_regex attribute When editing the author_email_regex attribute in the group push rules, now the event_type attribute of the streamming event sent to external targets contains a meaninful value and not the default value of audit_operation. Changelog: changed MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105791 EE: true --- ee/lib/audit/group_push_rules_changes_auditor.rb | 3 ++- ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ee/lib/audit/group_push_rules_changes_auditor.rb b/ee/lib/audit/group_push_rules_changes_auditor.rb index 33e839aa6b022a..3d3f6b809c9633 100644 --- a/ee/lib/audit/group_push_rules_changes_auditor.rb +++ b/ee/lib/audit/group_push_rules_changes_auditor.rb @@ -9,7 +9,8 @@ class GroupPushRulesChangesAuditor < BaseChangesAuditor EVENT_TYPE_PER_ATTR = { :max_file_size => 'group_push_rules_max_file_size_updated', - :file_name_regex => 'group_push_rules_file_name_regex_updated' + :file_name_regex => 'group_push_rules_file_name_regex_updated', + :author_email_regex => 'group_push_rules_author_email_regex_updated' }.freeze def execute diff --git a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb index fd81c94a3c9513..d5e21fce65e1bf 100644 --- a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb +++ b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb @@ -79,5 +79,12 @@ .with('group_push_rules_file_name_regex_updated', anything, anything) subject.execute end + + it 'streams correct audit event for author_email_regex', :aggregate_failures do + push_rule.update!('author_email_regex' => '.*\\w{2}') + expect(AuditEvents::AuditEventStreamingWorker).to receive(:perform_async) + .with('group_push_rules_author_email_regex_updated', anything, anything) + subject.execute + end end end -- GitLab From f9a567daa0f1b76c746037898b88e8db582a9102 Mon Sep 17 00:00:00 2001 From: David Elizondo Date: Thu, 1 Dec 2022 23:05:10 +0000 Subject: [PATCH 4/8] Add event type information for commit_message_negative_regex attribute When editing the commit_message_negative_regex attribute in the group push rules, now the event_type attribute of the streamming event sent to external targets contains a meaninful value and not the default value of audit_operation. Changelog: changed MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105791 EE: true --- ee/lib/audit/group_push_rules_changes_auditor.rb | 3 ++- ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ee/lib/audit/group_push_rules_changes_auditor.rb b/ee/lib/audit/group_push_rules_changes_auditor.rb index 3d3f6b809c9633..251cf018cba2ed 100644 --- a/ee/lib/audit/group_push_rules_changes_auditor.rb +++ b/ee/lib/audit/group_push_rules_changes_auditor.rb @@ -10,7 +10,8 @@ class GroupPushRulesChangesAuditor < BaseChangesAuditor EVENT_TYPE_PER_ATTR = { :max_file_size => 'group_push_rules_max_file_size_updated', :file_name_regex => 'group_push_rules_file_name_regex_updated', - :author_email_regex => 'group_push_rules_author_email_regex_updated' + :author_email_regex => 'group_push_rules_author_email_regex_updated', + :commit_message_negative_regex => 'group_push_rules_commit_message_negative_regex_updated' }.freeze def execute diff --git a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb index d5e21fce65e1bf..b9ddc6a05b908c 100644 --- a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb +++ b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb @@ -86,5 +86,12 @@ .with('group_push_rules_author_email_regex_updated', anything, anything) subject.execute end + + it 'streams correct audit event for commit_message_negative_regex', :aggregate_failures do + push_rule.update!('commit_message_negative_regex' => '.*\\w{2}') + expect(AuditEvents::AuditEventStreamingWorker).to receive(:perform_async) + .with('group_push_rules_commit_message_negative_regex_updated', anything, anything) + subject.execute + end end end -- GitLab From 4ec818a9998dac6285e1ac367cb64d1a37296527 Mon Sep 17 00:00:00 2001 From: David Elizondo Date: Thu, 1 Dec 2022 23:10:27 +0000 Subject: [PATCH 5/8] Add event type information for commit_message_regex attribute When editing the commit_message_regex attribute in the group push rules, now the event_type attribute of the streamming event sent to external targets contains a meaninful value and not the default value of audit_operation. Changelog: changed MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105791 EE: true --- ee/lib/audit/group_push_rules_changes_auditor.rb | 3 ++- ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ee/lib/audit/group_push_rules_changes_auditor.rb b/ee/lib/audit/group_push_rules_changes_auditor.rb index 251cf018cba2ed..7168449e8eee6a 100644 --- a/ee/lib/audit/group_push_rules_changes_auditor.rb +++ b/ee/lib/audit/group_push_rules_changes_auditor.rb @@ -11,7 +11,8 @@ class GroupPushRulesChangesAuditor < BaseChangesAuditor :max_file_size => 'group_push_rules_max_file_size_updated', :file_name_regex => 'group_push_rules_file_name_regex_updated', :author_email_regex => 'group_push_rules_author_email_regex_updated', - :commit_message_negative_regex => 'group_push_rules_commit_message_negative_regex_updated' + :commit_message_negative_regex => 'group_push_rules_commit_message_negative_regex_updated', + :commit_message_regex => 'group_push_rules_commit_message_regex_updated' }.freeze def execute diff --git a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb index b9ddc6a05b908c..5b6a9c77cf8e2b 100644 --- a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb +++ b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb @@ -93,5 +93,12 @@ .with('group_push_rules_commit_message_negative_regex_updated', anything, anything) subject.execute end + + it 'streams correct audit event for commit_message_regex', :aggregate_failures do + push_rule.update!('commit_message_regex' => '.*\\w{2}') + expect(AuditEvents::AuditEventStreamingWorker).to receive(:perform_async) + .with('group_push_rules_commit_message_regex_updated', anything, anything) + subject.execute + end end end -- GitLab From 0b3818b81b65689a83ac1ef2e2d051d0d5d95451 Mon Sep 17 00:00:00 2001 From: David Elizondo Date: Thu, 1 Dec 2022 23:13:05 +0000 Subject: [PATCH 6/8] Add event type information for branch_name_regex attribute When editing the branch_name_regex attribute in the group push rules, now the event_type attribute of the streamming event sent to external targets contains a meaninful value and not the default value of audit_operation. Changelog: changed MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105791 EE: true --- ee/lib/audit/group_push_rules_changes_auditor.rb | 3 ++- ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ee/lib/audit/group_push_rules_changes_auditor.rb b/ee/lib/audit/group_push_rules_changes_auditor.rb index 7168449e8eee6a..4f63aeaf3e2ab3 100644 --- a/ee/lib/audit/group_push_rules_changes_auditor.rb +++ b/ee/lib/audit/group_push_rules_changes_auditor.rb @@ -12,7 +12,8 @@ class GroupPushRulesChangesAuditor < BaseChangesAuditor :file_name_regex => 'group_push_rules_file_name_regex_updated', :author_email_regex => 'group_push_rules_author_email_regex_updated', :commit_message_negative_regex => 'group_push_rules_commit_message_negative_regex_updated', - :commit_message_regex => 'group_push_rules_commit_message_regex_updated' + :commit_message_regex => 'group_push_rules_commit_message_regex_updated', + :branch_name_regex => 'group_push_rules_branch_name_regex_updated' }.freeze def execute diff --git a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb index 5b6a9c77cf8e2b..309cc7fb95f26f 100644 --- a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb +++ b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb @@ -100,5 +100,12 @@ .with('group_push_rules_commit_message_regex_updated', anything, anything) subject.execute end + + it 'streams correct audit event for branch_name_regex', :aggregate_failures do + push_rule.update!('branch_name_regex' => '.*\\w{2}') + expect(AuditEvents::AuditEventStreamingWorker).to receive(:perform_async) + .with('group_push_rules_branch_name_regex_updated', anything, anything) + subject.execute + end end end -- GitLab From 702c36288508d4024da9381d643acdcaaaf0e70c Mon Sep 17 00:00:00 2001 From: David Elizondo Date: Fri, 2 Dec 2022 01:43:44 +0000 Subject: [PATCH 7/8] Apply rubocop, lint and team suggestions Changelog: changed MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105791 EE: true --- .../audit/group_push_rules_changes_auditor.rb | 26 ++-- .../group_push_rules_changes_auditor_spec.rb | 113 ++++++------------ 2 files changed, 50 insertions(+), 89 deletions(-) diff --git a/ee/lib/audit/group_push_rules_changes_auditor.rb b/ee/lib/audit/group_push_rules_changes_auditor.rb index 4f63aeaf3e2ab3..d2919d15a3b1a2 100644 --- a/ee/lib/audit/group_push_rules_changes_auditor.rb +++ b/ee/lib/audit/group_push_rules_changes_auditor.rb @@ -7,27 +7,23 @@ class GroupPushRulesChangesAuditor < BaseChangesAuditor :file_name_regex, :max_file_size ].freeze - EVENT_TYPE_PER_ATTR = { - :max_file_size => 'group_push_rules_max_file_size_updated', - :file_name_regex => 'group_push_rules_file_name_regex_updated', - :author_email_regex => 'group_push_rules_author_email_regex_updated', - :commit_message_negative_regex => 'group_push_rules_commit_message_negative_regex_updated', - :commit_message_regex => 'group_push_rules_commit_message_regex_updated', - :branch_name_regex => 'group_push_rules_branch_name_regex_updated' + EVENT_TYPE_PER_ATTR = { + 'max_file_size': 'group_push_rules_max_file_size_updated', + 'file_name_regex': 'group_push_rules_file_name_regex_updated', + 'author_email_regex': 'group_push_rules_author_email_regex_updated', + 'commit_message_negative_regex': 'group_push_rules_commit_message_negative_regex_updated', + 'commit_message_regex': 'group_push_rules_commit_message_regex_updated', + 'branch_name_regex': 'group_push_rules_branch_name_regex_updated' }.freeze def execute return if model.blank? || model.group.nil? ::PushRule::AUDIT_LOG_ALLOWLIST.each do |attr, desc| - entity_type = if EVENT_TYPE_PER_ATTR.has_key?(attr) - EVENT_TYPE_PER_ATTR[attr] - else - 'audit_operation' - end - - audit_changes(attr, as: desc, entity: model.group, model: model, - event_type: entity_type) + event_name = event_type = EVENT_TYPE_PER_ATTR[attr] || 'audit_operation' + + audit_changes(attr, as: desc, entity: model.group, model: model, + event_type: event_name) end end diff --git a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb index 309cc7fb95f26f..4511a62aa5954f 100644 --- a/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb +++ b/ee/spec/lib/audit/group_push_rules_changes_auditor_spec.rb @@ -10,102 +10,67 @@ before do group.add_owner(current_user) + stub_licensed_features(audit_events: true, external_audit_events: true) + group.external_audit_event_destinations.create!(destination_url: 'http://example.com') end subject { described_class.new(current_user, push_rule) } - context 'auditing group-level changes' do + context 'when auditing group-level changes in push rules' do using RSpec::Parameterized::TableSyntax - where(:key, :old_value, :new_value) do - :commit_committer_check | false | true - :commit_committer_check | true | false - :reject_unsigned_commits | false | true - :reject_unsigned_commits | true | false - :deny_delete_tag | false | true - :deny_delete_tag | true | false - :member_check | false | true - :member_check | true | false - :prevent_secrets | false | true - :prevent_secrets | true | false - :branch_name_regex | nil | "\\Asecurity-.*\\z" - :branch_name_regex | ".*\\w{2}" | "\\Asecurity-.*\\z" - :commit_message_regex | nil | "\\Asecurity-.*\\z" - :commit_message_regex | ".*\\w{2}" | "\\Asecurity-.*\\z" - :commit_message_negative_regex | nil | "\\Asecurity-.*\\z" - :commit_message_negative_regex | ".*\\w{2}" | "\\Asecurity-.*\\z" - :author_email_regex | nil | "\\Asecurity-.*\\z" - :author_email_regex | ".*\\w{2}" | "\\Asecurity-.*\\z" - :file_name_regex | nil | "\\Asecurity-.*\\z" - :file_name_regex | ".*\\w{2}" | "\\Asecurity-.*\\z" - :max_file_size | 0 | 132 - :max_file_size | 12 | 42 + # rubocop:disable Layout/LineLength + where(:key, :old_value, :new_value, :event_name) do + :commit_committer_check | false | true | 'audit_operation' + :commit_committer_check | true | false | 'audit_operation' + :reject_unsigned_commits | false | true | 'audit_operation' + :reject_unsigned_commits | true | false | 'audit_operation' + :deny_delete_tag | false | true | 'audit_operation' + :deny_delete_tag | true | false | 'audit_operation' + :member_check | false | true | 'audit_operation' + :member_check | true | false | 'audit_operation' + :prevent_secrets | false | true | 'audit_operation' + :prevent_secrets | true | false | 'audit_operation' + :branch_name_regex | nil | "\\Asecurity-.*\\z" | 'group_push_rules_branch_name_regex_updated' + :branch_name_regex | ".*\\w{2}" | "\\Asecurity-.*\\z" | 'group_push_rules_branch_name_regex_updated' + :commit_message_regex | nil | "\\Asecurity-.*\\z" | 'group_push_rules_commit_message_regex_updated' + :commit_message_regex | ".*\\w{2}" | "\\Asecurity-.*\\z" | 'group_push_rules_commit_message_regex_updated' + :commit_message_negative_regex | nil | "\\Asecurity-.*\\z" | 'group_push_rules_commit_message_negative_regex_updated' + :commit_message_negative_regex | ".*\\w{2}" | "\\Asecurity-.*\\z" | 'group_push_rules_commit_message_negative_regex_updated' + :author_email_regex | nil | "\\Asecurity-.*\\z" | 'group_push_rules_author_email_regex_updated' + :author_email_regex | ".*\\w{2}" | "\\Asecurity-.*\\z" | 'group_push_rules_author_email_regex_updated' + :file_name_regex | nil | "\\Asecurity-.*\\z" | 'group_push_rules_file_name_regex_updated' + :file_name_regex | ".*\\w{2}" | "\\Asecurity-.*\\z" | 'group_push_rules_file_name_regex_updated' + :max_file_size | 0 | 132 | 'group_push_rules_max_file_size_updated' + :max_file_size | 12 | 42 | 'group_push_rules_max_file_size_updated' end + # rubocop:enable Layout/LineLength with_them do - it 'audits the change in push rule correctly', :aggregate_failures do + before do push_rule.update!(key => old_value) + push_rule.update!(key => new_value) + end + + it 'audits the change in push rule correctly', :aggregate_failures do expect do - push_rule.update!(key => new_value) subject.execute end.to change { AuditEvent.count }.by(1) event = AuditEvent.last + expect(event.author).to eq(current_user) expect(event.details[:change]).to eq(::PushRule::AUDIT_LOG_ALLOWLIST[key]) expect(event.details[:from]).to eq(old_value) expect(event.details[:to]).to eq(new_value) expect(event.entity).to eq(group) end - end - end - context 'auditing group-level events to external stream' do - before do - stub_licensed_features(audit_events: true, external_audit_events: true) - group.external_audit_event_destinations.create!(destination_url: 'http://example.com') - end - - it 'streams correct audit event for max_file_size', :aggregate_failures do - push_rule.update!('max_file_size' => 50) - expect(AuditEvents::AuditEventStreamingWorker).to receive(:perform_async) - .with('group_push_rules_max_file_size_updated', anything, anything) - subject.execute - end - - it 'streams correct audit event for file_name_regex', :aggregate_failures do - push_rule.update!('file_name_regex' => '.*\\w{2}') - expect(AuditEvents::AuditEventStreamingWorker).to receive(:perform_async) - .with('group_push_rules_file_name_regex_updated', anything, anything) - subject.execute - end - - it 'streams correct audit event for author_email_regex', :aggregate_failures do - push_rule.update!('author_email_regex' => '.*\\w{2}') - expect(AuditEvents::AuditEventStreamingWorker).to receive(:perform_async) - .with('group_push_rules_author_email_regex_updated', anything, anything) - subject.execute - end - - it 'streams correct audit event for commit_message_negative_regex', :aggregate_failures do - push_rule.update!('commit_message_negative_regex' => '.*\\w{2}') - expect(AuditEvents::AuditEventStreamingWorker).to receive(:perform_async) - .with('group_push_rules_commit_message_negative_regex_updated', anything, anything) - subject.execute - end - - it 'streams correct audit event for commit_message_regex', :aggregate_failures do - push_rule.update!('commit_message_regex' => '.*\\w{2}') - expect(AuditEvents::AuditEventStreamingWorker).to receive(:perform_async) - .with('group_push_rules_commit_message_regex_updated', anything, anything) - subject.execute - end - - it 'streams correct audit event for branch_name_regex', :aggregate_failures do - push_rule.update!('branch_name_regex' => '.*\\w{2}') - expect(AuditEvents::AuditEventStreamingWorker).to receive(:perform_async) - .with('group_push_rules_branch_name_regex_updated', anything, anything) - subject.execute + it 'streams correct audit event', :aggregate_failures do + expect(AuditEvents::AuditEventStreamingWorker).to receive(:perform_async) + .with(event_name, anything, anything) + subject.execute + end end end end -- GitLab From ebc7d887fdff00d67b022f749a449995dda8926e Mon Sep 17 00:00:00 2001 From: David Elizondo Date: Mon, 12 Dec 2022 23:54:32 +0000 Subject: [PATCH 8/8] Remove quotes from hash keys Changelog: changed MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105791 EE: true --- ee/lib/audit/group_push_rules_changes_auditor.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ee/lib/audit/group_push_rules_changes_auditor.rb b/ee/lib/audit/group_push_rules_changes_auditor.rb index d2919d15a3b1a2..708cd996c5162d 100644 --- a/ee/lib/audit/group_push_rules_changes_auditor.rb +++ b/ee/lib/audit/group_push_rules_changes_auditor.rb @@ -8,19 +8,19 @@ class GroupPushRulesChangesAuditor < BaseChangesAuditor ].freeze EVENT_TYPE_PER_ATTR = { - 'max_file_size': 'group_push_rules_max_file_size_updated', - 'file_name_regex': 'group_push_rules_file_name_regex_updated', - 'author_email_regex': 'group_push_rules_author_email_regex_updated', - 'commit_message_negative_regex': 'group_push_rules_commit_message_negative_regex_updated', - 'commit_message_regex': 'group_push_rules_commit_message_regex_updated', - 'branch_name_regex': 'group_push_rules_branch_name_regex_updated' + max_file_size: 'group_push_rules_max_file_size_updated', + file_name_regex: 'group_push_rules_file_name_regex_updated', + author_email_regex: 'group_push_rules_author_email_regex_updated', + commit_message_negative_regex: 'group_push_rules_commit_message_negative_regex_updated', + commit_message_regex: 'group_push_rules_commit_message_regex_updated', + branch_name_regex: 'group_push_rules_branch_name_regex_updated' }.freeze def execute return if model.blank? || model.group.nil? ::PushRule::AUDIT_LOG_ALLOWLIST.each do |attr, desc| - event_name = event_type = EVENT_TYPE_PER_ATTR[attr] || 'audit_operation' + event_name = EVENT_TYPE_PER_ATTR[attr] || 'audit_operation' audit_changes(attr, as: desc, entity: model.group, model: model, event_type: event_name) -- GitLab