Oct 14, 2024 · Oct 1, 2024 · Oct 2, 2024 · Oct 3, 2024 · Oct 3, 2024 · Oct 3, 2024
diff --git a/coderd/agentapi/scripts.go b/coderd/agentapi/scripts.go

 //nolint:gocritic // We need permissions to write to the DB here and we are in the context of the agent.
 ctx = dbauthz.AsProvisionerd(ctx)
 err = s.Database.InsertWorkspaceAgentScriptTimings(ctx, database.InsertWorkspaceAgentScriptTimingsParams{
 _,err = s.Database.InsertWorkspaceAgentScriptTimings(ctx, database.InsertWorkspaceAgentScriptTimingsParams{
 ScriptID:  scriptID,
 Stage:     stage,
 Status:    status,
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/coderd.go b/coderd/coderd.go
 r.Get("/parameters", api.workspaceBuildParameters)
 r.Get("/resources", api.workspaceBuildResourcesDeprecated)
 r.Get("/state", api.workspaceBuildState)
 r.Get("/timings", api.workspaceBuildTimings)
 })
 r.Route("/authcheck", func(r chi.Router) {
 r.Use(apiKeyMiddleware)
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return q.db.GetWorkspaceAgentPortShare(ctx, arg)
 }

 func (q *querier) GetWorkspaceAgentScriptTimingsByBuildID(ctx context.Context, id uuid.UUID) ([]database.GetWorkspaceAgentScriptTimingsByBuildIDRow, error) {
 if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
 return nil, err
 }
 return q.db.GetWorkspaceAgentScriptTimingsByBuildID(ctx, id)
 }

 func (q *querier) GetWorkspaceAgentScriptsByAgentIDs(ctx context.Context, ids []uuid.UUID) ([]database.WorkspaceAgentScript, error) {
 if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
 return nil, err
 return q.db.InsertWorkspaceAgentMetadata(ctx, arg)
 }

 func (q *querier) InsertWorkspaceAgentScriptTimings(ctx context.Context, arg database.InsertWorkspaceAgentScriptTimingsParams) error {
 func (q *querier) InsertWorkspaceAgentScriptTimings(ctx context.Context, arg database.InsertWorkspaceAgentScriptTimingsParams)(database.WorkspaceAgentScriptTiming,error) {
 if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
 return err
 returndatabase.WorkspaceAgentScriptTiming{},err
 }
 return q.db.InsertWorkspaceAgentScriptTimings(ctx, arg)
 }
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 check.Args(database.UpdateProvisionerJobWithCancelByIDParams{ID: j.ID}).
 Asserts(v.RBACObject(tpl), []policy.Action{policy.ActionRead, policy.ActionUpdate}).Returns()
 }))
 s.Run("GetProvisionerJobTimingsByJobID", s.Subtest(func(db database.Store, check *expects) {
 w := dbgen.Workspace(s.T(), db, database.Workspace{})
 j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
 Type: database.ProvisionerJobTypeWorkspaceBuild,
 })
 _ = dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: j.ID, WorkspaceID: w.ID})
 t := dbgen.ProvisionerJobTimings(s.T(), db, database.InsertProvisionerJobTimingsParams{
 JobID:     j.ID,
 StartedAt: []time.Time{dbtime.Now(), dbtime.Now()},
 EndedAt:   []time.Time{dbtime.Now(), dbtime.Now()},
 Stage: []database.ProvisionerJobTimingStage{
 database.ProvisionerJobTimingStageInit,
 database.ProvisionerJobTimingStagePlan,
 },
 Source:   []string{"source1", "source2"},
 Action:   []string{"action1", "action2"},
 Resource: []string{"resource1", "resource2"},
 })
 check.Args(j.ID).Asserts(w, policy.ActionRead).Returns(t)
 }))
 s.Run("GetProvisionerJobsByIDs", s.Subtest(func(db database.Store, check *expects) {
 a := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
 b := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
 LastGeneratedAt:        dbtime.Now(),
 }).Asserts(rbac.ResourceSystem, policy.ActionCreate)
 }))
 s.Run("GetProvisionerJobTimingsByJobID", s.Subtest(func(db database.Store, check *expects) {
 w := dbgen.Workspace(s.T(), db, database.Workspace{})
 j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
 Type: database.ProvisionerJobTypeWorkspaceBuild,
 })
 b := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: j.ID, WorkspaceID: w.ID})
 t := dbgen.ProvisionerJobTimings(s.T(), db, b, 2)
 check.Args(j.ID).Asserts(w, policy.ActionRead).Returns(t)
 }))
 s.Run("GetWorkspaceAgentScriptTimingsByBuildID", s.Subtest(func(db database.Store, check *expects) {
 workspace := dbgen.Workspace(s.T(), db, database.Workspace{})
 job := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
 Type: database.ProvisionerJobTypeWorkspaceBuild,
 })
 build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: job.ID, WorkspaceID: workspace.ID})
 resource := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{
 JobID: build.JobID,
 })
 agent := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{
 ResourceID: resource.ID,
 })
 script := dbgen.WorkspaceAgentScript(s.T(), db, database.WorkspaceAgentScript{
 WorkspaceAgentID: agent.ID,
 })
 timing := dbgen.WorkspaceAgentScriptTiming(s.T(), db, database.WorkspaceAgentScriptTiming{
 ScriptID: script.ID,
 })
 rows := []database.GetWorkspaceAgentScriptTimingsByBuildIDRow{
 {
 StartedAt:   timing.StartedAt,
 EndedAt:     timing.EndedAt,
 Stage:       timing.Stage,
 ScriptID:    timing.ScriptID,
 ExitCode:    timing.ExitCode,
 Status:      timing.Status,
 DisplayName: script.DisplayName,
 },
 }
 check.Args(build.ID).Asserts(rbac.ResourceSystem, policy.ActionRead).Returns(rows)
 }))
 }

 func (s *MethodTestSuite) TestNotifications() {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,7 +47,7 @@ func (s ScriptsAPI) ScriptCompleted(ctx context.Context, req agentproto.Worksp

		//nolint:gocritic // We need permissions to write to the DB here and we are in the context of the agent.
		ctx = dbauthz.AsProvisionerd(ctx)
		err = s.Database.InsertWorkspaceAgentScriptTimings(ctx, database.InsertWorkspaceAgentScriptTimingsParams{
		_,err = s.Database.InsertWorkspaceAgentScriptTimings(ctx, database.InsertWorkspaceAgentScriptTimingsParams{
		ScriptID: scriptID,
		Stage: stage,
		Status: status,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1165,6 +1165,7 @@ func New(options Options) API {
		r.Get("/parameters", api.workspaceBuildParameters)
		r.Get("/resources", api.workspaceBuildResourcesDeprecated)
		r.Get("/state", api.workspaceBuildState)
		r.Get("/timings", api.workspaceBuildTimings)
		})
		r.Route("/authcheck", func(r chi.Router) {
		r.Use(apiKeyMiddleware)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2421,6 +2421,13 @@ func (q *querier) GetWorkspaceAgentPortShare(ctx context.Context, arg database.G
		return q.db.GetWorkspaceAgentPortShare(ctx, arg)
		}

		func (q *querier) GetWorkspaceAgentScriptTimingsByBuildID(ctx context.Context, id uuid.UUID) ([]database.GetWorkspaceAgentScriptTimingsByBuildIDRow, error) {
		if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
		return nil, err
		}
		return q.db.GetWorkspaceAgentScriptTimingsByBuildID(ctx, id)
		}

		func (q *querier) GetWorkspaceAgentScriptsByAgentIDs(ctx context.Context, ids []uuid.UUID) ([]database.WorkspaceAgentScript, error) {
		if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
		return nil, err
Expand DownExpand Up		@@ -3034,9 +3041,9 @@ func (q *querier) InsertWorkspaceAgentMetadata(ctx context.Context, arg database
		return q.db.InsertWorkspaceAgentMetadata(ctx, arg)
		}

		func (q *querier) InsertWorkspaceAgentScriptTimings(ctx context.Context, arg database.InsertWorkspaceAgentScriptTimingsParams) error {
		func (q *querier) InsertWorkspaceAgentScriptTimings(ctx context.Context, arg database.InsertWorkspaceAgentScriptTimingsParams)(database.WorkspaceAgentScriptTiming,error) {
		if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
		return err
		returndatabase.WorkspaceAgentScriptTiming{},err
		}
		return q.db.InsertWorkspaceAgentScriptTimings(ctx, arg)
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -551,26 +551,6 @@ func (s *MethodTestSuite) TestProvisionerJob() {
		check.Args(database.UpdateProvisionerJobWithCancelByIDParams{ID: j.ID}).
		Asserts(v.RBACObject(tpl), []policy.Action{policy.ActionRead, policy.ActionUpdate}).Returns()
		}))
		s.Run("GetProvisionerJobTimingsByJobID", s.Subtest(func(db database.Store, check *expects) {
		w := dbgen.Workspace(s.T(), db, database.Workspace{})
		j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
		Type: database.ProvisionerJobTypeWorkspaceBuild,
		})
		_ = dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: j.ID, WorkspaceID: w.ID})
		t := dbgen.ProvisionerJobTimings(s.T(), db, database.InsertProvisionerJobTimingsParams{
		JobID: j.ID,
		StartedAt: []time.Time{dbtime.Now(), dbtime.Now()},
		EndedAt: []time.Time{dbtime.Now(), dbtime.Now()},
		Stage: []database.ProvisionerJobTimingStage{
		database.ProvisionerJobTimingStageInit,
		database.ProvisionerJobTimingStagePlan,
		},
		Source: []string{"source1", "source2"},
		Action: []string{"action1", "action2"},
		Resource: []string{"resource1", "resource2"},
		})
		check.Args(j.ID).Asserts(w, policy.ActionRead).Returns(t)
		}))
		s.Run("GetProvisionerJobsByIDs", s.Subtest(func(db database.Store, check *expects) {
		a := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
		b := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
Expand DownExpand Up		@@ -2861,6 +2841,46 @@ func (s *MethodTestSuite) TestSystemFunctions() {
		LastGeneratedAt: dbtime.Now(),
		}).Asserts(rbac.ResourceSystem, policy.ActionCreate)
		}))
		s.Run("GetProvisionerJobTimingsByJobID", s.Subtest(func(db database.Store, check *expects) {
		w := dbgen.Workspace(s.T(), db, database.Workspace{})
		j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
		Type: database.ProvisionerJobTypeWorkspaceBuild,
		})
		b := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: j.ID, WorkspaceID: w.ID})
		t := dbgen.ProvisionerJobTimings(s.T(), db, b, 2)
		check.Args(j.ID).Asserts(w, policy.ActionRead).Returns(t)
		}))
		s.Run("GetWorkspaceAgentScriptTimingsByBuildID", s.Subtest(func(db database.Store, check *expects) {
		workspace := dbgen.Workspace(s.T(), db, database.Workspace{})
		job := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
		Type: database.ProvisionerJobTypeWorkspaceBuild,
		})
		build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: job.ID, WorkspaceID: workspace.ID})
		resource := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{
		JobID: build.JobID,
		})
		agent := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{
		ResourceID: resource.ID,
		})
		script := dbgen.WorkspaceAgentScript(s.T(), db, database.WorkspaceAgentScript{
		WorkspaceAgentID: agent.ID,
		})
		timing := dbgen.WorkspaceAgentScriptTiming(s.T(), db, database.WorkspaceAgentScriptTiming{
		ScriptID: script.ID,
		})
		rows := []database.GetWorkspaceAgentScriptTimingsByBuildIDRow{
		{
		StartedAt: timing.StartedAt,
		EndedAt: timing.EndedAt,
		Stage: timing.Stage,
		ScriptID: timing.ScriptID,
		ExitCode: timing.ExitCode,
		Status: timing.Status,
		DisplayName: script.DisplayName,
		},
		}
		check.Args(build.ID).Asserts(rbac.ResourceSystem, policy.ActionRead).Returns(rows)
		}))
		}

		func (s *MethodTestSuite) TestNotifications() {
Expand Down