feat: Refactor API routes to use UUIDs instead of friendly names (#401)

* Add client for agent

* Cleanup code

* Fix linting error

* Rename routes to be simpler

* Rename workspace history to workspace build

* Refactor HTTP middlewares to use UUIDs

* Cleanup routes

* Compiles!

* Fix files and organizations

* Fix querying

* Fix agent lock

* Cleanup database abstraction

* Add parameters

* Fix linting errors

* Fix log race

* Lock on close wait

* Fix log cleanup

* Fix e2e tests

* Fix upstream version of opencensus-go

* Update coderdtest.go

* Fix coverpkg

* Fix codecov ignore

database/databasefake/databasefake.go

@@ -28,9 +28,9 @@ func New() database.Store {
 		provisionerJobs:        make([]database.ProvisionerJob, 0),
 		provisionerJobLog:      make([]database.ProvisionerJobLog, 0),
 		workspace:              make([]database.Workspace, 0),
-		provisionerJobResource: make([]database.ProvisionerJobResource, 0),
-		workspaceHistory:       make([]database.WorkspaceHistory, 0),
-		provisionerJobAgent:    make([]database.ProvisionerJobAgent, 0),
+		provisionerJobResource: make([]database.WorkspaceResource, 0),
+		workspaceBuild:         make([]database.WorkspaceBuild, 0),
+		provisionerJobAgent:    make([]database.WorkspaceAgent, 0),
 	}
 }
 
@@ -52,11 +52,11 @@ type fakeQuerier struct {
 	projectVersion         []database.ProjectVersion
 	provisionerDaemons     []database.ProvisionerDaemon
 	provisionerJobs        []database.ProvisionerJob
-	provisionerJobAgent    []database.ProvisionerJobAgent
-	provisionerJobResource []database.ProvisionerJobResource
+	provisionerJobAgent    []database.WorkspaceAgent
+	provisionerJobResource []database.WorkspaceResource
 	provisionerJobLog      []database.ProvisionerJobLog
 	workspace              []database.Workspace
-	workspaceHistory       []database.WorkspaceHistory
+	workspaceBuild         []database.WorkspaceBuild
 }
 
 // InTx doesn't rollback data properly for in-memory yet.
@@ -92,6 +92,21 @@ func (q *fakeQuerier) AcquireProvisionerJob(_ context.Context, arg database.Acqu
 	return database.ProvisionerJob{}, sql.ErrNoRows
 }
 
+func (q *fakeQuerier) DeleteParameterValueByID(_ context.Context, id uuid.UUID) error {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for index, parameterValue := range q.parameterValue {
+		if parameterValue.ID.String() != id.String() {
+			continue
+		}
+		q.parameterValue[index] = q.parameterValue[len(q.parameterValue)-1]
+		q.parameterValue = q.parameterValue[:len(q.parameterValue)-1]
+		return nil
+	}
+	return sql.ErrNoRows
+}
+
 func (q *fakeQuerier) GetAPIKeyByID(_ context.Context, id string) (database.APIKey, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
@@ -210,41 +225,53 @@ func (q *fakeQuerier) GetWorkspaceOwnerCountsByProjectIDs(_ context.Context, pro
 	return res, nil
 }
 
-func (q *fakeQuerier) GetWorkspaceHistoryByID(_ context.Context, id uuid.UUID) (database.WorkspaceHistory, error) {
+func (q *fakeQuerier) GetWorkspaceBuildByID(_ context.Context, id uuid.UUID) (database.WorkspaceBuild, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
-	for _, history := range q.workspaceHistory {
+	for _, history := range q.workspaceBuild {
 		if history.ID.String() == id.String() {
 			return history, nil
 		}
 	}
-	return database.WorkspaceHistory{}, sql.ErrNoRows
+	return database.WorkspaceBuild{}, sql.ErrNoRows
 }
 
-func (q *fakeQuerier) GetWorkspaceHistoryByWorkspaceIDWithoutAfter(_ context.Context, workspaceID uuid.UUID) (database.WorkspaceHistory, error) {
+func (q *fakeQuerier) GetWorkspaceBuildByJobID(_ context.Context, jobID uuid.UUID) (database.WorkspaceBuild, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
-	for _, workspaceHistory := range q.workspaceHistory {
-		if workspaceHistory.WorkspaceID.String() != workspaceID.String() {
-			continue
-		}
-		if !workspaceHistory.AfterID.Valid {
-			return workspaceHistory, nil
+	for _, build := range q.workspaceBuild {
+		if build.JobID.String() == jobID.String() {
+			return build, nil
 		}
 	}
-	return database.WorkspaceHistory{}, sql.ErrNoRows
+	return database.WorkspaceBuild{}, sql.ErrNoRows
 }
 
-func (q *fakeQuerier) GetWorkspaceHistoryByWorkspaceID(_ context.Context, workspaceID uuid.UUID) ([]database.WorkspaceHistory, error) {
+func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDWithoutAfter(_ context.Context, workspaceID uuid.UUID) (database.WorkspaceBuild, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
-	history := make([]database.WorkspaceHistory, 0)
-	for _, workspaceHistory := range q.workspaceHistory {
-		if workspaceHistory.WorkspaceID.String() == workspaceID.String() {
-			history = append(history, workspaceHistory)
+	for _, workspaceBuild := range q.workspaceBuild {
+		if workspaceBuild.WorkspaceID.String() != workspaceID.String() {
+			continue
+		}
+		if !workspaceBuild.AfterID.Valid {
+			return workspaceBuild, nil
+		}
+	}
+	return database.WorkspaceBuild{}, sql.ErrNoRows
+}
+
+func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceID(_ context.Context, workspaceID uuid.UUID) ([]database.WorkspaceBuild, error) {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	history := make([]database.WorkspaceBuild, 0)
+	for _, workspaceBuild := range q.workspaceBuild {
+		if workspaceBuild.WorkspaceID.String() == workspaceID.String() {
+			history = append(history, workspaceBuild)
 		}
 	}
 	if len(history) == 0 {
@@ -253,40 +280,20 @@ func (q *fakeQuerier) GetWorkspaceHistoryByWorkspaceID(_ context.Context, worksp
 	return history, nil
 }
 
-func (q *fakeQuerier) GetWorkspaceHistoryByWorkspaceIDAndName(_ context.Context, arg database.GetWorkspaceHistoryByWorkspaceIDAndNameParams) (database.WorkspaceHistory, error) {
+func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDAndName(_ context.Context, arg database.GetWorkspaceBuildByWorkspaceIDAndNameParams) (database.WorkspaceBuild, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
-	for _, workspaceHistory := range q.workspaceHistory {
-		if workspaceHistory.WorkspaceID.String() != arg.WorkspaceID.String() {
+	for _, workspaceBuild := range q.workspaceBuild {
+		if workspaceBuild.WorkspaceID.String() != arg.WorkspaceID.String() {
 			continue
 		}
-		if !strings.EqualFold(workspaceHistory.Name, arg.Name) {
+		if !strings.EqualFold(workspaceBuild.Name, arg.Name) {
 			continue
 		}
-		return workspaceHistory, nil
+		return workspaceBuild, nil
 	}
-	return database.WorkspaceHistory{}, sql.ErrNoRows
-}
-
-func (q *fakeQuerier) GetWorkspacesByProjectAndUserID(_ context.Context, arg database.GetWorkspacesByProjectAndUserIDParams) ([]database.Workspace, error) {
-	q.mutex.Lock()
-	defer q.mutex.Unlock()
-
-	workspaces := make([]database.Workspace, 0)
-	for _, workspace := range q.workspace {
-		if workspace.OwnerID != arg.OwnerID {
-			continue
-		}
-		if workspace.ProjectID.String() != arg.ProjectID.String() {
-			continue
-		}
-		workspaces = append(workspaces, workspace)
-	}
-	if len(workspaces) == 0 {
-		return nil, sql.ErrNoRows
-	}
-	return workspaces, nil
+	return database.WorkspaceBuild{}, sql.ErrNoRows
 }
 
 func (q *fakeQuerier) GetWorkspacesByUserID(_ context.Context, ownerID string) ([]database.Workspace, error) {
@@ -406,7 +413,7 @@ func (q *fakeQuerier) GetProjectVersionsByProjectID(_ context.Context, projectID
 
 	version := make([]database.ProjectVersion, 0)
 	for _, projectVersion := range q.projectVersion {
-		if projectVersion.ProjectID.String() != projectID.String() {
+		if projectVersion.ProjectID.UUID.String() != projectID.String() {
 			continue
 		}
 		version = append(version, projectVersion)
@@ -422,7 +429,7 @@ func (q *fakeQuerier) GetProjectVersionByProjectIDAndName(_ context.Context, arg
 	defer q.mutex.Unlock()
 
 	for _, projectVersion := range q.projectVersion {
-		if projectVersion.ProjectID.String() != arg.ProjectID.String() {
+		if projectVersion.ProjectID.UUID.String() != arg.ProjectID.UUID.String() {
 			continue
 		}
 		if !strings.EqualFold(projectVersion.Name, arg.Name) {
@@ -463,17 +470,34 @@ func (q *fakeQuerier) GetParameterSchemasByJobID(_ context.Context, jobID uuid.U
 	return parameters, nil
 }
 
-func (q *fakeQuerier) GetProjectsByOrganizationIDs(_ context.Context, ids []string) ([]database.Project, error) {
+func (q *fakeQuerier) GetParameterValueByScopeAndName(_ context.Context, arg database.GetParameterValueByScopeAndNameParams) (database.ParameterValue, error) {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for _, parameterValue := range q.parameterValue {
+		if parameterValue.Scope != arg.Scope {
+			continue
+		}
+		if parameterValue.ScopeID != arg.ScopeID {
+			continue
+		}
+		if parameterValue.Name != arg.Name {
+			continue
+		}
+		return parameterValue, nil
+	}
+	return database.ParameterValue{}, sql.ErrNoRows
+}
+
+func (q *fakeQuerier) GetProjectsByOrganization(_ context.Context, organizationID string) ([]database.Project, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
 	projects := make([]database.Project, 0)
 	for _, project := range q.project {
-		for _, id := range ids {
-			if project.OrganizationID == id {
-				projects = append(projects, project)
-				break
-			}
+		if project.OrganizationID == organizationID {
+			projects = append(projects, project)
+			break
 		}
 	}
 	if len(projects) == 0 {
@@ -508,7 +532,19 @@ func (q *fakeQuerier) GetProvisionerDaemons(_ context.Context) ([]database.Provi
 	return q.provisionerDaemons, nil
 }
 
-func (q *fakeQuerier) GetProvisionerJobAgentByInstanceID(_ context.Context, instanceID string) (database.ProvisionerJobAgent, error) {
+func (q *fakeQuerier) GetWorkspaceAgentByAuthToken(_ context.Context, authToken uuid.UUID) (database.WorkspaceAgent, error) {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for _, agent := range q.provisionerJobAgent {
+		if agent.AuthToken.String() == authToken.String() {
+			return agent, nil
+		}
+	}
+	return database.WorkspaceAgent{}, sql.ErrNoRows
+}
+
+func (q *fakeQuerier) GetWorkspaceAgentByInstanceID(_ context.Context, instanceID string) (database.WorkspaceAgent, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
@@ -519,25 +555,19 @@ func (q *fakeQuerier) GetProvisionerJobAgentByInstanceID(_ context.Context, inst
 			return agent, nil
 		}
 	}
-	return database.ProvisionerJobAgent{}, sql.ErrNoRows
+	return database.WorkspaceAgent{}, sql.ErrNoRows
 }
 
-func (q *fakeQuerier) GetProvisionerJobAgentsByResourceIDs(_ context.Context, ids []uuid.UUID) ([]database.ProvisionerJobAgent, error) {
+func (q *fakeQuerier) GetWorkspaceAgentByResourceID(_ context.Context, resourceID uuid.UUID) (database.WorkspaceAgent, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
-	agents := make([]database.ProvisionerJobAgent, 0)
 	for _, agent := range q.provisionerJobAgent {
-		for _, id := range ids {
-			if agent.ResourceID.String() == id.String() {
-				agents = append(agents, agent)
-			}
+		if agent.ResourceID.String() == resourceID.String() {
+			return agent, nil
 		}
 	}
-	if len(agents) == 0 {
-		return nil, sql.ErrNoRows
-	}
-	return agents, nil
+	return database.WorkspaceAgent{}, sql.ErrNoRows
 }
 
 func (q *fakeQuerier) GetProvisionerDaemonByID(_ context.Context, id uuid.UUID) (database.ProvisionerDaemon, error) {
@@ -566,7 +596,7 @@ func (q *fakeQuerier) GetProvisionerJobByID(_ context.Context, id uuid.UUID) (da
 	return database.ProvisionerJob{}, sql.ErrNoRows
 }
 
-func (q *fakeQuerier) GetProvisionerJobResourceByID(_ context.Context, id uuid.UUID) (database.ProvisionerJobResource, error) {
+func (q *fakeQuerier) GetWorkspaceResourceByID(_ context.Context, id uuid.UUID) (database.WorkspaceResource, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
@@ -575,14 +605,14 @@ func (q *fakeQuerier) GetProvisionerJobResourceByID(_ context.Context, id uuid.U
 			return resource, nil
 		}
 	}
-	return database.ProvisionerJobResource{}, sql.ErrNoRows
+	return database.WorkspaceResource{}, sql.ErrNoRows
 }
 
-func (q *fakeQuerier) GetProvisionerJobResourcesByJobID(_ context.Context, jobID uuid.UUID) ([]database.ProvisionerJobResource, error) {
+func (q *fakeQuerier) GetWorkspaceResourcesByJobID(_ context.Context, jobID uuid.UUID) ([]database.WorkspaceResource, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
-	resources := make([]database.ProvisionerJobResource, 0)
+	resources := make([]database.WorkspaceResource, 0)
 	for _, resource := range q.provisionerJobResource {
 		if resource.JobID.String() != jobID.String() {
 			continue
@@ -595,6 +625,26 @@ func (q *fakeQuerier) GetProvisionerJobResourcesByJobID(_ context.Context, jobID
 	return resources, nil
 }
 
+func (q *fakeQuerier) GetProvisionerJobsByIDs(_ context.Context, ids []uuid.UUID) ([]database.ProvisionerJob, error) {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	jobs := make([]database.ProvisionerJob, 0)
+	for _, job := range q.provisionerJobs {
+		for _, id := range ids {
+			if id.String() == job.ID.String() {
+				jobs = append(jobs, job)
+				break
+			}
+		}
+	}
+	if len(jobs) == 0 {
+		return nil, sql.ErrNoRows
+	}
+
+	return jobs, nil
+}
+
 func (q *fakeQuerier) GetProvisionerLogsByIDBetween(_ context.Context, arg database.GetProvisionerLogsByIDBetweenParams) ([]database.ProvisionerJobLog, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
@@ -734,13 +784,14 @@ func (q *fakeQuerier) InsertProjectVersion(_ context.Context, arg database.Inser
 
 	//nolint:gosimple
 	version := database.ProjectVersion{
-		ID:          arg.ID,
-		ProjectID:   arg.ProjectID,
-		CreatedAt:   arg.CreatedAt,
-		UpdatedAt:   arg.UpdatedAt,
-		Name:        arg.Name,
-		Description: arg.Description,
-		ImportJobID: arg.ImportJobID,
+		ID:             arg.ID,
+		ProjectID:      arg.ProjectID,
+		OrganizationID: arg.OrganizationID,
+		CreatedAt:      arg.CreatedAt,
+		UpdatedAt:      arg.UpdatedAt,
+		Name:           arg.Name,
+		Description:    arg.Description,
+		JobID:          arg.JobID,
 	}
 	q.projectVersion = append(q.projectVersion, version)
 	return version, nil
@@ -797,10 +848,11 @@ func (q *fakeQuerier) InsertProvisionerDaemon(_ context.Context, arg database.In
 	defer q.mutex.Unlock()
 
 	daemon := database.ProvisionerDaemon{
-		ID:           arg.ID,
-		CreatedAt:    arg.CreatedAt,
-		Name:         arg.Name,
-		Provisioners: arg.Provisioners,
+		ID:             arg.ID,
+		CreatedAt:      arg.CreatedAt,
+		OrganizationID: arg.OrganizationID,
+		Name:           arg.Name,
+		Provisioners:   arg.Provisioners,
 	}
 	q.provisionerDaemons = append(q.provisionerDaemons, daemon)
 	return daemon, nil
@@ -826,12 +878,12 @@ func (q *fakeQuerier) InsertProvisionerJob(_ context.Context, arg database.Inser
 	return job, nil
 }
 
-func (q *fakeQuerier) InsertProvisionerJobAgent(_ context.Context, arg database.InsertProvisionerJobAgentParams) (database.ProvisionerJobAgent, error) {
+func (q *fakeQuerier) InsertWorkspaceAgent(_ context.Context, arg database.InsertWorkspaceAgentParams) (database.WorkspaceAgent, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
 	//nolint:gosimple
-	agent := database.ProvisionerJobAgent{
+	agent := database.WorkspaceAgent{
 		ID:                   arg.ID,
 		CreatedAt:            arg.CreatedAt,
 		UpdatedAt:            arg.UpdatedAt,
@@ -847,12 +899,12 @@ func (q *fakeQuerier) InsertProvisionerJobAgent(_ context.Context, arg database.
 	return agent, nil
 }
 
-func (q *fakeQuerier) InsertProvisionerJobResource(_ context.Context, arg database.InsertProvisionerJobResourceParams) (database.ProvisionerJobResource, error) {
+func (q *fakeQuerier) InsertWorkspaceResource(_ context.Context, arg database.InsertWorkspaceResourceParams) (database.WorkspaceResource, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
 	//nolint:gosimple
-	resource := database.ProvisionerJobResource{
+	resource := database.WorkspaceResource{
 		ID:         arg.ID,
 		CreatedAt:  arg.CreatedAt,
 		JobID:      arg.JobID,
@@ -900,11 +952,11 @@ func (q *fakeQuerier) InsertWorkspace(_ context.Context, arg database.InsertWork
 	return workspace, nil
 }
 
-func (q *fakeQuerier) InsertWorkspaceHistory(_ context.Context, arg database.InsertWorkspaceHistoryParams) (database.WorkspaceHistory, error) {
+func (q *fakeQuerier) InsertWorkspaceBuild(_ context.Context, arg database.InsertWorkspaceBuildParams) (database.WorkspaceBuild, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
-	workspaceHistory := database.WorkspaceHistory{
+	workspaceBuild := database.WorkspaceBuild{
 		ID:               arg.ID,
 		CreatedAt:        arg.CreatedAt,
 		UpdatedAt:        arg.UpdatedAt,
@@ -914,11 +966,11 @@ func (q *fakeQuerier) InsertWorkspaceHistory(_ context.Context, arg database.Ins
 		BeforeID:         arg.BeforeID,
 		Transition:       arg.Transition,
 		Initiator:        arg.Initiator,
-		ProvisionJobID:   arg.ProvisionJobID,
+		JobID:            arg.JobID,
 		ProvisionerState: arg.ProvisionerState,
 	}
-	q.workspaceHistory = append(q.workspaceHistory, workspaceHistory)
-	return workspaceHistory, nil
+	q.workspaceBuild = append(q.workspaceBuild, workspaceBuild)
+	return workspaceBuild, nil
 }
 
 func (q *fakeQuerier) UpdateAPIKeyByID(_ context.Context, arg database.UpdateAPIKeyByIDParams) error {
@@ -940,6 +992,22 @@ func (q *fakeQuerier) UpdateAPIKeyByID(_ context.Context, arg database.UpdateAPI
 	return sql.ErrNoRows
 }
 
+func (q *fakeQuerier) UpdateProjectVersionByID(_ context.Context, arg database.UpdateProjectVersionByIDParams) error {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for index, projectVersion := range q.projectVersion {
+		if projectVersion.ID.String() != arg.ID.String() {
+			continue
+		}
+		projectVersion.ProjectID = arg.ProjectID
+		projectVersion.UpdatedAt = arg.UpdatedAt
+		q.projectVersion[index] = projectVersion
+		return nil
+	}
+	return sql.ErrNoRows
+}
+
 func (q *fakeQuerier) UpdateProvisionerDaemonByID(_ context.Context, arg database.UpdateProvisionerDaemonByIDParams) error {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
@@ -956,6 +1024,21 @@ func (q *fakeQuerier) UpdateProvisionerDaemonByID(_ context.Context, arg databas
 	return sql.ErrNoRows
 }
 
+func (q *fakeQuerier) UpdateWorkspaceAgentByID(_ context.Context, arg database.UpdateWorkspaceAgentByIDParams) error {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for index, agent := range q.provisionerJobAgent {
+		if agent.ID.String() != arg.ID.String() {
+			continue
+		}
+		agent.UpdatedAt = arg.UpdatedAt
+		q.provisionerJobAgent[index] = agent
+		return nil
+	}
+	return sql.ErrNoRows
+}
+
 func (q *fakeQuerier) UpdateProvisionerJobByID(_ context.Context, arg database.UpdateProvisionerJobByIDParams) error {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
@@ -989,18 +1072,18 @@ func (q *fakeQuerier) UpdateProvisionerJobWithCompleteByID(_ context.Context, ar
 	return sql.ErrNoRows
 }
 
-func (q *fakeQuerier) UpdateWorkspaceHistoryByID(_ context.Context, arg database.UpdateWorkspaceHistoryByIDParams) error {
+func (q *fakeQuerier) UpdateWorkspaceBuildByID(_ context.Context, arg database.UpdateWorkspaceBuildByIDParams) error {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
-	for index, workspaceHistory := range q.workspaceHistory {
-		if workspaceHistory.ID.String() != arg.ID.String() {
+	for index, workspaceBuild := range q.workspaceBuild {
+		if workspaceBuild.ID.String() != arg.ID.String() {
 			continue
 		}
-		workspaceHistory.UpdatedAt = arg.UpdatedAt
-		workspaceHistory.AfterID = arg.AfterID
-		workspaceHistory.ProvisionerState = arg.ProvisionerState
-		q.workspaceHistory[index] = workspaceHistory
+		workspaceBuild.UpdatedAt = arg.UpdatedAt
+		workspaceBuild.AfterID = arg.AfterID
+		workspaceBuild.ProvisionerState = arg.ProvisionerState
+		q.workspaceBuild[index] = workspaceBuild
 		return nil
 	}
 	return sql.ErrNoRows

database/dump.sql

@@ -45,7 +45,7 @@ CREATE TYPE parameter_type_system AS ENUM (
 
 CREATE TYPE provisioner_job_type AS ENUM (
     'project_version_import',
-    'workspace_provision'
+    'workspace_build'
 );
 
 CREATE TYPE provisioner_storage_method AS ENUM (
@@ -143,11 +143,11 @@ CREATE TABLE parameter_schema (
 
 CREATE TABLE parameter_value (
     id uuid NOT NULL,
-    name character varying(64) NOT NULL,
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL,
     scope parameter_scope NOT NULL,
     scope_id text NOT NULL,
+    name character varying(64) NOT NULL,
     source_scheme parameter_source_scheme NOT NULL,
     source_value text NOT NULL,
     destination_scheme parameter_destination_scheme NOT NULL
@@ -165,18 +165,20 @@ CREATE TABLE project (
 
 CREATE TABLE project_version (
     id uuid NOT NULL,
-    project_id uuid NOT NULL,
+    project_id uuid,
+    organization_id text NOT NULL,
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL,
     name character varying(64) NOT NULL,
     description character varying(1048576) NOT NULL,
-    import_job_id uuid NOT NULL
+    job_id uuid NOT NULL
 );
 
 CREATE TABLE provisioner_daemon (
     id uuid NOT NULL,
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone,
+    organization_id text,
     name character varying(64) NOT NULL,
     provisioners provisioner_type[] NOT NULL
 );
@@ -199,19 +201,6 @@ CREATE TABLE provisioner_job (
     worker_id uuid
 );
 
-CREATE TABLE provisioner_job_agent (
-    id uuid NOT NULL,
-    created_at timestamp with time zone NOT NULL,
-    updated_at timestamp with time zone,
-    resource_id uuid NOT NULL,
-    auth_token uuid NOT NULL,
-    auth_instance_id character varying(64),
-    environment_variables jsonb,
-    startup_script character varying(65534),
-    instance_metadata jsonb,
-    resource_metadata jsonb
-);
-
 CREATE TABLE provisioner_job_log (
     id uuid NOT NULL,
     job_id uuid NOT NULL,
@@ -221,16 +210,6 @@ CREATE TABLE provisioner_job_log (
     output character varying(1024) NOT NULL
 );
 
-CREATE TABLE provisioner_job_resource (
-    id uuid NOT NULL,
-    created_at timestamp with time zone NOT NULL,
-    job_id uuid NOT NULL,
-    transition workspace_transition NOT NULL,
-    type character varying(256) NOT NULL,
-    name character varying(64) NOT NULL,
-    agent_id uuid
-);
-
 CREATE TABLE users (
     id text NOT NULL,
     email text NOT NULL,
@@ -262,7 +241,20 @@ CREATE TABLE workspace (
     name character varying(64) NOT NULL
 );
 
-CREATE TABLE workspace_history (
+CREATE TABLE workspace_agent (
+    id uuid NOT NULL,
+    created_at timestamp with time zone NOT NULL,
+    updated_at timestamp with time zone,
+    resource_id uuid NOT NULL,
+    auth_token uuid NOT NULL,
+    auth_instance_id character varying(64),
+    environment_variables jsonb,
+    startup_script character varying(65534),
+    instance_metadata jsonb,
+    resource_metadata jsonb
+);
+
+CREATE TABLE workspace_build (
     id uuid NOT NULL,
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL,
@@ -274,7 +266,17 @@ CREATE TABLE workspace_history (
     transition workspace_transition NOT NULL,
     initiator character varying(255) NOT NULL,
     provisioner_state bytea,
-    provision_job_id uuid NOT NULL
+    job_id uuid NOT NULL
+);
+
+CREATE TABLE workspace_resource (
+    id uuid NOT NULL,
+    created_at timestamp with time zone NOT NULL,
+    job_id uuid NOT NULL,
+    transition workspace_transition NOT NULL,
+    type character varying(256) NOT NULL,
+    name character varying(64) NOT NULL,
+    agent_id uuid
 );
 
 ALTER TABLE ONLY file
@@ -290,7 +292,7 @@ ALTER TABLE ONLY parameter_value
     ADD CONSTRAINT parameter_value_id_key UNIQUE (id);
 
 ALTER TABLE ONLY parameter_value
-    ADD CONSTRAINT parameter_value_name_scope_scope_id_key UNIQUE (name, scope, scope_id);
+    ADD CONSTRAINT parameter_value_scope_id_name_key UNIQUE (scope_id, name);
 
 ALTER TABLE ONLY project
     ADD CONSTRAINT project_id_key UNIQUE (id);
@@ -310,26 +312,26 @@ ALTER TABLE ONLY provisioner_daemon
 ALTER TABLE ONLY provisioner_daemon
     ADD CONSTRAINT provisioner_daemon_name_key UNIQUE (name);
 
-ALTER TABLE ONLY provisioner_job_agent
-    ADD CONSTRAINT provisioner_job_agent_auth_token_key UNIQUE (auth_token);
-
-ALTER TABLE ONLY provisioner_job_agent
-    ADD CONSTRAINT provisioner_job_agent_id_key UNIQUE (id);
-
 ALTER TABLE ONLY provisioner_job
     ADD CONSTRAINT provisioner_job_id_key UNIQUE (id);
 
 ALTER TABLE ONLY provisioner_job_log
     ADD CONSTRAINT provisioner_job_log_id_key UNIQUE (id);
 
-ALTER TABLE ONLY provisioner_job_resource
-    ADD CONSTRAINT provisioner_job_resource_id_key UNIQUE (id);
+ALTER TABLE ONLY workspace_agent
+    ADD CONSTRAINT workspace_agent_auth_token_key UNIQUE (auth_token);
 
-ALTER TABLE ONLY workspace_history
-    ADD CONSTRAINT workspace_history_id_key UNIQUE (id);
+ALTER TABLE ONLY workspace_agent
+    ADD CONSTRAINT workspace_agent_id_key UNIQUE (id);
 
-ALTER TABLE ONLY workspace_history
-    ADD CONSTRAINT workspace_history_workspace_id_name_key UNIQUE (workspace_id, name);
+ALTER TABLE ONLY workspace_build
+    ADD CONSTRAINT workspace_build_id_key UNIQUE (id);
+
+ALTER TABLE ONLY workspace_build
+    ADD CONSTRAINT workspace_build_job_id_key UNIQUE (job_id);
+
+ALTER TABLE ONLY workspace_build
+    ADD CONSTRAINT workspace_build_workspace_id_name_key UNIQUE (workspace_id, name);
 
 ALTER TABLE ONLY workspace
     ADD CONSTRAINT workspace_id_key UNIQUE (id);
@@ -337,27 +339,33 @@ ALTER TABLE ONLY workspace
 ALTER TABLE ONLY workspace
     ADD CONSTRAINT workspace_owner_id_name_key UNIQUE (owner_id, name);
 
+ALTER TABLE ONLY workspace_resource
+    ADD CONSTRAINT workspace_resource_id_key UNIQUE (id);
+
 ALTER TABLE ONLY parameter_schema
     ADD CONSTRAINT parameter_schema_job_id_fkey FOREIGN KEY (job_id) REFERENCES provisioner_job(id) ON DELETE CASCADE;
 
 ALTER TABLE ONLY project_version
     ADD CONSTRAINT project_version_project_id_fkey FOREIGN KEY (project_id) REFERENCES project(id);
 
-ALTER TABLE ONLY provisioner_job_agent
-    ADD CONSTRAINT provisioner_job_agent_resource_id_fkey FOREIGN KEY (resource_id) REFERENCES provisioner_job_resource(id) ON DELETE CASCADE;
-
 ALTER TABLE ONLY provisioner_job_log
     ADD CONSTRAINT provisioner_job_log_job_id_fkey FOREIGN KEY (job_id) REFERENCES provisioner_job(id) ON DELETE CASCADE;
 
-ALTER TABLE ONLY provisioner_job_resource
-    ADD CONSTRAINT provisioner_job_resource_job_id_fkey FOREIGN KEY (job_id) REFERENCES provisioner_job(id) ON DELETE CASCADE;
+ALTER TABLE ONLY workspace_agent
+    ADD CONSTRAINT workspace_agent_resource_id_fkey FOREIGN KEY (resource_id) REFERENCES workspace_resource(id) ON DELETE CASCADE;
 
-ALTER TABLE ONLY workspace_history
-    ADD CONSTRAINT workspace_history_project_version_id_fkey FOREIGN KEY (project_version_id) REFERENCES project_version(id) ON DELETE CASCADE;
+ALTER TABLE ONLY workspace_build
+    ADD CONSTRAINT workspace_build_job_id_fkey FOREIGN KEY (job_id) REFERENCES provisioner_job(id) ON DELETE CASCADE;
 
-ALTER TABLE ONLY workspace_history
-    ADD CONSTRAINT workspace_history_workspace_id_fkey FOREIGN KEY (workspace_id) REFERENCES workspace(id) ON DELETE CASCADE;
+ALTER TABLE ONLY workspace_build
+    ADD CONSTRAINT workspace_build_project_version_id_fkey FOREIGN KEY (project_version_id) REFERENCES project_version(id) ON DELETE CASCADE;
+
+ALTER TABLE ONLY workspace_build
+    ADD CONSTRAINT workspace_build_workspace_id_fkey FOREIGN KEY (workspace_id) REFERENCES workspace(id) ON DELETE CASCADE;
 
 ALTER TABLE ONLY workspace
     ADD CONSTRAINT workspace_project_id_fkey FOREIGN KEY (project_id) REFERENCES project(id);
 
+ALTER TABLE ONLY workspace_resource
+    ADD CONSTRAINT workspace_resource_job_id_fkey FOREIGN KEY (job_id) REFERENCES provisioner_job(id) ON DELETE CASCADE;
+

database/migrations/000002_projects.up.sql

@@ -33,7 +33,8 @@ CREATE TABLE project (
 CREATE TABLE project_version (
     id uuid NOT NULL UNIQUE,
     -- This should be indexed.
-    project_id uuid NOT NULL REFERENCES project (id),
+    project_id uuid REFERENCES project (id),
+    organization_id text NOT NULL,
     created_at timestamptz NOT NULL,
     updated_at timestamptz NOT NULL,
     -- Name is generated for ease of differentiation.
@@ -42,9 +43,8 @@ CREATE TABLE project_version (
     -- Extracted from a README.md on import.
     -- Maximum of 1MB.
     description varchar(1048576) NOT NULL,
-    -- The import job for a Project Version. This is used
-    -- to detect if an import was successful.
-    import_job_id uuid NOT NULL,
+    -- The job ID for building the project version.
+    job_id uuid NOT NULL,
     -- Disallow projects to have the same build name
     -- multiple times.
     UNIQUE(project_id, name)

database/migrations/000003_workspaces.up.sql

@@ -14,21 +14,3 @@ CREATE TYPE workspace_transition AS ENUM (
     'delete'
 );
 
--- Workspace transition represents a change in workspace state.
-CREATE TABLE workspace_history (
-    id uuid NOT NULL UNIQUE,
-    created_at timestamptz NOT NULL,
-    updated_at timestamptz NOT NULL,
-    workspace_id uuid NOT NULL REFERENCES workspace (id) ON DELETE CASCADE,
-    project_version_id uuid NOT NULL REFERENCES project_version (id) ON DELETE CASCADE,
-    name varchar(64) NOT NULL,
-    before_id uuid,
-    after_id uuid,
-    transition workspace_transition NOT NULL,
-    initiator varchar(255) NOT NULL,
-    -- State stored by the provisioner
-    provisioner_state bytea,
-    -- Job ID of the action
-    provision_job_id uuid NOT NULL,
-    UNIQUE(workspace_id, name)
-);

database/migrations/000004_jobs.up.sql

@@ -2,6 +2,7 @@ CREATE TABLE IF NOT EXISTS provisioner_daemon (
     id uuid NOT NULL UNIQUE,
     created_at timestamptz NOT NULL,
     updated_at timestamptz,
+    organization_id text,
     -- Name is generated for ease of differentiation.
     -- eg. WowBananas16
     name varchar(64) NOT NULL UNIQUE,
@@ -10,7 +11,7 @@ CREATE TABLE IF NOT EXISTS provisioner_daemon (
 
 CREATE TYPE provisioner_job_type AS ENUM (
     'project_version_import',
-    'workspace_provision'
+    'workspace_build'
 );
 
 CREATE TYPE provisioner_storage_method AS ENUM ('file');
@@ -55,8 +56,7 @@ CREATE TABLE IF NOT EXISTS provisioner_job_log (
     output varchar(1024) NOT NULL
 );
 
--- Resources from multiple workspace states are stored here post project-import job.
-CREATE TABLE provisioner_job_resource (
+CREATE TABLE workspace_resource (
     id uuid NOT NULL UNIQUE,
     created_at timestamptz NOT NULL,
     job_id uuid NOT NULL REFERENCES provisioner_job(id) ON DELETE CASCADE,
@@ -66,12 +66,11 @@ CREATE TABLE provisioner_job_resource (
     agent_id uuid
 );
 
--- Agents that associate with a specific resource.
-CREATE TABLE provisioner_job_agent (
+CREATE TABLE workspace_agent (
     id uuid NOT NULL UNIQUE,
     created_at timestamptz NOT NULL,
     updated_at timestamptz,
-    resource_id uuid NOT NULL REFERENCES provisioner_job_resource (id) ON DELETE CASCADE,
+    resource_id uuid NOT NULL REFERENCES workspace_resource (id) ON DELETE CASCADE,
     auth_token uuid NOT NULL UNIQUE,
     auth_instance_id varchar(64),
     environment_variables jsonb,
@@ -133,14 +132,32 @@ CREATE TABLE parameter_schema (
 -- Parameters are provided to jobs for provisioning and to workspaces.
 CREATE TABLE parameter_value (
     id uuid NOT NULL UNIQUE,
-    name varchar(64) NOT NULL,
     created_at timestamptz NOT NULL,
     updated_at timestamptz NOT NULL,
     scope parameter_scope NOT NULL,
     scope_id text NOT NULL,
+    name varchar(64) NOT NULL,
     source_scheme parameter_source_scheme NOT NULL,
     source_value text NOT NULL,
     destination_scheme parameter_destination_scheme NOT NULL,
     -- Prevents duplicates for parameters in the same scope.
-    UNIQUE(name, scope, scope_id)
+    UNIQUE(scope_id, name)
 );
+
+CREATE TABLE workspace_build (
+    id uuid NOT NULL UNIQUE,
+    created_at timestamptz NOT NULL,
+    updated_at timestamptz NOT NULL,
+    workspace_id uuid NOT NULL REFERENCES workspace (id) ON DELETE CASCADE,
+    project_version_id uuid NOT NULL REFERENCES project_version (id) ON DELETE CASCADE,
+    name varchar(64) NOT NULL,
+    before_id uuid,
+    after_id uuid,
+    transition workspace_transition NOT NULL,
+    initiator varchar(255) NOT NULL,
+    -- State stored by the provisioner
+    provisioner_state bytea,
+    -- Job ID of the action
+    job_id uuid NOT NULL UNIQUE REFERENCES provisioner_job(id) ON DELETE CASCADE,
+    UNIQUE(workspace_id, name)
+);

database/models.go

@@ -157,7 +157,7 @@ type ProvisionerJobType string
 
 const (
 	ProvisionerJobTypeProjectVersionImport ProvisionerJobType = "project_version_import"
-	ProvisionerJobTypeWorkspaceProvision   ProvisionerJobType = "workspace_provision"
+	ProvisionerJobTypeWorkspaceBuild       ProvisionerJobType = "workspace_build"
 )
 
 func (e *ProvisionerJobType) Scan(src interface{}) error {
@@ -323,11 +323,11 @@ type ParameterSchema struct {
 
 type ParameterValue struct {
 	ID                uuid.UUID                  `db:"id" json:"id"`
-	Name              string                     `db:"name" json:"name"`
 	CreatedAt         time.Time                  `db:"created_at" json:"created_at"`
 	UpdatedAt         time.Time                  `db:"updated_at" json:"updated_at"`
 	Scope             ParameterScope             `db:"scope" json:"scope"`
 	ScopeID           string                     `db:"scope_id" json:"scope_id"`
+	Name              string                     `db:"name" json:"name"`
 	SourceScheme      ParameterSourceScheme      `db:"source_scheme" json:"source_scheme"`
 	SourceValue       string                     `db:"source_value" json:"source_value"`
 	DestinationScheme ParameterDestinationScheme `db:"destination_scheme" json:"destination_scheme"`
@@ -344,21 +344,23 @@ type Project struct {
 }
 
 type ProjectVersion struct {
-	ID          uuid.UUID `db:"id" json:"id"`
-	ProjectID   uuid.UUID `db:"project_id" json:"project_id"`
-	CreatedAt   time.Time `db:"created_at" json:"created_at"`
-	UpdatedAt   time.Time `db:"updated_at" json:"updated_at"`
-	Name        string    `db:"name" json:"name"`
-	Description string    `db:"description" json:"description"`
-	ImportJobID uuid.UUID `db:"import_job_id" json:"import_job_id"`
+	ID             uuid.UUID     `db:"id" json:"id"`
+	ProjectID      uuid.NullUUID `db:"project_id" json:"project_id"`
+	OrganizationID string        `db:"organization_id" json:"organization_id"`
+	CreatedAt      time.Time     `db:"created_at" json:"created_at"`
+	UpdatedAt      time.Time     `db:"updated_at" json:"updated_at"`
+	Name           string        `db:"name" json:"name"`
+	Description    string        `db:"description" json:"description"`
+	JobID          uuid.UUID     `db:"job_id" json:"job_id"`
 }
 
 type ProvisionerDaemon struct {
-	ID           uuid.UUID         `db:"id" json:"id"`
-	CreatedAt    time.Time         `db:"created_at" json:"created_at"`
-	UpdatedAt    sql.NullTime      `db:"updated_at" json:"updated_at"`
-	Name         string            `db:"name" json:"name"`
-	Provisioners []ProvisionerType `db:"provisioners" json:"provisioners"`
+	ID             uuid.UUID         `db:"id" json:"id"`
+	CreatedAt      time.Time         `db:"created_at" json:"created_at"`
+	UpdatedAt      sql.NullTime      `db:"updated_at" json:"updated_at"`
+	OrganizationID sql.NullString    `db:"organization_id" json:"organization_id"`
+	Name           string            `db:"name" json:"name"`
+	Provisioners   []ProvisionerType `db:"provisioners" json:"provisioners"`
 }
 
 type ProvisionerJob struct {
@@ -379,19 +381,6 @@ type ProvisionerJob struct {
 	WorkerID       uuid.NullUUID            `db:"worker_id" json:"worker_id"`
 }
 
-type ProvisionerJobAgent struct {
-	ID                   uuid.UUID             `db:"id" json:"id"`
-	CreatedAt            time.Time             `db:"created_at" json:"created_at"`
-	UpdatedAt            sql.NullTime          `db:"updated_at" json:"updated_at"`
-	ResourceID           uuid.UUID             `db:"resource_id" json:"resource_id"`
-	AuthToken            uuid.UUID             `db:"auth_token" json:"auth_token"`
-	AuthInstanceID       sql.NullString        `db:"auth_instance_id" json:"auth_instance_id"`
-	EnvironmentVariables pqtype.NullRawMessage `db:"environment_variables" json:"environment_variables"`
-	StartupScript        sql.NullString        `db:"startup_script" json:"startup_script"`
-	InstanceMetadata     pqtype.NullRawMessage `db:"instance_metadata" json:"instance_metadata"`
-	ResourceMetadata     pqtype.NullRawMessage `db:"resource_metadata" json:"resource_metadata"`
-}
-
 type ProvisionerJobLog struct {
 	ID        uuid.UUID `db:"id" json:"id"`
 	JobID     uuid.UUID `db:"job_id" json:"job_id"`
@@ -401,16 +390,6 @@ type ProvisionerJobLog struct {
 	Output    string    `db:"output" json:"output"`
 }
 
-type ProvisionerJobResource struct {
-	ID         uuid.UUID           `db:"id" json:"id"`
-	CreatedAt  time.Time           `db:"created_at" json:"created_at"`
-	JobID      uuid.UUID           `db:"job_id" json:"job_id"`
-	Transition WorkspaceTransition `db:"transition" json:"transition"`
-	Type       string              `db:"type" json:"type"`
-	Name       string              `db:"name" json:"name"`
-	AgentID    uuid.NullUUID       `db:"agent_id" json:"agent_id"`
-}
-
 type User struct {
 	ID                  string     `db:"id" json:"id"`
 	Email               string     `db:"email" json:"email"`
@@ -442,7 +421,20 @@ type Workspace struct {
 	Name      string    `db:"name" json:"name"`
 }
 
-type WorkspaceHistory struct {
+type WorkspaceAgent struct {
+	ID                   uuid.UUID             `db:"id" json:"id"`
+	CreatedAt            time.Time             `db:"created_at" json:"created_at"`
+	UpdatedAt            sql.NullTime          `db:"updated_at" json:"updated_at"`
+	ResourceID           uuid.UUID             `db:"resource_id" json:"resource_id"`
+	AuthToken            uuid.UUID             `db:"auth_token" json:"auth_token"`
+	AuthInstanceID       sql.NullString        `db:"auth_instance_id" json:"auth_instance_id"`
+	EnvironmentVariables pqtype.NullRawMessage `db:"environment_variables" json:"environment_variables"`
+	StartupScript        sql.NullString        `db:"startup_script" json:"startup_script"`
+	InstanceMetadata     pqtype.NullRawMessage `db:"instance_metadata" json:"instance_metadata"`
+	ResourceMetadata     pqtype.NullRawMessage `db:"resource_metadata" json:"resource_metadata"`
+}
+
+type WorkspaceBuild struct {
 	ID               uuid.UUID           `db:"id" json:"id"`
 	CreatedAt        time.Time           `db:"created_at" json:"created_at"`
 	UpdatedAt        time.Time           `db:"updated_at" json:"updated_at"`
@@ -454,5 +446,15 @@ type WorkspaceHistory struct {
 	Transition       WorkspaceTransition `db:"transition" json:"transition"`
 	Initiator        string              `db:"initiator" json:"initiator"`
 	ProvisionerState []byte              `db:"provisioner_state" json:"provisioner_state"`
-	ProvisionJobID   uuid.UUID           `db:"provision_job_id" json:"provision_job_id"`
+	JobID            uuid.UUID           `db:"job_id" json:"job_id"`
+}
+
+type WorkspaceResource struct {
+	ID         uuid.UUID           `db:"id" json:"id"`
+	CreatedAt  time.Time           `db:"created_at" json:"created_at"`
+	JobID      uuid.UUID           `db:"job_id" json:"job_id"`
+	Transition WorkspaceTransition `db:"transition" json:"transition"`
+	Type       string              `db:"type" json:"type"`
+	Name       string              `db:"name" json:"name"`
+	AgentID    uuid.NullUUID       `db:"agent_id" json:"agent_id"`
 }

database/querier.go

@@ -10,6 +10,7 @@ import (
 
 type querier interface {
 	AcquireProvisionerJob(ctx context.Context, arg AcquireProvisionerJobParams) (ProvisionerJob, error)
+	DeleteParameterValueByID(ctx context.Context, id uuid.UUID) error
 	GetAPIKeyByID(ctx context.Context, id string) (APIKey, error)
 	GetFileByHash(ctx context.Context, hash string) (File, error)
 	GetOrganizationByID(ctx context.Context, id string) (Organization, error)
@@ -17,32 +18,35 @@ type querier interface {
 	GetOrganizationMemberByUserID(ctx context.Context, arg GetOrganizationMemberByUserIDParams) (OrganizationMember, error)
 	GetOrganizationsByUserID(ctx context.Context, userID string) ([]Organization, error)
 	GetParameterSchemasByJobID(ctx context.Context, jobID uuid.UUID) ([]ParameterSchema, error)
+	GetParameterValueByScopeAndName(ctx context.Context, arg GetParameterValueByScopeAndNameParams) (ParameterValue, error)
 	GetParameterValuesByScope(ctx context.Context, arg GetParameterValuesByScopeParams) ([]ParameterValue, error)
 	GetProjectByID(ctx context.Context, id uuid.UUID) (Project, error)
 	GetProjectByOrganizationAndName(ctx context.Context, arg GetProjectByOrganizationAndNameParams) (Project, error)
 	GetProjectVersionByID(ctx context.Context, id uuid.UUID) (ProjectVersion, error)
 	GetProjectVersionByProjectIDAndName(ctx context.Context, arg GetProjectVersionByProjectIDAndNameParams) (ProjectVersion, error)
-	GetProjectVersionsByProjectID(ctx context.Context, projectID uuid.UUID) ([]ProjectVersion, error)
-	GetProjectsByOrganizationIDs(ctx context.Context, ids []string) ([]Project, error)
+	GetProjectVersionsByProjectID(ctx context.Context, dollar_1 uuid.UUID) ([]ProjectVersion, error)
+	GetProjectsByOrganization(ctx context.Context, organizationID string) ([]Project, error)
 	GetProvisionerDaemonByID(ctx context.Context, id uuid.UUID) (ProvisionerDaemon, error)
 	GetProvisionerDaemons(ctx context.Context) ([]ProvisionerDaemon, error)
-	GetProvisionerJobAgentByInstanceID(ctx context.Context, authInstanceID string) (ProvisionerJobAgent, error)
-	GetProvisionerJobAgentsByResourceIDs(ctx context.Context, ids []uuid.UUID) ([]ProvisionerJobAgent, error)
 	GetProvisionerJobByID(ctx context.Context, id uuid.UUID) (ProvisionerJob, error)
-	GetProvisionerJobResourceByID(ctx context.Context, id uuid.UUID) (ProvisionerJobResource, error)
-	GetProvisionerJobResourcesByJobID(ctx context.Context, jobID uuid.UUID) ([]ProvisionerJobResource, error)
+	GetProvisionerJobsByIDs(ctx context.Context, ids []uuid.UUID) ([]ProvisionerJob, error)
 	GetProvisionerLogsByIDBetween(ctx context.Context, arg GetProvisionerLogsByIDBetweenParams) ([]ProvisionerJobLog, error)
 	GetUserByEmailOrUsername(ctx context.Context, arg GetUserByEmailOrUsernameParams) (User, error)
 	GetUserByID(ctx context.Context, id string) (User, error)
 	GetUserCount(ctx context.Context) (int64, error)
+	GetWorkspaceAgentByAuthToken(ctx context.Context, authToken uuid.UUID) (WorkspaceAgent, error)
+	GetWorkspaceAgentByInstanceID(ctx context.Context, authInstanceID string) (WorkspaceAgent, error)
+	GetWorkspaceAgentByResourceID(ctx context.Context, resourceID uuid.UUID) (WorkspaceAgent, error)
+	GetWorkspaceBuildByID(ctx context.Context, id uuid.UUID) (WorkspaceBuild, error)
+	GetWorkspaceBuildByJobID(ctx context.Context, jobID uuid.UUID) (WorkspaceBuild, error)
+	GetWorkspaceBuildByWorkspaceID(ctx context.Context, workspaceID uuid.UUID) ([]WorkspaceBuild, error)
+	GetWorkspaceBuildByWorkspaceIDAndName(ctx context.Context, arg GetWorkspaceBuildByWorkspaceIDAndNameParams) (WorkspaceBuild, error)
+	GetWorkspaceBuildByWorkspaceIDWithoutAfter(ctx context.Context, workspaceID uuid.UUID) (WorkspaceBuild, error)
 	GetWorkspaceByID(ctx context.Context, id uuid.UUID) (Workspace, error)
 	GetWorkspaceByUserIDAndName(ctx context.Context, arg GetWorkspaceByUserIDAndNameParams) (Workspace, error)
-	GetWorkspaceHistoryByID(ctx context.Context, id uuid.UUID) (WorkspaceHistory, error)
-	GetWorkspaceHistoryByWorkspaceID(ctx context.Context, workspaceID uuid.UUID) ([]WorkspaceHistory, error)
-	GetWorkspaceHistoryByWorkspaceIDAndName(ctx context.Context, arg GetWorkspaceHistoryByWorkspaceIDAndNameParams) (WorkspaceHistory, error)
-	GetWorkspaceHistoryByWorkspaceIDWithoutAfter(ctx context.Context, workspaceID uuid.UUID) (WorkspaceHistory, error)
 	GetWorkspaceOwnerCountsByProjectIDs(ctx context.Context, ids []uuid.UUID) ([]GetWorkspaceOwnerCountsByProjectIDsRow, error)
-	GetWorkspacesByProjectAndUserID(ctx context.Context, arg GetWorkspacesByProjectAndUserIDParams) ([]Workspace, error)
+	GetWorkspaceResourceByID(ctx context.Context, id uuid.UUID) (WorkspaceResource, error)
+	GetWorkspaceResourcesByJobID(ctx context.Context, jobID uuid.UUID) ([]WorkspaceResource, error)
 	GetWorkspacesByUserID(ctx context.Context, ownerID string) ([]Workspace, error)
 	InsertAPIKey(ctx context.Context, arg InsertAPIKeyParams) (APIKey, error)
 	InsertFile(ctx context.Context, arg InsertFileParams) (File, error)
@@ -54,17 +58,19 @@ type querier interface {
 	InsertProjectVersion(ctx context.Context, arg InsertProjectVersionParams) (ProjectVersion, error)
 	InsertProvisionerDaemon(ctx context.Context, arg InsertProvisionerDaemonParams) (ProvisionerDaemon, error)
 	InsertProvisionerJob(ctx context.Context, arg InsertProvisionerJobParams) (ProvisionerJob, error)
-	InsertProvisionerJobAgent(ctx context.Context, arg InsertProvisionerJobAgentParams) (ProvisionerJobAgent, error)
 	InsertProvisionerJobLogs(ctx context.Context, arg InsertProvisionerJobLogsParams) ([]ProvisionerJobLog, error)
-	InsertProvisionerJobResource(ctx context.Context, arg InsertProvisionerJobResourceParams) (ProvisionerJobResource, error)
 	InsertUser(ctx context.Context, arg InsertUserParams) (User, error)
 	InsertWorkspace(ctx context.Context, arg InsertWorkspaceParams) (Workspace, error)
-	InsertWorkspaceHistory(ctx context.Context, arg InsertWorkspaceHistoryParams) (WorkspaceHistory, error)
+	InsertWorkspaceAgent(ctx context.Context, arg InsertWorkspaceAgentParams) (WorkspaceAgent, error)
+	InsertWorkspaceBuild(ctx context.Context, arg InsertWorkspaceBuildParams) (WorkspaceBuild, error)
+	InsertWorkspaceResource(ctx context.Context, arg InsertWorkspaceResourceParams) (WorkspaceResource, error)
 	UpdateAPIKeyByID(ctx context.Context, arg UpdateAPIKeyByIDParams) error
+	UpdateProjectVersionByID(ctx context.Context, arg UpdateProjectVersionByIDParams) error
 	UpdateProvisionerDaemonByID(ctx context.Context, arg UpdateProvisionerDaemonByIDParams) error
 	UpdateProvisionerJobByID(ctx context.Context, arg UpdateProvisionerJobByIDParams) error
 	UpdateProvisionerJobWithCompleteByID(ctx context.Context, arg UpdateProvisionerJobWithCompleteByIDParams) error
-	UpdateWorkspaceHistoryByID(ctx context.Context, arg UpdateWorkspaceHistoryByIDParams) error
+	UpdateWorkspaceAgentByID(ctx context.Context, arg UpdateWorkspaceAgentByIDParams) error
+	UpdateWorkspaceBuildByID(ctx context.Context, arg UpdateWorkspaceBuildByIDParams) error
 }
 
 var _ querier = (*sqlQuerier)(nil)

database/query.sql

@@ -36,6 +36,12 @@ WHERE
       1
   ) RETURNING *;
 
+-- name: DeleteParameterValueByID :exec
+DELETE FROM
+  parameter_value
+WHERE
+  id = $1;
+
 -- name: GetAPIKeyByID :one
 SELECT
   *
@@ -136,6 +142,18 @@ WHERE
   scope = $1
   AND scope_id = $2;
 
+-- name: GetParameterValueByScopeAndName :one
+SELECT
+  *
+FROM
+  parameter_value
+WHERE
+  scope = $1
+  AND scope_id = $2
+  AND name = $3
+LIMIT
+  1;
+
 -- name: GetProjectByID :one
 SELECT
   *
@@ -157,13 +175,13 @@ WHERE
 LIMIT
   1;
 
--- name: GetProjectsByOrganizationIDs :many
+-- name: GetProjectsByOrganization :many
 SELECT
   *
 FROM
   project
 WHERE
-  organization_id = ANY(@ids :: text [ ]);
+  organization_id = $1;
 
 -- name: GetParameterSchemasByJobID :many
 SELECT
@@ -179,7 +197,7 @@ SELECT
 FROM
   project_version
 WHERE
-  project_id = $1;
+  project_id = $1 :: uuid;
 
 -- name: GetProjectVersionByProjectIDAndName :one
 SELECT
@@ -226,11 +244,19 @@ SELECT
 FROM
   provisioner_daemon;
 
--- name: GetProvisionerJobAgentByInstanceID :one
+-- name: GetWorkspaceAgentByAuthToken :one
 SELECT
   *
 FROM
-  provisioner_job_agent
+  workspace_agent
+WHERE
+  auth_token = $1;
+
+-- name: GetWorkspaceAgentByInstanceID :one
+SELECT
+  *
+FROM
+  workspace_agent
 WHERE
   auth_instance_id = @auth_instance_id :: text
 ORDER BY
@@ -244,6 +270,14 @@ FROM
 WHERE
   id = $1;
 
+-- name: GetProvisionerJobsByIDs :many
+SELECT
+  *
+FROM
+  provisioner_job
+WHERE
+  id = ANY(@ids :: uuid [ ]);
+
 -- name: GetWorkspaceByID :one
 SELECT
   *
@@ -271,15 +305,6 @@ WHERE
   owner_id = @owner_id
   AND LOWER(name) = LOWER(@name);
 
--- name: GetWorkspacesByProjectAndUserID :many
-SELECT
-  *
-FROM
-  workspace
-WHERE
-  owner_id = $1
-  AND project_id = $2;
-
 -- name: GetWorkspaceOwnerCountsByProjectIDs :many
 SELECT
   project_id,
@@ -292,67 +317,77 @@ GROUP BY
   project_id,
   owner_id;
 
--- name: GetWorkspaceHistoryByID :one
+-- name: GetWorkspaceBuildByID :one
 SELECT
   *
 FROM
-  workspace_history
+  workspace_build
 WHERE
   id = $1
 LIMIT
   1;
 
--- name: GetWorkspaceHistoryByWorkspaceIDAndName :one
+-- name: GetWorkspaceBuildByJobID :one
 SELECT
   *
 FROM
-  workspace_history
+  workspace_build
+WHERE
+  job_id = $1
+LIMIT
+  1;
+
+-- name: GetWorkspaceBuildByWorkspaceIDAndName :one
+SELECT
+  *
+FROM
+  workspace_build
 WHERE
   workspace_id = $1
   AND name = $2;
 
--- name: GetWorkspaceHistoryByWorkspaceID :many
+-- name: GetWorkspaceBuildByWorkspaceID :many
 SELECT
   *
 FROM
-  workspace_history
+  workspace_build
 WHERE
   workspace_id = $1;
 
--- name: GetWorkspaceHistoryByWorkspaceIDWithoutAfter :one
+-- name: GetWorkspaceBuildByWorkspaceIDWithoutAfter :one
 SELECT
   *
 FROM
-  workspace_history
+  workspace_build
 WHERE
   workspace_id = $1
   AND after_id IS NULL
 LIMIT
   1;
 
--- name: GetProvisionerJobResourceByID :one
+-- name: GetWorkspaceResourceByID :one
 SELECT
   *
 FROM
-  provisioner_job_resource
+  workspace_resource
 WHERE
   id = $1;
 
--- name: GetProvisionerJobResourcesByJobID :many
+-- name: GetWorkspaceResourcesByJobID :many
 SELECT
   *
 FROM
-  provisioner_job_resource
+  workspace_resource
 WHERE
   job_id = $1;
 
--- name: GetProvisionerJobAgentsByResourceIDs :many
+-- name: GetWorkspaceAgentByResourceID :one
 SELECT
   *
 FROM
-  provisioner_job_agent
+  workspace_agent
 WHERE
-  resource_id = ANY(@ids :: uuid [ ]);
+  resource_id = $1;
 
 -- name: InsertAPIKey :one
 INSERT INTO
@@ -457,9 +492,9 @@ INSERT INTO
 VALUES
   ($1, $2, $3, $4, $5, $6, $7) RETURNING *;
 
--- name: InsertProvisionerJobResource :one
+-- name: InsertWorkspaceResource :one
 INSERT INTO
-  provisioner_job_resource (
+  workspace_resource (
     id,
     created_at,
     job_id,
@@ -476,14 +511,15 @@ INSERT INTO
   project_version (
     id,
     project_id,
+    organization_id,
     created_at,
     updated_at,
     name,
     description,
-    import_job_id
+    job_id
   )
 VALUES
-  ($1, $2, $3, $4, $5, $6, $7) RETURNING *;
+  ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING *;
 
 -- name: InsertParameterSchema :one
 INSERT INTO
@@ -527,9 +563,9 @@ VALUES
 
 -- name: InsertProvisionerDaemon :one
 INSERT INTO
-  provisioner_daemon (id, created_at, name, provisioners)
+  provisioner_daemon (id, created_at, organization_id, name, provisioners)
 VALUES
-  ($1, $2, $3, $4) RETURNING *;
+  ($1, $2, $3, $4, $5) RETURNING *;
 
 -- name: InsertProvisionerJob :one
 INSERT INTO
@@ -577,9 +613,9 @@ INSERT INTO
 VALUES
   ($1, $2, $3, $4, $5, $6) RETURNING *;
 
--- name: InsertProvisionerJobAgent :one
+-- name: InsertWorkspaceAgent :one
 INSERT INTO
-  provisioner_job_agent (
+  workspace_agent (
     id,
     created_at,
     updated_at,
@@ -594,9 +630,9 @@ INSERT INTO
 VALUES
   ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING *;
 
--- name: InsertWorkspaceHistory :one
+-- name: InsertWorkspaceBuild :one
 INSERT INTO
-  workspace_history (
+  workspace_build (
     id,
     created_at,
     updated_at,
@@ -606,7 +642,7 @@ INSERT INTO
     name,
     transition,
     initiator,
-    provision_job_id,
+    job_id,
     provisioner_state
   )
 VALUES
@@ -624,6 +660,15 @@ SET
 WHERE
   id = $1;
 
+-- name: UpdateProjectVersionByID :exec
+UPDATE
+  project_version
+SET
+  project_id = $2,
+  updated_at = $3
+WHERE
+  id = $1;
+
 -- name: UpdateProvisionerDaemonByID :exec
 UPDATE
   provisioner_daemon
@@ -652,9 +697,17 @@ SET
 WHERE
   id = $1;
 
--- name: UpdateWorkspaceHistoryByID :exec
+-- name: UpdateWorkspaceAgentByID :exec
 UPDATE
-  workspace_history
+  workspace_agent
+SET
+  updated_at = $2
+WHERE
+  id = $1;
+
+-- name: UpdateWorkspaceBuildByID :exec
+UPDATE
+  workspace_build
 SET
   updated_at = $2,
   after_id = $3,