mirror of
https://github.com/coder/coder.git
synced 2025-07-09 11:45:56 +00:00
feat: add description to audit log responses (#3949)
This commit is contained in:
@ -2,6 +2,7 @@ package coderd
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/netip"
|
||||
@ -167,7 +168,14 @@ func convertAuditLog(dblog database.GetAuditLogsOffsetRow) codersdk.AuditLog {
|
||||
Diff: diff,
|
||||
StatusCode: dblog.StatusCode,
|
||||
AdditionalFields: dblog.AdditionalFields,
|
||||
Description: "",
|
||||
Description: auditLogDescription(dblog),
|
||||
User: user,
|
||||
}
|
||||
}
|
||||
|
||||
func auditLogDescription(alog database.GetAuditLogsOffsetRow) string {
|
||||
return fmt.Sprintf("{user} %s %s {target}",
|
||||
codersdk.AuditAction(alog.Action).FriendlyString(),
|
||||
codersdk.ResourceType(alog.ResourceType).FriendlyString(),
|
||||
)
|
||||
}
|
||||
|
@ -2308,7 +2308,7 @@ func (q *fakeQuerier) GetAuditLogsOffset(ctx context.Context, arg database.GetAu
|
||||
OrganizationID: alog.OrganizationID,
|
||||
Ip: alog.Ip,
|
||||
UserAgent: alog.UserAgent,
|
||||
ResourceType: database.ResourceType(alog.UserAgent),
|
||||
ResourceType: alog.ResourceType,
|
||||
ResourceID: alog.ResourceID,
|
||||
ResourceTarget: alog.ResourceTarget,
|
||||
ResourceIcon: alog.ResourceIcon,
|
||||
|
4
coderd/database/dump.sql
generated
4
coderd/database/dump.sql
generated
@ -73,7 +73,9 @@ CREATE TYPE resource_type AS ENUM (
|
||||
'template',
|
||||
'template_version',
|
||||
'user',
|
||||
'workspace'
|
||||
'workspace',
|
||||
'git_ssh_key',
|
||||
'api_key'
|
||||
);
|
||||
|
||||
CREATE TYPE user_status AS ENUM (
|
||||
|
@ -1,9 +1,9 @@
|
||||
-- It's not possible to drop enum values from enum types, so the UP has "IF NOT
|
||||
-- EXISTS".
|
||||
|
||||
-- Delete all jobs that use the new enum value.
|
||||
-- Delete all audit logs that use the new enum values.
|
||||
DELETE FROM
|
||||
provisioner_jobs
|
||||
audit_logs
|
||||
WHERE
|
||||
type = 'template_version_dry_run'
|
||||
;
|
||||
resource_type = 'git_ssh_key' OR
|
||||
resource_type = 'api_key';
|
||||
|
@ -0,0 +1,8 @@
|
||||
-- It's not possible to drop enum values from enum types, so the UP has "IF NOT
|
||||
-- EXISTS".
|
||||
|
||||
-- Delete all jobs that use the new enum value.
|
||||
DELETE FROM
|
||||
provisioner_jobs
|
||||
WHERE
|
||||
type = 'template_version_dry_run';
|
@ -0,0 +1,2 @@
|
||||
ALTER TYPE resource_type ADD VALUE IF NOT EXISTS 'git_ssh_key';
|
||||
ALTER TYPE resource_type ADD VALUE IF NOT EXISTS 'api_key';
|
@ -258,6 +258,8 @@ const (
|
||||
ResourceTypeTemplateVersion ResourceType = "template_version"
|
||||
ResourceTypeUser ResourceType = "user"
|
||||
ResourceTypeWorkspace ResourceType = "workspace"
|
||||
ResourceTypeGitSshKey ResourceType = "git_ssh_key"
|
||||
ResourceTypeApiKey ResourceType = "api_key"
|
||||
)
|
||||
|
||||
func (e *ResourceType) Scan(src interface{}) error {
|
||||
|
Reference in New Issue
Block a user