Add project import job resource table

coder · kylecarbs · Feb 12, 2022 · Feb 10, 2022 · Feb 10, 2022 · Feb 10, 2022
commit 8fe05d6f470faab54085fd78c8f36bf0d09031af
diff --git a/database/databasefake/databasefake.go b/database/databasefake/databasefake.go
@@ -19,18 +19,19 @@ func New() database.Store {
 		organizationMembers: make([]database.OrganizationMember, 0),
 		users:               make([]database.User, 0),
 
-		files:              make([]database.File, 0),
-		parameterValue:     make([]database.ParameterValue, 0),
-		parameterSchema:    make([]database.ParameterSchema, 0),
-		project:            make([]database.Project, 0),
-		projectVersion:     make([]database.ProjectVersion, 0),
-		provisionerDaemons: make([]database.ProvisionerDaemon, 0),
-		provisionerJobs:    make([]database.ProvisionerJob, 0),
-		provisionerJobLog:  make([]database.ProvisionerJobLog, 0),
-		workspace:          make([]database.Workspace, 0),
-		workspaceResource:  make([]database.WorkspaceResource, 0),
-		workspaceHistory:   make([]database.WorkspaceHistory, 0),
-		workspaceAgent:     make([]database.WorkspaceAgent, 0),
+		files:                    make([]database.File, 0),
+		parameterValue:           make([]database.ParameterValue, 0),
+		parameterSchema:          make([]database.ParameterSchema, 0),
+		project:                  make([]database.Project, 0),
+		projectVersion:           make([]database.ProjectVersion, 0),
+		projectImportJobResource: make([]database.ProjectImportJobResource, 0),
+		provisionerDaemons:       make([]database.ProvisionerDaemon, 0),
+		provisionerJobs:          make([]database.ProvisionerJob, 0),
+		provisionerJobLog:        make([]database.ProvisionerJobLog, 0),
+		workspace:                make([]database.Workspace, 0),
+		workspaceResource:        make([]database.WorkspaceResource, 0),
+		workspaceHistory:         make([]database.WorkspaceHistory, 0),
+		workspaceAgent:           make([]database.WorkspaceAgent, 0),
 	}
 }
 
@@ -45,18 +46,19 @@ type fakeQuerier struct {
 	users               []database.User
 
 	// New tables
-	files              []database.File
-	parameterValue     []database.ParameterValue
-	parameterSchema    []database.ParameterSchema
-	project            []database.Project
-	projectVersion     []database.ProjectVersion
-	provisionerDaemons []database.ProvisionerDaemon
-	provisionerJobs    []database.ProvisionerJob
-	provisionerJobLog  []database.ProvisionerJobLog
-	workspace          []database.Workspace
-	workspaceAgent     []database.WorkspaceAgent
-	workspaceHistory   []database.WorkspaceHistory
-	workspaceResource  []database.WorkspaceResource
+	files                    []database.File
+	parameterValue           []database.ParameterValue
+	parameterSchema          []database.ParameterSchema
+	project                  []database.Project
+	projectVersion           []database.ProjectVersion
+	projectImportJobResource []database.ProjectImportJobResource
+	provisionerDaemons       []database.ProvisionerDaemon
+	provisionerJobs          []database.ProvisionerJob
+	provisionerJobLog        []database.ProvisionerJobLog
+	workspace                []database.Workspace
+	workspaceAgent           []database.WorkspaceAgent
+	workspaceHistory         []database.WorkspaceHistory
+	workspaceResource        []database.WorkspaceResource
 }
 
 // InTx doesn't rollback data properly for in-memory yet.
@@ -666,6 +668,23 @@ func (q *fakeQuerier) InsertProject(_ context.Context, arg database.InsertProjec
 	return project, nil
 }
 
+func (q *fakeQuerier) InsertProjectImportJobResource(ctx context.Context, arg database.InsertProjectImportJobResourceParams) (database.ProjectImportJobResource, error) {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	//nolint:gosimple
+	projectResource := database.ProjectImportJobResource{
+		ID:         arg.ID,
+		CreatedAt:  arg.CreatedAt,
+		JobID:      arg.JobID,
+		Transition: arg.Transition,
+		Type:       arg.Type,
+		Name:       arg.Name,
+	}
+	q.projectImportJobResource = append(q.projectImportJobResource, projectResource)
+	return projectResource, nil
+}
+
 func (q *fakeQuerier) InsertProjectVersion(_ context.Context, arg database.InsertProjectVersionParams) (database.ProjectVersion, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()

diff --git a/database/dump.sql b/database/dump.sql
diff --git a/database/migrations/000004_jobs.up.sql b/database/migrations/000004_jobs.up.sql
@@ -119,3 +119,13 @@ CREATE TABLE parameter_value (
     -- Prevents duplicates for parameters in the same scope.
     UNIQUE(name, scope, scope_id)
 );
+
+-- Resources from multiple workspace states are stored here post project-import job.
+CREATE TABLE project_import_job_resource (
+    id uuid NOT NULL UNIQUE,
+    created_at timestamptz NOT NULL,
+    job_id uuid NOT NULL REFERENCES provisioner_job(id) ON DELETE CASCADE,
+    transition workspace_transition NOT NULL,
+    type varchar(256) NOT NULL,
+    name varchar(64) NOT NULL
+);
diff --git a/database/models.go b/database/models.go
diff --git a/database/querier.go b/database/querier.go
diff --git a/database/query.sql b/database/query.sql
@@ -427,6 +427,12 @@ INSERT INTO
 VALUES
   ($1, $2, $3, $4, $5, $6, $7) RETURNING *;
 
+-- name: InsertProjectImportJobResource :one
+INSERT INTO
+  project_import_job_resource (id, created_at, job_id, transition, type, name)
+VALUES
+  ($1, $2, $3, $4, $5, $6) RETURNING *;
+
 -- name: InsertProjectVersion :one
 INSERT INTO
   project_version (

diff --git a/database/query.sql.go b/database/query.sql.go