Rename queries

coder · kylecarbs · Mar 23, 2023 · Feb 23, 2023 · Feb 23, 2023 · Feb 23, 2023
commit 7ce73aaf87fed7c27163921982c84efd0717cb09
diff --git a/agent/agent.go b/agent/agent.go
@@ -88,7 +88,7 @@ type Client interface {
 	PostLifecycle(ctx context.Context, state agentsdk.PostLifecycleRequest) error
 	PostAppHealth(ctx context.Context, req agentsdk.PostAppHealthsRequest) error
 	PostStartup(ctx context.Context, req agentsdk.PostStartupRequest) error
-	InsertOrUpdateStartupLogs(ctx context.Context, req agentsdk.InsertOrUpdateStartupLogsRequest) error
+	AppendStartupLogs(ctx context.Context, req []agentsdk.StartupLog) error
 }
 
 func New(options Options) io.Closer {

diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -589,7 +589,7 @@ func New(options *Options) *API {
 				r.Get("/metadata", api.workspaceAgentMetadata)
 				r.Route("/startup", func(r chi.Router) {
 					r.Post("/", api.postWorkspaceAgentStartup)
-					r.Patch("/logs", api.insertOrUpdateStartupScriptLogs)
+					r.Patch("/logs", api.patchWorkspaceAgentStartupLogs)
 				})
 				r.Post("/app-health", api.postWorkspaceAppHealth)
 				r.Get("/gitauth", api.workspaceAgentsGitAuth)

diff --git a/coderd/database/dbauthz/querier.go b/coderd/database/dbauthz/querier.go
@@ -272,6 +272,14 @@ func (q *querier) GetProvisionerLogsByIDBetween(ctx context.Context, arg databas
 	return q.db.GetProvisionerLogsByIDBetween(ctx, arg)
 }
 
+func (q *querier) GetWorkspaceAgentStartupLogsBetween(ctx context.Context, arg database.GetWorkspaceAgentStartupLogsBetweenParams) ([]database.WorkspaceAgentStartupLog, error) {
+	_, err := q.GetWorkspaceAgentByID(ctx, arg.AgentID)
+	if err != nil {
+		return nil, err
+	}
+	return q.db.GetWorkspaceAgentStartupLogsBetween(ctx, arg)
+}
+
 func (q *querier) GetLicenses(ctx context.Context) ([]database.License, error) {
 	fetch := func(ctx context.Context, _ interface{}) ([]database.License, error) {
 		return q.db.GetLicenses(ctx)
@@ -1247,27 +1255,6 @@ func (q *querier) UpdateWorkspaceAgentStartupByID(ctx context.Context, arg datab
 	return q.db.UpdateWorkspaceAgentStartupByID(ctx, arg)
 }
 
-func (q *querier) GetStartupScriptLogsByJobID(ctx context.Context, jobID uuid.UUID) ([]database.StartupScriptLog, error) {
-	build, err := q.db.GetWorkspaceBuildByJobID(ctx, jobID)
-	if err != nil {
-		return nil, err
-	}
-	// Authorized fetch
-	_, err = q.GetWorkspaceByID(ctx, build.WorkspaceID)
-	if err != nil {
-		return nil, err
-	}
-	return q.db.GetStartupScriptLogsByJobID(ctx, jobID)
-}
-
-func (q *querier) InsertOrUpdateStartupScriptLog(ctx context.Context, arg database.InsertOrUpdateStartupScriptLogParams) error {
-	// Authorized fetch
-	if _, err := q.GetWorkspaceByAgentID(ctx, arg.AgentID); err != nil {
-		return err
-	}
-	return q.db.InsertOrUpdateStartupScriptLog(ctx, arg)
-}
-
 func (q *querier) GetWorkspaceAppByAgentIDAndSlug(ctx context.Context, arg database.GetWorkspaceAppByAgentIDAndSlugParams) (database.WorkspaceApp, error) {
 	// If we can fetch the workspace, we can fetch the apps. Use the authorized call.
 	if _, err := q.GetWorkspaceByAgentID(ctx, arg.AgentID); err != nil {

diff --git a/coderd/database/dbauthz/querier_test.go b/coderd/database/dbauthz/querier_test.go
@@ -1004,20 +1004,19 @@ func (s *MethodTestSuite) TestWorkspace() {
 			ID: agt.ID,
 		}).Asserts(ws, rbac.ActionUpdate).Returns()
 	}))
-	s.Run("GetStartupScriptLogsByJobID", s.Subtest(func(db database.Store, check *expects) {
+	s.Run("GetWorkspaceAgentStartupLogsBetween", s.Subtest(func(db database.Store, check *expects) {
 		ws := dbgen.Workspace(s.T(), db, database.Workspace{})
 		build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: uuid.New()})
-		check.Args(build.JobID).Asserts(ws, rbac.ActionRead).Returns([]database.StartupScriptLog{})
+		check.Args(build.JobID).Asserts(ws, rbac.ActionRead).Returns([]database.WorkspaceAgentStartupLog{})
 	}))
-	s.Run("InsertOrUpdateStartupScriptLog", s.Subtest(func(db database.Store, check *expects) {
+	s.Run("InsertWorkspaceAgentStartupLogs", s.Subtest(func(db database.Store, check *expects) {
 		ws := dbgen.Workspace(s.T(), db, database.Workspace{})
 		build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: uuid.New()})
 		res := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: build.JobID})
 		agt := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: res.ID})
-		check.Args(database.InsertOrUpdateStartupScriptLogParams{
+		check.Args(database.InsertWorkspaceAgentStartupLogsParams{
 			AgentID: agt.ID,
-			JobID:   build.JobID,
-			Output:  "test",
+			Output:  []string{"test"},
 		}).Asserts(ws, rbac.ActionUpdate).Returns()
 	}))
 	s.Run("GetWorkspaceAppByAgentIDAndSlug", s.Subtest(func(db database.Store, check *expects) {

diff --git a/coderd/database/dbauthz/system.go b/coderd/database/dbauthz/system.go
@@ -251,6 +251,10 @@ func (q *querier) InsertProvisionerJobLogs(ctx context.Context, arg database.Ins
 	return q.db.InsertProvisionerJobLogs(ctx, arg)
 }
 
+func (q *querier) InsertWorkspaceAgentStartupLogs(ctx context.Context, arg database.InsertWorkspaceAgentStartupLogsParams) ([]database.WorkspaceAgentStartupLog, error) {
+	return q.db.InsertWorkspaceAgentStartupLogs(ctx, arg)
+}
+
 func (q *querier) InsertProvisionerDaemon(ctx context.Context, arg database.InsertProvisionerDaemonParams) (database.ProvisionerDaemon, error) {
 	return q.db.InsertProvisionerDaemon(ctx, arg)
 }

diff --git a/coderd/database/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go
@@ -52,7 +52,6 @@ func New() database.Store {
 			parameterSchemas:          make([]database.ParameterSchema, 0),
 			parameterValues:           make([]database.ParameterValue, 0),
 			provisionerDaemons:        make([]database.ProvisionerDaemon, 0),
-			startupScriptLogs:         make([]database.StartupScriptLog, 0),
 			workspaceAgents:           make([]database.WorkspaceAgent, 0),
 			provisionerJobLogs:        make([]database.ProvisionerJobLog, 0),
 			workspaceResources:        make([]database.WorkspaceResource, 0),
@@ -61,6 +60,7 @@ func New() database.Store {
 			templateVersions:          make([]database.TemplateVersion, 0),
 			templates:                 make([]database.Template, 0),
 			workspaceAgentStats:       make([]database.WorkspaceAgentStat, 0),
+			workspaceAgentLogs:        make([]database.WorkspaceAgentStartupLog, 0),
 			workspaceBuilds:           make([]database.WorkspaceBuild, 0),
 			workspaceApps:             make([]database.WorkspaceApp, 0),
 			workspaces:                make([]database.Workspace, 0),
@@ -119,12 +119,12 @@ type data struct {
 	provisionerJobLogs        []database.ProvisionerJobLog
 	provisionerJobs           []database.ProvisionerJob
 	replicas                  []database.Replica
-	startupScriptLogs         []database.StartupScriptLog
 	templateVersions          []database.TemplateVersion
 	templateVersionParameters []database.TemplateVersionParameter
 	templateVersionVariables  []database.TemplateVersionVariable
 	templates                 []database.Template
 	workspaceAgents           []database.WorkspaceAgent
+	workspaceAgentLogs        []database.WorkspaceAgentStartupLog
 	workspaceApps             []database.WorkspaceApp
 	workspaceBuilds           []database.WorkspaceBuild
 	workspaceBuildParameters  []database.WorkspaceBuildParameter
@@ -3514,42 +3514,54 @@ func (q *fakeQuerier) UpdateWorkspaceAgentStartupByID(_ context.Context, arg dat
 	return sql.ErrNoRows
 }
 
-func (q *fakeQuerier) GetStartupScriptLogsByJobID(_ context.Context, jobID uuid.UUID) ([]database.StartupScriptLog, error) {
+func (q *fakeQuerier) GetWorkspaceAgentStartupLogsBetween(ctx context.Context, arg database.GetWorkspaceAgentStartupLogsBetweenParams) ([]database.WorkspaceAgentStartupLog, error) {
+	if err := validateDatabaseType(arg); err != nil {
+		return nil, err
+	}
+
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
-	logs := []database.StartupScriptLog{}
-	for _, log := range q.startupScriptLogs {
-		if log.JobID == jobID {
-			logs = append(logs, log)
+	logs := []database.WorkspaceAgentStartupLog{}
+	for _, log := range q.workspaceAgentLogs {
+		if log.AgentID != arg.AgentID {
+			continue
+		}
+		if arg.CreatedBefore != 0 && log.ID > arg.CreatedBefore {
+			continue
 		}
+		if arg.CreatedAfter != 0 && log.ID < arg.CreatedAfter {
+			continue
+		}
+		logs = append(logs, log)
 	}
-	return logs, sql.ErrNoRows
+	return logs, nil
 }
 
-func (q *fakeQuerier) InsertOrUpdateStartupScriptLog(_ context.Context, arg database.InsertOrUpdateStartupScriptLogParams) error {
+func (q *fakeQuerier) InsertWorkspaceAgentStartupLogs(ctx context.Context, arg database.InsertWorkspaceAgentStartupLogsParams) ([]database.WorkspaceAgentStartupLog, error) {
 	if err := validateDatabaseType(arg); err != nil {
-		return err
+		return nil, err
 	}
 
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
-	for index, log := range q.startupScriptLogs {
-		if log.JobID != arg.JobID {
-			continue
-		}
-
-		log.Output = arg.Output
-		q.startupScriptLogs[index] = log
-		return nil
+	logs := []database.WorkspaceAgentStartupLog{}
+	id := int64(1)
+	if len(q.workspaceAgentLogs) > 0 {
+		id = q.workspaceAgentLogs[len(q.workspaceAgentLogs)-1].ID
 	}
-	q.startupScriptLogs = append(q.startupScriptLogs, database.StartupScriptLog{
-		AgentID: arg.AgentID,
-		JobID:   arg.JobID,
-		Output:  arg.Output,
-	})
-	return nil
+	for index, output := range arg.Output {
+		id++
+		logs = append(logs, database.WorkspaceAgentStartupLog{
+			ID:        id,
+			AgentID:   arg.AgentID,
+			CreatedAt: arg.CreatedAt[index],
+			Output:    output,
+		})
+	}
+	q.workspaceAgentLogs = append(q.workspaceAgentLogs, logs...)
+	return logs, nil
 }
 
 func (q *fakeQuerier) UpdateProvisionerJobByID(_ context.Context, arg database.UpdateProvisionerJobByIDParams) error {

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000100_add_startup_logs.down.sql b/coderd/database/migrations/000100_add_startup_logs.down.sql
diff --git a/coderd/database/migrations/000100_add_startup_logs.up.sql b/coderd/database/migrations/000100_add_startup_logs.up.sql
diff --git a/coderd/database/migrations/000109_add_startup_logs.down.sql b/coderd/database/migrations/000109_add_startup_logs.down.sql
@@ -0,0 +1,2 @@
+DROP TABLE workspace_agent_startup_logs;
+DROP INDEX workspace_agent_startup_logs_id_agent_id_idx;
diff --git a/coderd/database/migrations/000109_add_startup_logs.up.sql b/coderd/database/migrations/000109_add_startup_logs.up.sql
@@ -0,0 +1,9 @@
+CREATE TABLE IF NOT EXISTS workspace_agent_startup_logs (
+    agent_id uuid NOT NULL REFERENCES workspace_agents (id) ON DELETE CASCADE,
+	id bigint NOT NULL,
+    created_at timestamptz NOT NULL,
+    output varchar(1024) NOT NULL,
+    UNIQUE(agent_id, id)
+);
+
+CREATE INDEX workspace_agent_startup_logs_id_agent_id_idx ON workspace_agent_startup_logs USING btree (agent_id, id ASC);
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		DROP TABLE workspace_agent_startup_logs;
		DROP INDEX workspace_agent_startup_logs_id_agent_id_idx;