From a3b8a7742a7a3375bd70005a35b8a316c6a8db6c Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Mon, 19 Jun 2023 07:45:04 +0200 Subject: [PATCH] fix tests Signed-off-by: Christian Richter --- services/audit/pkg/service/service_test.go | 30 +++++++++++----------- services/audit/pkg/types/helpers.go | 3 +++ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/services/audit/pkg/service/service_test.go b/services/audit/pkg/service/service_test.go index d612783c11..2cc3585140 100644 --- a/services/audit/pkg/service/service_test.go +++ b/services/audit/pkg/service/service_test.go @@ -462,7 +462,7 @@ var testCases = []struct { SystemEvent: events.Event{ Event: events.SpaceCreated{ Executant: userID("uid-123"), - ID: &provider.StorageSpaceId{OpaqueId: "space-123"}, + ID: &provider.StorageSpaceId{OpaqueId: "storage-1$space-123"}, Owner: userID("uid-123"), Root: resourceID("pro-1", "sto-123", "iid-123"), Name: "test-space", @@ -476,9 +476,9 @@ var testCases = []struct { require.NoError(t, json.Unmarshal(b, &ev)) // AuditEvent fields - checkBaseAuditEvent(t, ev.AuditEvent, "", "2286-11-20T17:46:40Z", "user 'uid-123' created a space 'space-123' with name 'test-space'", "space_created") + checkBaseAuditEvent(t, ev.AuditEvent, "", "2286-11-20T17:46:40Z", "user 'uid-123' created a space 'space-123' with name 'test-space' (storage: 'storage-1')", "space_created") // AuditEventSpaces fields - checkSpacesAuditEvent(t, ev.AuditEventSpaces, "space-123") + checkSpacesAuditEvent(t, ev.AuditEventSpaces, "storage-1$space-123") // AuditEventFileRestored fields require.Equal(t, "uid-123", ev.Owner) require.Equal(t, "pro-1$sto-123!iid-123", ev.RootItem) @@ -490,7 +490,7 @@ var testCases = []struct { SystemEvent: events.Event{ Event: events.SpaceRenamed{ Executant: userID("uid-123"), - ID: &provider.StorageSpaceId{OpaqueId: "space-123"}, + ID: &provider.StorageSpaceId{OpaqueId: "storage-1$space-123"}, Owner: userID("uid-123"), Name: "new-name", }, @@ -500,9 +500,9 @@ var testCases = []struct { require.NoError(t, json.Unmarshal(b, &ev)) // AuditEvent fields - checkBaseAuditEvent(t, ev.AuditEvent, "", "", "user 'uid-123' renamed space 'space-123' to 'new-name'", "space_renamed") + checkBaseAuditEvent(t, ev.AuditEvent, "", "", "user 'uid-123' renamed space 'space-123' to 'new-name' (storage: 'storage-1')", "space_renamed") // AuditEventSpaces fields - checkSpacesAuditEvent(t, ev.AuditEventSpaces, "space-123") + checkSpacesAuditEvent(t, ev.AuditEventSpaces, "storage-1$space-123") // AuditEventSpaceRenamed fields require.Equal(t, "new-name", ev.NewName) }, @@ -511,7 +511,7 @@ var testCases = []struct { SystemEvent: events.Event{ Event: events.SpaceDisabled{ Executant: userID("uid-123"), - ID: &provider.StorageSpaceId{OpaqueId: "space-123"}, + ID: &provider.StorageSpaceId{OpaqueId: "storage-1$space-123"}, }, }, CheckAuditEvent: func(t *testing.T, b []byte) { @@ -519,16 +519,16 @@ var testCases = []struct { require.NoError(t, json.Unmarshal(b, &ev)) // AuditEvent fields - checkBaseAuditEvent(t, ev.AuditEvent, "", "0001-01-01T00:00:00Z", "user 'uid-123' disabled the space 'space-123'", "space_disabled") + checkBaseAuditEvent(t, ev.AuditEvent, "", "0001-01-01T00:00:00Z", "user 'uid-123' disabled the space 'space-123' (storage: 'storage-1')", "space_disabled") // AuditEventSpaces fields - checkSpacesAuditEvent(t, ev.AuditEventSpaces, "space-123") + checkSpacesAuditEvent(t, ev.AuditEventSpaces, "storage-1$space-123") }, }, { Alias: "Space enabled", SystemEvent: events.Event{ Event: events.SpaceEnabled{ Executant: userID("uid-123"), - ID: &provider.StorageSpaceId{OpaqueId: "space-123"}, + ID: &provider.StorageSpaceId{OpaqueId: "storage-1$space-123"}, }, }, CheckAuditEvent: func(t *testing.T, b []byte) { @@ -536,16 +536,16 @@ var testCases = []struct { require.NoError(t, json.Unmarshal(b, &ev)) // AuditEvent fields - checkBaseAuditEvent(t, ev.AuditEvent, "", "", "user 'uid-123' (re-) enabled the space 'space-123'", "space_enabled") + checkBaseAuditEvent(t, ev.AuditEvent, "", "", "user 'uid-123' (re-) enabled the space 'space-123' (storage: 'storage-1')", "space_enabled") // AuditEventSpaces fields - checkSpacesAuditEvent(t, ev.AuditEventSpaces, "space-123") + checkSpacesAuditEvent(t, ev.AuditEventSpaces, "storage-1$space-123") }, }, { Alias: "Space deleted", SystemEvent: events.Event{ Event: events.SpaceDeleted{ Executant: userID("uid-123"), - ID: &provider.StorageSpaceId{OpaqueId: "space-123"}, + ID: &provider.StorageSpaceId{OpaqueId: "storage-1$space-123"}, }, }, CheckAuditEvent: func(t *testing.T, b []byte) { @@ -553,9 +553,9 @@ var testCases = []struct { require.NoError(t, json.Unmarshal(b, &ev)) // AuditEvent fields - checkBaseAuditEvent(t, ev.AuditEvent, "", "0001-01-01T00:00:00Z", "user 'uid-123' deleted the space 'space-123'", "space_deleted") + checkBaseAuditEvent(t, ev.AuditEvent, "", "0001-01-01T00:00:00Z", "user 'uid-123' deleted the space 'space-123' (storage: 'storage-1')", "space_deleted") // AuditEventSpaces fields - checkSpacesAuditEvent(t, ev.AuditEventSpaces, "space-123") + checkSpacesAuditEvent(t, ev.AuditEventSpaces, "storage-1$space-123") }, }, } diff --git a/services/audit/pkg/types/helpers.go b/services/audit/pkg/types/helpers.go index f1aad63836..cc76e7cb37 100644 --- a/services/audit/pkg/types/helpers.go +++ b/services/audit/pkg/types/helpers.go @@ -4,5 +4,8 @@ import "strings" func SplitId(id string) (string, string) { ids := strings.Split(id, "$") + if len(ids) != 2 { + return id, "" + } return ids[0], ids[1] }