diff --git a/ee/config/audit_events/types/allow_author_approval_updated.yml b/ee/config/audit_events/types/allow_author_approval_updated.yml new file mode 100644 index 0000000000000000000000000000000000000000..e167f00e9442f43b38f903a9b0d8e7fc19d23fb8 --- /dev/null +++ b/ee/config/audit_events/types/allow_author_approval_updated.yml @@ -0,0 +1,8 @@ +name: allow_author_approval_updated +description: Event triggered on updating prevent merge request approval from authors from group merge request setting +introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/373949 +introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102256 +group: "group::compliance" +milestone: "15.6" +saved_to_database: true +streamed: true diff --git a/ee/config/audit_events/types/allow_committer_approval_updated.yml b/ee/config/audit_events/types/allow_committer_approval_updated.yml new file mode 100644 index 0000000000000000000000000000000000000000..21e370157099f4c134fbe2af70b41ef90daa3b18 --- /dev/null +++ b/ee/config/audit_events/types/allow_committer_approval_updated.yml @@ -0,0 +1,8 @@ +name: allow_committer_approval_updated +description: Event triggered on updating prevent merge request approval from committers from group merge request setting +introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/373949 +introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102256 +group: "group::compliance" +milestone: "15.6" +saved_to_database: true +streamed: true diff --git a/ee/config/audit_events/types/allow_overrides_to_approver_list_per_merge_request_updated.yml b/ee/config/audit_events/types/allow_overrides_to_approver_list_per_merge_request_updated.yml new file mode 100644 index 0000000000000000000000000000000000000000..299eb077ddb3ba14de33a7e6b859dadad4d77731 --- /dev/null +++ b/ee/config/audit_events/types/allow_overrides_to_approver_list_per_merge_request_updated.yml @@ -0,0 +1,8 @@ +name: allow_overrides_to_approver_list_per_merge_request_updated +description: Event triggered on updating prevent users from modifying MR approval rules in merge requests from group merge request setting +introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/373949 +introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102256 +group: "group::compliance" +milestone: "15.6" +saved_to_database: true +streamed: true diff --git a/ee/config/audit_events/types/require_password_to_approve_updated.yml b/ee/config/audit_events/types/require_password_to_approve_updated.yml new file mode 100644 index 0000000000000000000000000000000000000000..cdbdf246692b93de57b6d2e6b5b4a1b3bad3222f --- /dev/null +++ b/ee/config/audit_events/types/require_password_to_approve_updated.yml @@ -0,0 +1,8 @@ +name: require_password_to_approve_updated +description: Event triggered on updating require user password for approvals from group merge request setting +introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/373949 +introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102256 +group: "group::compliance" +milestone: "15.6" +saved_to_database: true +streamed: true diff --git a/ee/config/audit_events/types/retain_approvals_on_push_updated.yml b/ee/config/audit_events/types/retain_approvals_on_push_updated.yml new file mode 100644 index 0000000000000000000000000000000000000000..8d38a1487b00d662bfa2d3c07103bfdc492a603c --- /dev/null +++ b/ee/config/audit_events/types/retain_approvals_on_push_updated.yml @@ -0,0 +1,8 @@ +name: retain_approvals_on_push_updated +description: Event triggered on updating require new approvals when new commits are added to an MR from group merge request setting +introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/373949 +introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102256 +group: "group::compliance" +milestone: "15.6" +saved_to_database: true +streamed: true diff --git a/ee/lib/audit/group_merge_request_approval_setting_changes_auditor.rb b/ee/lib/audit/group_merge_request_approval_setting_changes_auditor.rb index ffc7f7947a95e96270af1a557f767bd610d2dcec..325ecdee5ea0a2de81effdbf29796821ea8e3157 100644 --- a/ee/lib/audit/group_merge_request_approval_setting_changes_auditor.rb +++ b/ee/lib/audit/group_merge_request_approval_setting_changes_auditor.rb @@ -21,10 +21,14 @@ def audit_change(column, description) if model.previously_new_record? audit_new_record(column, description) else - audit_changes(column, as: description, entity: @group, model: model) + audit_changes(column, as: description, entity: @group, model: model, event_type: event_name(column)) end end + def event_name(column) + "#{column}_updated" + end + def audit_new_record(column, description) return unless should_audit_params_column?(column) diff --git a/ee/spec/lib/audit/group_merge_request_approval_setting_changes_auditor_spec.rb b/ee/spec/lib/audit/group_merge_request_approval_setting_changes_auditor_spec.rb index c1df096f7ac9483617af8ae5d041f5c4c854009f..5bc5e488148cf55c8108c6ca33853cc61de447ba 100644 --- a/ee/spec/lib/audit/group_merge_request_approval_setting_changes_auditor_spec.rb +++ b/ee/spec/lib/audit/group_merge_request_approval_setting_changes_auditor_spec.rb @@ -56,6 +56,13 @@ expect(AuditEvent.last.details).to include({ change: desc, from: true, to: false }) end end + + it 'passes correct event type to auditor' do + expect(::Gitlab::Audit::Auditor) + .to receive(:audit).with(hash_including({ name: "#{column}_updated" })).and_call_original + + subject.execute + end end end end