Skip to content
Snippets Groups Projects

Link project_bot user deletion audit event to its resource if possible

Merged Smriti Garg requested to merge smriti-492873/audit_events_for_bot_user_deletion into master
Compare and Show latest version
1 file
+ 15
8
Compare changes
  • Side-by-side
  • Inline
@@ -275,30 +275,37 @@
@@ -275,30 +275,37 @@
end
end
context 'when its a bot user' do
context 'when its a bot user' do
let_it_be(:user) { create(:user, :project_bot) }
let_it_be(:bot_user) { create(:user, :project_bot) }
let_it_be(:group) { create(:group) }
let_it_be(:group) { create(:group) }
let_it_be(:reason_for_deletion) { "Token Revoked" }
let_it_be(:reason_for_deletion) { "Token Revoked" }
let_it_be(:message) do
let_it_be(:message) do
"Bot User #{user.username} scheduled for deletion, user will queued for deletion within next five minutes."
"Bot User #{bot_user.username} scheduled for deletion, user will queued for deletion within next five minutes."
end
end
let_it_be(:admin) { create(:admin) }
let_it_be(:admin) { create(:admin) }
subject(:operation) do
subject(:operation) do
service.execute(user, { skip_authorization: true, reason_for_deletion: reason_for_deletion })
service.execute(bot_user, { skip_authorization: true, reason_for_deletion: reason_for_deletion })
end
end
before_all do
before_all do
group.add_maintainer(user)
group.add_maintainer(bot_user)
end
end
 
before do
 
allow_next_instance_of(::Gitlab::Audit::Auditor) do |auditor|
 
allow(auditor).to receive(:audit_enabled?).and_return true
 
end
 
end
 
 
context 'when current user is present' do
context 'when current user is present' do
let_it_be(:audit_attributes) do
let_it_be(:audit_attributes) do
{
{
author_name: admin.name,
author_name: admin.name,
entity: group,
entity: group,
target_id: user.id,
target_id: bot_user.id,
target_details: user.full_path,
target_details: bot_user.full_path,
details: {
details: {
custom_message: "#{message} Reason: #{reason_for_deletion}."
custom_message: "#{message} Reason: #{reason_for_deletion}."
}
}
@@ -327,8 +334,8 @@
@@ -327,8 +334,8 @@
{
{
author_name: "(System)",
author_name: "(System)",
entity: group,
entity: group,
target_id: user.id,
target_id: bot_user.id,
target_details: user.full_path,
target_details: bot_user.full_path,
details: {
details: {
custom_message: message,
custom_message: message,
reason: reason_for_deletion
reason: reason_for_deletion
Loading