Skip to content

Commit aec40c1

Browse files
committed
chore: [OCISDEV-148] log space name on deletion
When a space is deleted, log also its name. Previously, we would log only its ID. This change aligns the behaviour with space creation.
1 parent 10c914b commit aec40c1

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

services/audit/pkg/service/service_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,14 +547,15 @@ var testCases = []struct {
547547
Event: events.SpaceDeleted{
548548
Executant: userID("uid-123"),
549549
ID: &provider.StorageSpaceId{OpaqueId: "storage-1$space-123"},
550+
SpaceName: "test-space",
550551
},
551552
},
552553
CheckAuditEvent: func(t *testing.T, b []byte) {
553554
ev := types.AuditEventSpaceDeleted{}
554555
require.NoError(t, json.Unmarshal(b, &ev))
555556

556557
// AuditEvent fields
557-
checkBaseAuditEvent(t, ev.AuditEvent, "", "0001-01-01T00:00:00Z", "user 'uid-123' deleted the space 'space-123' (storage: 'storage-1')", "space_deleted")
558+
checkBaseAuditEvent(t, ev.AuditEvent, "", "0001-01-01T00:00:00Z", "user 'uid-123' deleted the space 'space-123' with name 'test-space' (storage: 'storage-1')", "space_deleted")
558559
// AuditEventSpaces fields
559560
checkSpacesAuditEvent(t, ev.AuditEventSpaces, "storage-1$space-123")
560561
},

services/audit/pkg/types/conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ func SpaceEnabled(ev events.SpaceEnabled) AuditEventSpaceEnabled {
378378
// SpaceDeleted converts a SpaceDeleted event to an AuditEventSpaceDeleted
379379
func SpaceDeleted(ev events.SpaceDeleted) AuditEventSpaceDeleted {
380380
sid := ev.ID.GetOpaqueId()
381-
base := BasicAuditEvent("", formatTime(utils.TimeToTS(ev.Timestamp)), MessageSpaceDeleted(ev.Executant.GetOpaqueId(), sid), ActionSpaceDeleted)
381+
base := BasicAuditEvent("", formatTime(utils.TimeToTS(ev.Timestamp)), MessageSpaceDeleted(ev.Executant.GetOpaqueId(), sid, ev.SpaceName), ActionSpaceDeleted)
382382
return AuditEventSpaceDeleted{
383383
AuditEventSpaces: SpacesAuditEvent(base, sid),
384384
}

services/audit/pkg/types/messages.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ func MessageSpaceEnabled(executant, spaceID string) string {
166166
}
167167

168168
// MessageSpaceDeleted returns the human-readable string that describes the action
169-
func MessageSpaceDeleted(executant, spaceID string) string {
169+
func MessageSpaceDeleted(executant, spaceID, name string) string {
170170
storagID, spaceID := storagespace.SplitStorageID(spaceID)
171-
return fmt.Sprintf("user '%s' deleted the space '%s' (storage: '%s')", executant, spaceID, storagID)
171+
return fmt.Sprintf("user '%s' deleted the space '%s' with name '%s' (storage: '%s')", executant, spaceID, name, storagID)
172172
}
173173

174174
// MessageSpaceShared returns the human-readable string that describes the action

0 commit comments

Comments
 (0)