coder · Emyrk · May 19, 2022 · May 18, 2022 · May 18, 2022 · May 18, 2022
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -103,7 +103,7 @@ linters-settings:
     settings:
       ruleguard:
         failOn: all
-        rules: rules.go
+        rules: '${configDir}/scripts/rules.go'
 
   staticcheck:
     # https://staticcheck.io/docs/options#checks

diff --git a/cli/cliui/provisionerjob.go b/cli/cliui/provisionerjob.go
@@ -12,7 +12,6 @@ import (
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
 
-	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
 )
 
@@ -165,16 +164,16 @@ func ProvisionerJob(ctx context.Context, writer io.Writer, opts ProvisionerJobOp
 			}
 			output := ""
 			switch log.Level {
-			case database.LogLevelTrace, database.LogLevelDebug:
+			case codersdk.LogLevelTrace, 
E30A
codersdk.LogLevelDebug:
 				if !opts.Verbose {
 					continue
 				}
 				output = Styles.Placeholder.Render(log.Output)
-			case database.LogLevelError:
+			case codersdk.LogLevelError:
 				output = defaultStyles.Error.Render(log.Output)
-			case database.LogLevelWarn:
+			case codersdk.LogLevelWarn:
 				output = Styles.Warn.Render(log.Output)
-			case database.LogLevelInfo:
+			case codersdk.LogLevelInfo:
 				output = log.Output
 			}
 			jobMutex.Lock()

diff --git a/cli/cliui/resources.go b/cli/cliui/resources.go
@@ -41,7 +41,7 @@ func WorkspaceResources(writer io.Writer, resources []codersdk.WorkspaceResource
 	// Address on stop indexes whether a resource still exists when in the stopped transition.
 	addressOnStop := map[string]codersdk.WorkspaceResource{}
 	for _, resource := range resources {
-		if resource.Transition != database.WorkspaceTransitionStop {
+		if resource.Transition != codersdk.WorkspaceTransitionStop {
 			continue
 		}
 		addressOnStop[resource.Type+"."+resource.Name] = resource

diff --git a/cli/cliui/resources_test.go b/cli/cliui/resources_test.go
@@ -22,7 +22,7 @@ func TestWorkspaceResources(t *testing.T) {
 			err := cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
 				Type:       "google_compute_instance",
 				Name:       "dev",
-				Transition: database.WorkspaceTransitionStart,
+				Transition: codersdk.WorkspaceTransitionStart,
 				Agents: []codersdk.WorkspaceAgent{{
 					Name:            "dev",
 					Status:          codersdk.WorkspaceAgentConnected,
@@ -46,15 +46,15 @@ func TestWorkspaceResources(t *testing.T) {
 		done := make(chan struct{})
 		go func() {
 			err := cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
-				Transition: database.WorkspaceTransitionStart,
+				Transition: codersdk.WorkspaceTransitionStart,
 				Type:       "google_compute_disk",
 				Name:       "root",
 			}, {
-				Transition: database.WorkspaceTransitionStop,
+				Transition: codersdk.WorkspaceTransitionStop,
 				Type:       "google_compute_disk",
 				Name:       "root",
 			}, {
-				Transition: database.WorkspaceTransitionStart,
+				Transition: codersdk.WorkspaceTransitionStart,
 				Type:       "google_compute_instance",
 				Name:       "dev",
 				Agents: []codersdk.WorkspaceAgent{{
@@ -65,7 +65,7 @@ func TestWorkspaceResources(t *testing.T) {
 					Architecture:    "amd64",
 				}},
 			}, {
-				Transition: database.WorkspaceTransitionStart,
+				Transition: codersdk.WorkspaceTransitionStart,
 				Type:       "kubernetes_pod",
 				Name:       "dev",
 				Agents: []codersdk.WorkspaceAgent{{

diff --git a/cli/configssh.go b/cli/configssh.go
@@ -15,7 +15,6 @@ import (
 
 	"github.com/coder/coder/cli/cliflag"
 	"github.com/coder/coder/cli/cliui"
-	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
 )
 
@@ -86,7 +85,7 @@ func configSSH() *cobra.Command {
 						return err
 					}
 					for _, resource := range resources {
-						if resource.Transition != database.WorkspaceTransitionStart {
+						if resource.Transition != codersdk.WorkspaceTransitionStart {
 							continue
 						}
 						for _, agent := range resource.Agents {

diff --git a/cli/create.go b/cli/create.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/coder/coder/cli/cliflag"
 	"github.com/coder/coder/cli/cliui"
-	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
 )
 
@@ -134,8 +133,8 @@ func create() *cobra.Command {
 				parameters = append(parameters, codersdk.CreateParameterRequest{
 					Name:              parameterSchema.Name,
 					SourceValue:       value,
-					SourceScheme:      database.ParameterSourceSchemeData,
-					DestinationScheme: database.ParameterDestinationScheme(parameterSchema.DefaultDestinationScheme),
+					SourceScheme:      codersdk.ParameterSourceSchemeData,
+					DestinationScheme: parameterSchema.DefaultDestinationScheme,
 				})
 			}
 			_, _ = fmt.Fprintln(cmd.OutOrStdout())

diff --git a/cli/delete.go b/cli/delete.go
@@ -6,7 +6,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/coder/coder/cli/cliui"
-	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
 )
 
@@ -33,7 +32,7 @@ func delete() *cobra.Command {
 			}
 			before := time.Now()
 			build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{
-				Transition: database.WorkspaceTransitionDelete,
+				Transition: codersdk.WorkspaceTransitionDelete,
 			})
 			if err != nil {
 				return err

diff --git a/cli/list.go b/cli/list.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/coder/coder/cli/cliui"
 	"github.com/coder/coder/coderd/autobuild/schedule"
-	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
 )
 
@@ -66,17 +65,17 @@ func list() *cobra.Command {
 				}
 
 				switch workspace.LatestBuild.Transition {
-				case database.WorkspaceTransitionStart:
+				case codersdk.WorkspaceTransitionStart:
 					status = "Running"
 					if inProgress {
 						status = "Starting"
 					}
-				case database.WorkspaceTransitionStop:
+				case codersdk.WorkspaceTransitionStop:
 					status = "Stopped"
 					if inProgress {
 						status = "Stopping"
 					}
-				case database.WorkspaceTransitionDelete:
+				case codersdk.WorkspaceTransitionDelete:
 					status = "Deleted"
 					if inProgress {
 						status = "Deleting"

diff --git a/cli/portforward.go b/cli/portforward.go
@@ -18,7 +18,6 @@ import (
 
 	coderagent "github.com/coder/coder/agent"
 	"github.com/coder/coder/cli/cliui"
-	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
 )
 
@@ -80,7 +79,7 @@ func portForward() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			if workspace.LatestBuild.Transition != database.WorkspaceTransitionStart {
+			if workspace.LatestBuild.Transition != codersdk.WorkspaceTransitionStart {
 				return xerrors.New("workspace must be in start transition to port-forward")
 			}
 			if workspace.LatestBuild.Job.CompletedAt == nil {

diff --git a/cli/server.go b/cli/server.go
@@ -395,7 +395,7 @@ func server() *cobra.Command {
 				for _, workspace := range workspaces {
 					before := time.Now()
 					build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{
-						Transition: database.WorkspaceTransitionDelete,
+						Transition: codersdk.WorkspaceTransitionDelete,
 					})
 					if err != nil {
 						return xerrors.Errorf("delete workspace: %w", err)

diff --git a/cli/ssh.go b/cli/ssh.go
@@ -22,7 +22,6 @@ import (
 	"github.com/coder/coder/cli/cliui"
 	"github.com/coder/coder/coderd/autobuild/notify"
 	"github.com/coder/coder/coderd/autobuild/schedule"
-	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/cryptorand"
 )
@@ -193,7 +192,7 @@ func getWorkspaceAndAgent(cmd *cobra.Command, client *codersdk.Client, orgID uui
 		}
 	}
 
-	if workspace.LatestBuild.Transition != database.WorkspaceTransitionStart {
+	if workspace.LatestBuild.Transition != codersdk.WorkspaceTransitionStart {
 		return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, xerrors.New("workspace must be in start transition to ssh")
 	}
 	if workspace.LatestBuild.Job.CompletedAt == nil {
@@ -202,7 +201,7 @@ func getWorkspaceAndAgent(cmd *cobra.Command, client *codersdk.Client, orgID uui
 			return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, err
 		}
 	}
-	if workspace.LatestBuild.Transition == database.WorkspaceTransitionDelete {
+	if workspace.LatestBuild.Transition == codersdk.WorkspaceTransitionDelete {
 		return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, xerrors.Errorf("workspace %q is being deleted", workspace.Name)
 	}
 

diff --git a/cli/start.go b/cli/start.go
@@ -6,7 +6,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/coder/coder/cli/cliui"
-	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
 )
 
@@ -31,7 +30,7 @@ func start() *cobra.Command {
 			}
 			before := time.Now()
 			build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{
-				Transition: database.WorkspaceTransitionStart,
+				Transition: codersdk.WorkspaceTransitionStart,
 			})
 			if err != nil {
 				return err

diff --git a/cli/stop.go b/cli/stop.go
@@ -6,7 +6,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/coder/coder/cli/cliui"
-	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
 )
 
@@ -31,7 +30,7 @@ func stop() *cobra.Command {
 			}
 			before := time.Now()
 			build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{
-				Transition: database.WorkspaceTransitionStop,
+				Transition: codersdk.WorkspaceTransitionStop,
 			})
 			if err != nil {
 				return err

diff --git a/cli/templatecreate.go b/cli/templatecreate.go
@@ -128,9 +128,9 @@ func templateCreate() *cobra.Command {
 func createValidTemplateVersion(cmd *cobra.Command, client *codersdk.Client, organization codersdk.Organization, provisioner database.ProvisionerType, hash string, parameters ...codersdk.CreateParameterRequest) (*codersdk.TemplateVersion, []codersdk.CreateParameterRequest, error) {
 	before := time.Now()
 	version, err := client.CreateTemplateVersion(cmd.Context(), organization.ID, codersdk.CreateTemplateVersionRequest{
-		StorageMethod:   database.ProvisionerStorageMethodFile,
+		StorageMethod:   codersdk.ProvisionerStorageMethodFile,
 		StorageSource:   hash,
-		Provisioner:     provisioner,
+		Provisioner:     codersdk.ProvisionerType(provisioner),
 		ParameterValues: parameters,
 	})
 	if err != nil {
@@ -192,8 +192,8 @@ func createValidTemplateVersion(cmd *cobra.Command, client *codersdk.Client, org
 			parameters = append(parameters, codersdk.CreateParameterRequest{
 				Name:              parameterSchema.Name,
 				SourceValue:       value,
-				SourceScheme:      database.ParameterSourceSchemeData,
-				DestinationScheme: database.ParameterDestinationScheme(parameterSchema.DefaultDestinationScheme),
+				SourceScheme:      codersdk.ParameterSourceSchemeData,
+				DestinationScheme: parameterSchema.DefaultDestinationScheme,
 			})
 			_, _ = fmt.Fprintln(cmd.OutOrStdout())
 		}

diff --git a/cli/templateupdate.go b/cli/templateupdate.go
@@ -10,7 +10,6 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/coder/coder/cli/cliui"
-	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/provisionersdk"
 )
@@ -68,9 +67,9 @@ func templateUpdate() *cobra.Command {
 			before := time.Now()
 			templateVersion, err := client.CreateTemplateVersion(cmd.Context(), organization.ID, codersdk.CreateTemplateVersionRequest{
 				TemplateID:    template.ID,
-				StorageMethod: database.ProvisionerStorageMethodFile,
+				StorageMethod: codersdk.ProvisionerStorageMethodFile,
 				StorageSource: resp.Hash,
-				Provisioner:   database.ProvisionerType(provisioner),
+				Provisioner:   codersdk.ProvisionerType(provisioner),
 			})
 			if err != nil {
 				return err

diff --git a/cmd/cliui/main.go b/cmd/cliui/main.go
@@ -118,7 +118,7 @@ func main() {
 								log := codersdk.ProvisionerJobLog{
 									CreatedAt: time.Now(),
 									Output:    fmt.Sprintf("Some log %d", count),
-									Level:     database.LogLevelInfo,
+									Level:     codersdk.LogLevelInfo,
 								}
 								switch {
 								case count == 10:
@@ -133,7 +133,7 @@ func main() {
 									log.Stage = "Cleaning Up"
 								}
 								if count%5 == 0 {
-									log.Level = database.LogLevelWarn
+									log.Level = codersdk.LogLevelWarn
 								}
 								count++
 								if log.Output == "" && log.Stage == "" {
@@ -188,15 +188,15 @@ func main() {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			disconnected := database.Now().Add(-4 * time.Second)
 			return cliui.WorkspaceResources(cmd.OutOrStdout(), []codersdk.WorkspaceResource{{
-				Transition: database.WorkspaceTransitionStart,
+				Transition: codersdk.WorkspaceTransitionStart,
 				Type:       "google_compute_disk",
 				Name:       "root",
 			}, {
-				Transition: database.WorkspaceTransitionStop,
+				Transition: codersdk.WorkspaceTransitionStop,
 				Type:       "google_compute_disk",
 				Name:       "root",
 			}, {
-				Transition: database.WorkspaceTransitionStart,
+				Transition: codersdk.WorkspaceTransitionStart,
 				Type:       "google_compute_instance",
 				Name:       "dev",
 				Agents: []codersdk.WorkspaceAgent{{
@@ -207,7 +207,7 @@ func main() {
 					Architecture:    "amd64",
 				}},
 			}, {
-				Transition: database.WorkspaceTransitionStart,
+				Transition: codersdk.WorkspaceTransitionStart,
 				Type:       "kubernetes_pod",
 				Name:       "dev",
 				Agents: []codersdk.WorkspaceAgent{{