Skip to content

Add audit links/kira pilot #5156

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
merged 13 commits into from
Dec 2, 2022
Merged

Add audit links/kira pilot #5156

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a630982
got links working
Kira-Pilot Nov 23, 2022
c988b1a
added translations
Kira-Pilot Nov 23, 2022
34a527f
fixed translation
Kira-Pilot Nov 23, 2022
b101417
added translation for unavailable ip
Kira-Pilot Nov 28, 2022
ddc0dc0
added support for group, template, user links
Kira-Pilot Nov 28, 2022
709e42e
cleaned up string
Kira-Pilot Nov 30, 2022
d5eb06a
added deleted label
Kira-Pilot Nov 30, 2022
221f089
querying for workspace id
Kira-Pilot Nov 30, 2022
8177557
remove prints
Kira-Pilot Nov 30, 2022
d1ba2b9
fix/write tests
Kira-Pilot Nov 30, 2022
9353342
PR feedback pt 1
Kira-Pilot Dec 1, 2022
6465f3e
PR feedback part 2
Kira-Pilot Dec 2, 2022
23e5d29
Merge remote-tracking branch 'origin/main' into add-audit-links/kira-…
Kira-Pilot Dec 2, 2022
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
Prev Previous commit
Next Next commit
PR feedback pt 1
  • Loading branch information
@Kira-Pilot
Kira-Pilot committed Dec 1, 2022
commit 93533422db8f83803126a44c08dee9a08efaa316
33 changes: 27 additions & 6 deletions coderd/audit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (

"github.com/google/uuid"
"github.com/tabbed/pqtype"
"golang.org/x/xerrors"

"cdr.dev/slog"
"github.com/coder/coder/coderd/database"
Expand Down Expand Up @@ -240,30 +241,50 @@ func (api *API) auditLogIsResourceDeleted(ctx context.Context, alog database.Get
case database.ResourceTypeTemplate:
template, err := api.Database.GetTemplateByID(ctx, alog.ResourceID)
if err != nil {
api.Logger.Error(ctx, "could not fetch template", slog.Error(err))
if xerrors.Is(err, sql.ErrNoRows) {
return true
} else {
api.Logger.Error(ctx, "fetch template", slog.Error(err))
}
}
return template.Deleted
case database.ResourceTypeUser:
user, err := api.Database.GetUserByID(ctx, alog.ResourceID)
if err != nil {
api.Logger.Error(ctx, "could not fetch user", slog.Error(err))
if xerrors.Is(err, sql.ErrNoRows) {
return true
} else {
api.Logger.Error(ctx, "fetch user", slog.Error(err))
}
}
return user.Deleted
case database.ResourceTypeWorkspace:
workspace, err := api.Database.GetWorkspaceByID(ctx, alog.ResourceID)
if err != nil {
api.Logger.Error(ctx, "could not fetch workspace", slog.Error(err))
if xerrors.Is(err, sql.ErrNoRows) {
return true
} else {
api.Logger.Error(ctx, "fetch workspace", slog.Error(err))
}
}
return workspace.Deleted
case database.ResourceTypeWorkspaceBuild:
workspaceBuild, err := api.Database.GetWorkspaceBuildByID(ctx, alog.ResourceID)
if err != nil {
api.Logger.Error(ctx, "could not fetch workspace build", slog.Error(err))
if xerrors.Is(err, sql.ErrNoRows) {
return true
} else {
api.Logger.Error(ctx, "fetch workspace build", slog.Error(err))
}
}
// We use workspace as a proxy for workspace build here
workspace, err := api.Database.GetWorkspaceByID(ctx, workspaceBuild.WorkspaceID)
if err != nil {
api.Logger.Error(ctx, "could not fetch workspace", slog.Error(err))
if xerrors.Is(err, sql.ErrNoRows) {
return true
} else {
api.Logger.Error(ctx, "fetch workspace", slog.Error(err))
}
}
return workspace.Deleted
default:
Expand Down Expand Up @@ -296,7 +317,7 @@ func (api *API) auditLogResourceLink(ctx context.Context, alog database.GetAudit
var additionalFields AdditionalFields
err := json.Unmarshal(additionalFieldsBytes, &additionalFields)
if err != nil {
api.Logger.Error(ctx, "could not unmarshal workspace name", slog.Error(err))
api.Logger.Error(ctx, "unmarshal workspace name", slog.Error(err))
}
return fmt.Sprintf("/@%s/%s/builds/%s",
alog.UserUsername.String, additionalFields.WorkspaceName, additionalFields.BuildNumber)
Expand Down