Skip to content

Commit 9e84521

Browse files
authored
chore: include organization id in workspace build audit log (#9905)
* chore: include organization id in workspace build audit log * rename 'BuildAudit' to 'WorkspaceBuildAudit'
1 parent 305556f commit 9e84521

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

coderd/audit/request.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ type BuildAuditParams[T Auditable] struct {
5353
JobID uuid.UUID
5454
Status int
5555
Action database.AuditAction
56+
OrganizationID uuid.UUID
5657
AdditionalFields json.RawMessage
5758

5859
New T
@@ -244,9 +245,9 @@ func InitRequest[T Auditable](w http.ResponseWriter, p *RequestParams) (*Request
244245
}
245246
}
246247

247-
// BuildAudit creates an audit log for a workspace build.
248+
// WorkspaceBuildAudit creates an audit log for a workspace build.
248249
// The audit log is committed upon invocation.
249-
func BuildAudit[T Auditable](ctx context.Context, p *BuildAuditParams[T]) {
250+
func WorkspaceBuildAudit[T Auditable](ctx context.Context, p *BuildAuditParams[T]) {
250251
// As the audit request has not been initiated directly by a user, we omit
251252
// certain user details.
252253
ip := parseIP("")
@@ -267,6 +268,7 @@ func BuildAudit[T Auditable](ctx context.Context, p *BuildAuditParams[T]) {
267268
ID: uuid.New(),
268269
Time: dbtime.Now(),
269270
UserID: p.UserID,
271+
OrganizationID: p.OrganizationID,
270272
Ip: ip,
271273
UserAgent: sql.NullString{},
272274
ResourceType: either(p.Old, p.New, ResourceType[T], p.Action),

coderd/provisionerdserver/provisionerdserver.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -898,10 +898,11 @@ func (s *server) FailJob(ctx context.Context, failJob *proto.FailedJob) (*proto.
898898
s.Logger.Error(ctx, "marshal workspace resource info for failed job", slog.Error(err))
899899
}
900900

901-
audit.BuildAudit(ctx, &audit.BuildAuditParams[database.WorkspaceBuild]{
901+
audit.WorkspaceBuildAudit(ctx, &audit.BuildAuditParams[database.WorkspaceBuild]{
902902
Audit: *auditor,
903903
Log: s.Logger,
904904
UserID: job.InitiatorID,
905+
OrganizationID: workspace.OrganizationID,
905906
JobID: job.ID,
906907
Action: auditAction,
907908
Old: previousBuild,
@@ -1236,10 +1237,11 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
12361237
s.Logger.Error(ctx, "marshal resource info for successful job", slog.Error(err))
12371238
}
12381239

1239-
audit.BuildAudit(ctx, &audit.BuildAuditParams[database.WorkspaceBuild]{
1240+
audit.WorkspaceBuildAudit(ctx, &audit.BuildAuditParams[database.WorkspaceBuild]{
12401241
Audit: *auditor,
12411242
Log: s.Logger,
12421243
UserID: job.InitiatorID,
1244+
OrganizationID: workspace.OrganizationID,
12431245
JobID: job.ID,
12441246
Action: auditAction,
12451247
Old: previousBuild,

0 commit comments

Comments
 (0)