opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: Force codersdk to not import anything from database (#1576)

Browse Source 
* chore: Force codersdk to not import anything from database (linter rule)
* chore: Move all database types in codersdk out
This commit is contained in:
Steven Masley
2022-05-19 13:04:44 -05:00
committed by GitHub
parent a0834404f7
commit 6c1117094d
41 changed files with 384 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coderd/workspacebuilds.go
+5 -5
View File
@@ -153,9 +153,9 @@ func (api *api) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
// Rbac action depends on the transition
var action rbac.Action
switch createBuild.Transition {
case database.WorkspaceTransitionDelete:
case codersdk.WorkspaceTransitionDelete:
action = rbac.ActionDelete
case database.WorkspaceTransitionStart, database.WorkspaceTransitionStop:
case codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop:
action = rbac.ActionUpdate
default:
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
@@ -291,7 +291,7 @@ func (api *api) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
Name: namesgenerator.GetRandomName(1),
ProvisionerState: state,
InitiatorID: apiKey.UserID,
Transition: createBuild.Transition,
Transition: database.WorkspaceTransition(createBuild.Transition),
JobID: provisionerJob.ID,
})
if err != nil {
@@ -442,7 +442,7 @@ func convertWorkspaceBuild(workspaceBuild database.WorkspaceBuild, job codersdk.
TemplateVersionID: workspaceBuild.TemplateVersionID,
BuildNumber: workspaceBuild.BuildNumber,
Name: workspaceBuild.Name,
Transition: workspaceBuild.Transition,
Transition: codersdk.WorkspaceTransition(workspaceBuild.Transition),
InitiatorID: workspaceBuild.InitiatorID,
Job: job,
}
@@ -453,7 +453,7 @@ func convertWorkspaceResource(resource database.WorkspaceResource, agents []code
ID: resource.ID,
CreatedAt: resource.CreatedAt,
JobID: resource.JobID,
Transition: resource.Transition,
Transition: codersdk.WorkspaceTransition(resource.Transition),
Type: resource.Type,
Name: resource.Name,
Agents: agents,