Skip to content

feat(events): send user and token name as actorName #2324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
migmartri merged 1 commit into from
Aug 8, 2025
Merged

feat(events): send user and token name as actorName #2324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controlplane/pkg/auditor/events/apitoken_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ func TestAPITokenEvents(t *testing.T) {
auditor.WithOrgID(orgUUID),
}
if tt.actor == auditor.ActorTypeAPIToken {
opts = append(opts, auditor.WithActor(auditor.ActorTypeAPIToken, tt.actorID, ""))
opts = append(opts, auditor.WithActor(auditor.ActorTypeAPIToken, tt.actorID, "", testAPITokenName))
} else {
opts = append(opts, auditor.WithActor(auditor.ActorTypeUser, tt.actorID, testEmail))
opts = append(opts, auditor.WithActor(auditor.ActorTypeUser, tt.actorID, testEmail, testName))
}

eventPayload, err := auditor.GenerateAuditEvent(tt.event, opts...)
Expand Down
8 changes: 6 additions & 2 deletions app/controlplane/pkg/auditor/events/events_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2024 The Chainloop Authors.
// Copyright 2024-2025 The Chainloop Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -23,7 +23,11 @@ import (

var updateGolden bool

const testEmail = "john@cyberdyne.io"
const (
testEmail = "john@cyberdyne.io"
testName = "John Doe"
testAPITokenName = "test-token"
)

func TestMain(m *testing.M) {
flag.BoolVar(&updateGolden, "update-golden", false, "update the expected golden files")
Expand Down
4 changes: 2 additions & 2 deletions app/controlplane/pkg/auditor/events/group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@ func TestGroupEvents(t *testing.T) {
}

if tt.actor == auditor.ActorTypeUser {
opts = append(opts, auditor.WithActor(auditor.ActorTypeUser, tt.actorID, testEmail))
opts = append(opts, auditor.WithActor(auditor.ActorTypeUser, tt.actorID, testEmail, testName))
} else {
opts = append(opts, auditor.WithActor(auditor.ActorTypeSystem, uuid.Nil, ""))
opts = append(opts, auditor.WithActor(auditor.ActorTypeSystem, uuid.Nil, "", testAPITokenName))
}

eventPayload, err := auditor.GenerateAuditEvent(tt.event, opts...)
Expand Down
4 changes: 2 additions & 2 deletions app/controlplane/pkg/auditor/events/project_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ func TestProjectEvents(t *testing.T) {
auditor.WithOrgID(orgUUID),
}
if tt.actor == auditor.ActorTypeUser {
opts = append(opts, auditor.WithActor(auditor.ActorTypeUser, tt.actorID, testEmail))
opts = append(opts, auditor.WithActor(auditor.ActorTypeUser, tt.actorID, testEmail, testName))
} else {
opts = append(opts, auditor.WithActor(auditor.ActorTypeSystem, uuid.Nil, ""))
opts = append(opts, auditor.WithActor(auditor.ActorTypeSystem, uuid.Nil, "", testAPITokenName))
}

eventPayload, err := auditor.GenerateAuditEvent(tt.event, opts...)
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/apitokens/api_token_created.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has created the API token test-token",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...ontrolplane/pkg/auditor/events/testdata/apitokens/api_token_created_with_description.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has created the API token test-token",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...olplane/pkg/auditor/events/testdata/apitokens/api_token_created_with_expiration_date.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has created the API token test-token expiring at 2025-01-01T00:00:00Z",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/apitokens/api_token_revoked.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "API_TOKEN",
"ActorID": "2089bb36-e27b-428b-8009-d015c8737c55",
"ActorEmail": "",
"ActorName": "test-token",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": " has revoked the API token test-token",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/groups/group_created.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has created the group test-group",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/groups/group_deleted.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has deleted the group test-group",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/groups/group_member_added.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has added user test@example.com to the group test-group as a maintainer",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/groups/group_member_removed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has removed user test@example.com from the group test-group",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/groups/group_member_updated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has updated user test@example.com in the group test-group",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/groups/group_updated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has updated the group test-group",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/groups/group_updated_with_description.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has updated the group test-group",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/projects/project_member_added.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has added user 'test@example.com' to the project 'test-project' with role 'viewer'",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/projects/project_member_added_as_admin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has added user 'test@example.com' to the project 'test-project' with role 'admin'",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/projects/project_member_added_by_system.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "SYSTEM",
"ActorID": null,
"ActorEmail": "",
"ActorName": "test-token",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "system@chainloop.dev has added user 'test@example.com' to the project 'test-project' with role 'viewer'",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/projects/project_member_removed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has removed user 'test@example.com' from the project 'test-project'",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/projects/project_member_removed_by_system.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "SYSTEM",
"ActorID": null,
"ActorEmail": "",
"ActorName": "test-token",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "system@chainloop.dev has removed user 'test@example.com' from the project 'test-project'",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/projects/project_member_role_updated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has updated user 'test@example.com' role in project 'test-project' from 'viewer' to 'admin'",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...trolplane/pkg/auditor/events/testdata/projects/project_member_role_updated_by_system.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "SYSTEM",
"ActorID": null,
"ActorEmail": "",
"ActorName": "test-token",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "system@chainloop.dev has updated user 'test@example.com' role in project 'test-project' from 'viewer' to 'admin'",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/users/user_logs_in.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has logged in",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/users/user_role_changed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io role changed from 'role:org:owner' to 'role:org:member'",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/users/user_signs_up.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has signed up",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...rolplane/pkg/auditor/events/testdata/workflowcontracts/workflow_attached_to_contract.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has attached the workflow test-workflow to the workflow contract test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...auditor/events/testdata/workflowcontracts/workflow_attached_to_contract_by_api_token.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "API_TOKEN",
"ActorID": "2089bb36-e27b-428b-8009-d015c8737c55",
"ActorEmail": "",
"ActorName": "test-token",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "API Token 2089bb36-e27b-428b-8009-d015c8737c55 has attached the workflow test-workflow to the workflow contract test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...controlplane/pkg/auditor/events/testdata/workflowcontracts/workflow_contract_created.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has created the workflow contract test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...pkg/auditor/events/testdata/workflowcontracts/workflow_contract_created_by_api_token.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "API_TOKEN",
"ActorID": "2089bb36-e27b-428b-8009-d015c8737c55",
"ActorEmail": "",
"ActorName": "test-token",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "API Token 2089bb36-e27b-428b-8009-d015c8737c55 has created the workflow contract test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...controlplane/pkg/auditor/events/testdata/workflowcontracts/workflow_contract_deleted.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has deleted the workflow contract test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...pkg/auditor/events/testdata/workflowcontracts/workflow_contract_deleted_by_api_token.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "API_TOKEN",
"ActorID": "2089bb36-e27b-428b-8009-d015c8737c55",
"ActorEmail": "",
"ActorName": "test-token",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "API Token 2089bb36-e27b-428b-8009-d015c8737c55 has deleted the workflow contract test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...controlplane/pkg/auditor/events/testdata/workflowcontracts/workflow_contract_updated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has updated the workflow contract test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...pkg/auditor/events/testdata/workflowcontracts/workflow_contract_updated_by_api_token.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "API_TOKEN",
"ActorID": "2089bb36-e27b-428b-8009-d015c8737c55",
"ActorEmail": "",
"ActorName": "test-token",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "API Token 2089bb36-e27b-428b-8009-d015c8737c55 has updated the workflow contract test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...lplane/pkg/auditor/events/testdata/workflowcontracts/workflow_detached_from_contract.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has detached the workflow test-workflow from the workflow contract test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...ditor/events/testdata/workflowcontracts/workflow_detached_from_contract_by_api_token.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "API_TOKEN",
"ActorID": "2089bb36-e27b-428b-8009-d015c8737c55",
"ActorEmail": "",
"ActorName": "test-token",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "API Token 2089bb36-e27b-428b-8009-d015c8737c55 has detached the workflow test-workflow from the workflow contract test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/workflows/workflow_created.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has created the workflow test-workflow on project test-project with the contract test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/workflows/workflow_created_by_api_token.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "API_TOKEN",
"ActorID": "2089bb36-e27b-428b-8009-d015c8737c55",
"ActorEmail": "",
"ActorName": "test-token",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "API Token 2089bb36-e27b-428b-8009-d015c8737c55 has created the workflow test-workflow on project test-project with the contract test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/workflows/workflow_deleted.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has deleted the workflow test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/workflows/workflow_deleted_by_api_token.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "API_TOKEN",
"ActorID": "2089bb36-e27b-428b-8009-d015c8737c55",
"ActorEmail": "",
"ActorName": "test-token",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "API Token 2089bb36-e27b-428b-8009-d015c8737c55 has deleted the workflow test-contract",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/workflows/workflow_updated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has updated the workflow test-contract on project test-project",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions app/controlplane/pkg/auditor/events/testdata/workflows/workflow_updated_by_api_token.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "API_TOKEN",
"ActorID": "2089bb36-e27b-428b-8009-d015c8737c55",
"ActorEmail": "",
"ActorName": "test-token",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "API Token 2089bb36-e27b-428b-8009-d015c8737c55 has updated the workflow test-contract on project test-project",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...lplane/pkg/auditor/events/testdata/workflows/workflow_updated_with_workflow_contract.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "USER",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "john@cyberdyne.io",
"ActorName": "John Doe",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "john@cyberdyne.io has updated the workflow test-contract on project test-project",
"Info": {
Expand Down
1 change: 1 addition & 0 deletions ...ditor/events/testdata/workflows/workflow_updated_with_workflow_contract_by_api_token.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ActorType": "API_TOKEN",
"ActorID": "1089bb36-e27b-428b-8009-d015c8737c54",
"ActorEmail": "",
"ActorName": "test-token",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "API Token 1089bb36-e27b-428b-8009-d015c8737c54 has updated the workflow test-contract on project test-project",
"Info": {
Expand Down
4 changes: 2 additions & 2 deletions app/controlplane/pkg/auditor/events/user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2024 The Chainloop Authors.
// Copyright 2024-2025 The Chainloop Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -82,7 +82,7 @@ func TestUserEvents(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
opts := []auditor.GeneratorOption{
auditor.WithActor(auditor.ActorTypeUser, userUUID, testEmail),
auditor.WithActor(auditor.ActorTypeUser, userUUID, testEmail, testName),
auditor.WithOrgID(orgUUID),
}

Expand Down
4 changes: 2 additions & 2 deletions app/controlplane/pkg/auditor/events/workflow_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ func TestWorkflowEvents(t *testing.T) {
auditor.WithOrgID(orgUUID),
}
if tt.actor == auditor.ActorTypeAPIToken {
opts = append(opts, auditor.WithActor(auditor.ActorTypeAPIToken, tt.actorID, ""))
opts = append(opts, auditor.WithActor(auditor.ActorTypeAPIToken, tt.actorID, "", testAPITokenName))
} else {
opts = append(opts, auditor.WithActor(auditor.ActorTypeUser, tt.actorID, testEmail))
opts = append(opts, auditor.WithActor(auditor.ActorTypeUser, tt.actorID, testEmail, testName))
}

eventPayload, err := auditor.GenerateAuditEvent(tt.event, opts...)
Expand Down
Loading
Loading