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

feat: add workspace_id to workspace_build audit logs#12718

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.

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

Already on GitHub?Sign in to your account

Merged
sreya merged 1 commit intomainfromjon/auditlogfields
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
1 change: 1 addition & 0 deletionscoderd/audit/audit.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ type AdditionalFields struct {
BuildNumber string `json:"build_number"`
BuildReason database.BuildReason `json:"build_reason"`
WorkspaceOwner string `json:"workspace_owner"`
WorkspaceID uuid.UUID `json:"workpace_id"`
}

func NewNop() Auditor {
Expand Down
2 changes: 2 additions & 0 deletionscoderd/provisionerdserver/provisionerdserver.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -999,6 +999,7 @@ func (s *server) FailJob(ctx context.Context, failJob *proto.FailedJob) (*proto.
WorkspaceName: workspace.Name,
BuildNumber: strconv.FormatInt(int64(build.BuildNumber), 10),
BuildReason: database.BuildReason(string(build.Reason)),
WorkspaceID: workspace.ID,
}

wriBytes, err := json.Marshal(buildResourceInfo)
Expand DownExpand Up@@ -1382,6 +1383,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
WorkspaceName: workspace.Name,
BuildNumber: strconv.FormatInt(int64(workspaceBuild.BuildNumber), 10),
BuildReason: database.BuildReason(string(workspaceBuild.Reason)),
WorkspaceID: workspace.ID,
}

wriBytes, err := json.Marshal(buildResourceInfo)
Expand Down
55 changes: 39 additions & 16 deletionscoderd/provisionerdserver/provisionerdserver_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,6 @@ import (
"github.com/coder/serpent"
)

funcmockAuditor()*atomic.Pointer[audit.Auditor] {
ptr:=&atomic.Pointer[audit.Auditor]{}
mock:=audit.Auditor(audit.NewMock())
ptr.Store(&mock)
returnptr
}

functestTemplateScheduleStore()*atomic.Pointer[schedule.TemplateScheduleStore] {
ptr:=&atomic.Pointer[schedule.TemplateScheduleStore]{}
store:=schedule.NewAGPLTemplateScheduleStore()
Expand DownExpand Up@@ -822,20 +815,18 @@ func TestFailJob(t *testing.T) {
//
//(*Server).FailJob audit log - get build {"error": "sql: no rows in result set"}
ignoreLogErrors:=true
srv,db,ps,pd:=setup(t,ignoreLogErrors,&overrides{})
auditor:=audit.NewMock()
srv,db,ps,pd:=setup(t,ignoreLogErrors,&overrides{
auditor:auditor,
})
org:=dbgen.Organization(t,db, database.Organization{})
workspace,err:=db.InsertWorkspace(ctx, database.InsertWorkspaceParams{
ID:uuid.New(),
AutomaticUpdates:database.AutomaticUpdatesNever,
OrganizationID:org.ID,
})
require.NoError(t,err)
buildID:=uuid.New()
err=db.InsertWorkspaceBuild(ctx, database.InsertWorkspaceBuildParams{
ID:buildID,
WorkspaceID:workspace.ID,
Transition:database.WorkspaceTransitionStart,
Reason:database.BuildReasonInitiator,
})
require.NoError(t,err)
input,err:=json.Marshal(provisionerdserver.WorkspaceProvisionJob{
WorkspaceBuildID:buildID,
})
Expand All@@ -849,6 +840,15 @@ func TestFailJob(t *testing.T) {
StorageMethod:database.ProvisionerStorageMethodFile,
})
require.NoError(t,err)
err=db.InsertWorkspaceBuild(ctx, database.InsertWorkspaceBuildParams{
ID:buildID,
WorkspaceID:workspace.ID,
Transition:database.WorkspaceTransitionStart,
Reason:database.BuildReasonInitiator,
JobID:job.ID,
})
require.NoError(t,err)

_,err=db.AcquireProvisionerJob(ctx, database.AcquireProvisionerJobParams{
WorkerID: uuid.NullUUID{
UUID:pd.ID,
Expand All@@ -871,6 +871,7 @@ func TestFailJob(t *testing.T) {
require.NoError(t,err)
defercloseLogsSubscribe()

auditor.ResetLogs()
_,err=srv.FailJob(ctx,&proto.FailedJob{
JobId:job.ID.String(),
Type:&proto.FailedJob_WorkspaceBuild_{
Expand All@@ -885,6 +886,13 @@ func TestFailJob(t *testing.T) {
build,err:=db.GetWorkspaceBuildByID(ctx,buildID)
require.NoError(t,err)
require.Equal(t,"some state",string(build.ProvisionerState))
require.Len(t,auditor.AuditLogs(),1)

// Assert that the workspace_id field get populated
varadditionalFields audit.AdditionalFields
err=json.Unmarshal(auditor.AuditLogs()[0].AdditionalFields,&additionalFields)
require.NoError(t,err)
require.Equal(t,workspace.ID,additionalFields.WorkspaceID)
})
}

Expand DownExpand Up@@ -1130,12 +1138,14 @@ func TestCompleteJob(t *testing.T) {
start:=time.Now()
tss:=&atomic.Pointer[schedule.TemplateScheduleStore]{}
uqhss:=&atomic.Pointer[schedule.UserQuietHoursScheduleStore]{}
auditor:=audit.NewMock()
srv,db,ps,pd:=setup(t,false,&overrides{
timeNowFn:func() time.Time {
returnc.now.Add(time.Since(start))
},
templateScheduleStore:tss,
userQuietHoursScheduleStore:uqhss,
auditor:auditor,
})

vartemplateScheduleStore schedule.TemplateScheduleStore= schedule.MockTemplateScheduleStore{
Expand DownExpand Up@@ -1291,6 +1301,12 @@ func TestCompleteJob(t *testing.T) {
require.WithinDuration(t,c.expectedMaxDeadline,workspaceBuild.MaxDeadline,15*time.Second,"max deadline does not match expected")
require.GreaterOrEqual(t,workspaceBuild.MaxDeadline.Unix(),workspaceBuild.Deadline.Unix(),"max deadline is smaller than deadline")
}

require.Len(t,auditor.AuditLogs(),1)
varadditionalFields audit.AdditionalFields
err=json.Unmarshal(auditor.AuditLogs()[0].AdditionalFields,&additionalFields)
require.NoError(t,err)
require.Equal(t,workspace.ID,additionalFields.WorkspaceID)
})
}
})
Expand DownExpand Up@@ -1506,6 +1522,7 @@ type overrides struct {
acquireJobLongPollDuration time.Duration
heartbeatFnfunc(ctx context.Context)error
heartbeatInterval time.Duration
auditor audit.Auditor
}

funcsetup(t*testing.T,ignoreLogErrorsbool,ov*overrides) (proto.DRPCProvisionerDaemonServer, database.Store, pubsub.Pubsub, database.ProvisionerDaemon) {
Expand DownExpand Up@@ -1560,6 +1577,12 @@ func setup(t *testing.T, ignoreLogErrors bool, ov *overrides) (proto.DRPCProvisi
ifov.timeNowFn!=nil {
timeNowFn=ov.timeNowFn
}
auditPtr:=&atomic.Pointer[audit.Auditor]{}
varauditor audit.Auditor=audit.NewMock()
ifov.auditor!=nil {
auditor=ov.auditor
}
auditPtr.Store(&auditor)
pollDur=ov.acquireJobLongPollDuration

daemon,err:=db.UpsertProvisionerDaemon(ov.ctx, database.UpsertProvisionerDaemonParams{
Expand DownExpand Up@@ -1588,7 +1611,7 @@ func setup(t *testing.T, ignoreLogErrors bool, ov *overrides) (proto.DRPCProvisi
telemetry.NewNoop(),
trace.NewNoopTracerProvider().Tracer("noop"),
&atomic.Pointer[proto.QuotaCommitter]{},
mockAuditor(),
auditPtr,
tss,
uqhss,
deploymentValues,
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp