Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitb94d2cb

Browse files
authored
fix(coderd): handle deletes and links for new agent/app audit resources (#16670)
These code-paths were overlooked in#16493.
1 parentf1b357d commitb94d2cb

File tree

1 file changed

+40
-0
lines changed

1 file changed

+40
-0
lines changed

‎coderd/audit.go

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,26 @@ func (api *API) auditLogIsResourceDeleted(ctx context.Context, alog database.Get
367367
api.Logger.Error(ctx,"unable to fetch workspace",slog.Error(err))
368368
}
369369
returnworkspace.Deleted
370+
casedatabase.ResourceTypeWorkspaceAgent:
371+
// We use workspace as a proxy for workspace agents.
372+
workspace,err:=api.Database.GetWorkspaceByAgentID(ctx,alog.AuditLog.ResourceID)
373+
iferr!=nil {
374+
ifxerrors.Is(err,sql.ErrNoRows) {
375+
returntrue
376+
}
377+
api.Logger.Error(ctx,"unable to fetch workspace",slog.Error(err))
378+
}
379+
returnworkspace.Deleted
380+
casedatabase.ResourceTypeWorkspaceApp:
381+
// We use workspace as a proxy for workspace apps.
382+
workspace,err:=api.Database.GetWorkspaceByWorkspaceAppID(ctx,alog.AuditLog.ResourceID)
383+
iferr!=nil {
384+
ifxerrors.Is(err,sql.ErrNoRows) {
385+
returntrue
386+
}
387+
api.Logger.Error(ctx,"unable to fetch workspace",slog.Error(err))
388+
}
389+
returnworkspace.Deleted
370390
casedatabase.ResourceTypeOauth2ProviderApp:
371391
_,err:=api.Database.GetOAuth2ProviderAppByID(ctx,alog.AuditLog.ResourceID)
372392
ifxerrors.Is(err,sql.ErrNoRows) {
@@ -429,6 +449,26 @@ func (api *API) auditLogResourceLink(ctx context.Context, alog database.GetAudit
429449
returnfmt.Sprintf("/@%s/%s/builds/%s",
430450
workspaceOwner.Username,additionalFields.WorkspaceName,additionalFields.BuildNumber)
431451

452+
casedatabase.ResourceTypeWorkspaceAgent:
453+
ifadditionalFields.WorkspaceOwner!=""&&additionalFields.WorkspaceName!="" {
454+
returnfmt.Sprintf("/@%s/%s",additionalFields.WorkspaceOwner,additionalFields.WorkspaceName)
455+
}
456+
workspace,getWorkspaceErr:=api.Database.GetWorkspaceByAgentID(ctx,alog.AuditLog.ResourceID)
457+
ifgetWorkspaceErr!=nil {
458+
return""
459+
}
460+
returnfmt.Sprintf("/@%s/%s",workspace.OwnerUsername,workspace.Name)
461+
462+
casedatabase.ResourceTypeWorkspaceApp:
463+
ifadditionalFields.WorkspaceOwner!=""&&additionalFields.WorkspaceName!="" {
464+
returnfmt.Sprintf("/@%s/%s",additionalFields.WorkspaceOwner,additionalFields.WorkspaceName)
465+
}
466+
workspace,getWorkspaceErr:=api.Database.GetWorkspaceByWorkspaceAppID(ctx,alog.AuditLog.ResourceID)
467+
ifgetWorkspaceErr!=nil {
468+
return""
469+
}
470+
returnfmt.Sprintf("/@%s/%s",workspace.OwnerUsername,workspace.Name)
471+
432472
casedatabase.ResourceTypeOauth2ProviderApp:
433473
returnfmt.Sprintf("/deployment/oauth2-provider/apps/%s",alog.AuditLog.ResourceID)
434474

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp