coder · Emyrk · Mar 25, 2022 · Mar 25, 2022 · Mar 25, 2022 · Mar 25, 2022
diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
 INSTALL_DIR=$(shell go env GOPATH)/bin
 GOOS=$(shell go env GOOS)
 GOARCH=$(shell go env GOARCH)
+DATABASE_DIR=coderd/database
 
 bin:
 	goreleaser build --snapshot --rm-dist
@@ -10,14 +11,14 @@ build: site/out bin
 .PHONY: build
 
 # Runs migrations to output a dump of the database.
-database/dump.sql: $(wildcard database/migrations/*.sql)
-	go run database/dump/main.go
+$(DATABASE_DIR)/dump.sql: $(wildcard database/migrations/*.sql)
+	go run $(DATABASE_DIR)/dump/main.go
 
 # Generates Go code for querying the database.
-database/generate: fmt/sql database/dump.sql database/query.sql
-	cd database && sqlc generate && rm db_tmp.go
-	cd database && gofmt -w -r 'Querier -> querier' *.go
-	cd database && gofmt -w -r 'Queries -> sqlQuerier' *.go
+database/generate: fmt/sql $(DATABASE_DIR)/dump.sql $(DATABASE_DIR)/query.sql
+	cd $(DATABASE_DIR) && sqlc generate && rm db_tmp.go
+	cd $(DATABASE_DIR) && gofmt -w -r 'Querier -> querier' *.go
+	cd $(DATABASE_DIR) && gofmt -w -r 'Queries -> sqlQuerier' *.go
 .PHONY: database/generate
 
 fmt/prettier:
@@ -30,13 +31,13 @@ else
 endif
 .PHONY: fmt/prettier
 
-fmt/sql: ./database/query.sql
+fmt/sql: ./$(DATABASE_DIR)/query.sql
 	npx sql-formatter \
 		--language postgresql \
 		--lines-between-queries 2 \
-		./database/query.sql \
-		--output ./database/query.sql
-	sed -i 's/@ /@/g' ./database/query.sql
+		./$(DATABASE_DIR)/query.sql \
+		--output ./$(DATABASE_DIR)/query.sql
+	sed -i 's/@ /@/g' ./$(DATABASE_DIR)/query.sql
 
 fmt: fmt/prettier fmt/sql
 .PHONY: fmt

diff --git a/cli/cliui/job.go b/cli/cliui/job.go
@@ -10,8 +10,8 @@ import (
 	"github.com/charmbracelet/lipgloss"
 	"github.com/spf13/cobra"
 
+	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/database"
 )
 
 type JobOptions struct {

diff --git a/cli/parametercreate.go b/cli/parametercreate.go
@@ -6,8 +6,8 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/xerrors"
 
+	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/database"
 )
 
 func parameterCreate() *cobra.Command {

diff --git a/cli/projectcreate.go b/cli/projectcreate.go
@@ -15,8 +15,8 @@ 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/database"
 	"github.com/coder/coder/provisionerd"
 	"github.com/coder/coder/provisionersdk"
 )

diff --git a/cli/projectcreate_test.go b/cli/projectcreate_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
-	"github.com/coder/coder/database"
+	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/pty/ptytest"
 )

diff --git a/cli/projects.go b/cli/projects.go
@@ -8,8 +8,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/coder/coder/cli/cliui"
+	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/database"
 )
 
 func projects() *cobra.Command {

diff --git a/cli/projectupdate.go b/cli/projectupdate.go
@@ -9,8 +9,8 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/xerrors"
 
+	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/database"
 	"github.com/coder/coder/provisionersdk"
 )
 

diff --git a/cli/ssh.go b/cli/ssh.go
@@ -8,8 +8,8 @@ import (
 	"golang.org/x/term"
 	"golang.org/x/xerrors"
 
+	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/database"
 )
 
 func workspaceSSH() *cobra.Command {

diff --git a/cli/start.go b/cli/start.go
@@ -28,10 +28,10 @@ import (
 	"github.com/coder/coder/cli/cliui"
 	"github.com/coder/coder/cli/config"
 	"github.com/coder/coder/coderd"
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/database/databasefake"
 	"github.com/coder/coder/coderd/tunnel"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/database/databasefake"
 	"github.com/coder/coder/provisioner/terraform"
 	"github.com/coder/coder/provisionerd"
 	"github.com/coder/coder/provisionersdk"

diff --git a/cli/start_test.go b/cli/start_test.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
+	"github.com/coder/coder/coderd/database/postgres"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/database/postgres"
 )
 
 func TestStart(t *testing.T) {

diff --git a/cli/workspacecreate.go b/cli/workspacecreate.go
@@ -13,8 +13,8 @@ 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/database"
 )
 
 func workspaceCreate() *cobra.Command {

diff --git a/cli/workspacedelete.go b/cli/workspacedelete.go
@@ -6,8 +6,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/coder/coder/cli/cliui"
+	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/database"
 )
 
 func workspaceDelete() *cobra.Command {

diff --git a/cli/workspacestart.go b/cli/workspacestart.go
@@ -6,8 +6,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/coder/coder/cli/cliui"
+	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/database"
 )
 
 func workspaceStart() *cobra.Command {

diff --git a/cli/workspacestop.go b/cli/workspacestop.go
@@ -6,8 +6,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/coder/coder/cli/cliui"
+	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/database"
 )
 
 func workspaceStop() *cobra.Command {

diff --git a/cmd/cliui/main.go b/cmd/cliui/main.go
@@ -11,8 +11,8 @@ 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/database"
 )
 
 func main() {

diff --git a/cmd/templater/main.go b/cmd/templater/main.go
@@ -19,10 +19,10 @@ import (
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/sloghuman"
 	"github.com/coder/coder/coderd"
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/database/databasefake"
 	"github.com/coder/coder/coderd/tunnel"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/database/databasefake"
 	"github.com/coder/coder/provisioner/terraform"
 	"github.com/coder/coder/provisionerd"
 	"github.com/coder/coder/provisionersdk"

diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -10,9 +10,9 @@ import (
 	"google.golang.org/api/idtoken"
 
 	"cdr.dev/slog"
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/httpapi"
+	"github.com/coder/coder/coderd/httpmw"
 	"github.com/coder/coder/site"
 )
 

diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -31,11 +31,11 @@ import (
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/coderd"
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/database/databasefake"
+	"github.com/coder/coder/coderd/database/postgres"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/cryptorand"
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/database/databasefake"
-	"github.com/coder/coder/database/postgres"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionerd"
 	"github.com/coder/coder/provisionersdk"

diff --git a/database/databasefake/databasefake.go → coderd/database/databasefake/databasefake.go b/database/databasefake/databasefake.go → coderd/database/databasefake/databasefake.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/coder/coder/database"
+	"github.com/coder/coder/coderd/database"
 )
 
 // New returns an in-memory fake of the database.

diff --git a/database/db.go → coderd/database/db.go b/database/db.go → coderd/database/db.go
diff --git a/database/dump.sql → coderd/database/dump.sql b/database/dump.sql → coderd/database/dump.sql
diff --git a/database/dump/main.go → coderd/database/dump/main.go b/database/dump/main.go → coderd/database/dump/main.go
@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/database/postgres"
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/database/postgres"
 )
 
 func main() {

diff --git a/database/migrate.go → coderd/database/migrate.go b/database/migrate.go → coderd/database/migrate.go
diff --git a/database/migrate_test.go → coderd/database/migrate_test.go b/database/migrate_test.go → coderd/database/migrate_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
 
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/database/postgres"
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/database/postgres"
 )
 
 func TestMain(m *testing.M) {

diff --git a/database/migrations/000001_base.down.sql → .../database/migrations/000001_base.down.sql b/database/migrations/000001_base.down.sql → .../database/migrations/000001_base.down.sql
diff --git a/database/migrations/000001_base.up.sql → ...rd/database/migrations/000001_base.up.sql b/database/migrations/000001_base.up.sql → ...rd/database/migrations/000001_base.up.sql
diff --git a/database/migrations/000002_projects.down.sql → ...abase/migrations/000002_projects.down.sql b/database/migrations/000002_projects.down.sql → ...abase/migrations/000002_projects.down.sql
diff --git a/database/migrations/000002_projects.up.sql → ...atabase/migrations/000002_projects.up.sql b/database/migrations/000002_projects.up.sql → ...atabase/migrations/000002_projects.up.sql
diff --git a/...ase/migrations/000003_workspaces.down.sql → ...ase/migrations/000003_workspaces.down.sql b/...ase/migrations/000003_workspaces.down.sql → ...ase/migrations/000003_workspaces.down.sql
diff --git a/database/migrations/000003_workspaces.up.sql → ...abase/migrations/000003_workspaces.up.sql b/database/migrations/000003_workspaces.up.sql → ...abase/migrations/000003_workspaces.up.sql
diff --git a/database/migrations/000004_jobs.down.sql → .../database/migrations/000004_jobs.down.sql b/database/migrations/000004_jobs.down.sql → .../database/migrations/000004_jobs.down.sql
diff --git a/database/migrations/000004_jobs.up.sql → ...rd/database/migrations/000004_jobs.up.sql b/database/migrations/000004_jobs.up.sql → ...rd/database/migrations/000004_jobs.up.sql
diff --git a/database/migrations/create_migration.sh → ...d/database/migrations/create_migration.sh b/database/migrations/create_migration.sh → ...d/database/migrations/create_migration.sh
diff --git a/database/models.go → coderd/database/models.go b/database/models.go → coderd/database/models.go
diff --git a/database/postgres/postgres.go → coderd/database/postgres/postgres.go b/database/postgres/postgres.go → coderd/database/postgres/postgres.go
diff --git a/database/postgres/postgres_test.go → coderd/database/postgres/postgres_test.go b/database/postgres/postgres_test.go → coderd/database/postgres/postgres_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
 
-	"github.com/coder/coder/database/postgres"
+	"github.com/coder/coder/coderd/database/postgres"
 
 	_ "github.com/lib/pq"
 )

diff --git a/database/pubsub.go → coderd/database/pubsub.go b/database/pubsub.go → coderd/database/pubsub.go
diff --git a/database/pubsub_memory.go → coderd/database/pubsub_memory.go b/database/pubsub_memory.go → coderd/database/pubsub_memory.go
diff --git a/database/pubsub_memory_test.go → coderd/database/pubsub_memory_test.go b/database/pubsub_memory_test.go → coderd/database/pubsub_memory_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/coder/database"
+	"github.com/coder/coder/coderd/database"
 )
 
 func TestPubsubMemory(t *testing.T) {

diff --git a/database/pubsub_test.go → coderd/database/pubsub_test.go b/database/pubsub_test.go → coderd/database/pubsub_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/database/postgres"
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/database/postgres"
 )
 
 func TestPubsub(t *testing.T) {

diff --git a/database/querier.go → coderd/database/querier.go b/database/querier.go → coderd/database/querier.go
diff --git a/database/query.sql → coderd/database/query.sql b/database/query.sql → coderd/database/query.sql
diff --git a/database/query.sql.go → coderd/database/query.sql.go b/database/query.sql.go → coderd/database/query.sql.go
diff --git a/database/sqlc.yaml → coderd/database/sqlc.yaml b/database/sqlc.yaml → coderd/database/sqlc.yaml
diff --git a/database/time.go → coderd/database/time.go b/database/time.go → coderd/database/time.go
diff --git a/coderd/files.go b/coderd/files.go
@@ -12,10 +12,10 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
 
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/httpapi"
+	"github.com/coder/coder/coderd/httpmw"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
 )
 
 func (api *api) postFile(rw http.ResponseWriter, r *http.Request) {

diff --git a/httpapi/httpapi.go → coderd/httpapi/httpapi.go b/httpapi/httpapi.go → coderd/httpapi/httpapi.go
diff --git a/httpapi/httpapi_test.go → coderd/httpapi/httpapi_test.go b/httpapi/httpapi_test.go → coderd/httpapi/httpapi_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 func TestWrite(t *testing.T) {

diff --git a/httpmw/apikey.go → coderd/httpmw/apikey.go b/httpmw/apikey.go → coderd/httpmw/apikey.go
@@ -13,8 +13,8 @@ import (
 
 	"golang.org/x/oauth2"
 
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 // AuthCookie represents the name of the cookie the API key is stored in.

diff --git a/httpmw/apikey_test.go → coderd/httpmw/apikey_test.go b/httpmw/apikey_test.go → coderd/httpmw/apikey_test.go
@@ -12,11 +12,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/oauth2"
 
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/database/databasefake"
+	"github.com/coder/coder/coderd/httpapi"
+	"github.com/coder/coder/coderd/httpmw"
 	"github.com/coder/coder/cryptorand"
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/database/databasefake"
-	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
 )
 
 func randomAPIKeyParts() (id string, secret string) {

diff --git a/httpmw/httpmw.go → coderd/httpmw/httpmw.go b/httpmw/httpmw.go → coderd/httpmw/httpmw.go
@@ -7,7 +7,7 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
 
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 // parseUUID consumes a url parameter and parses it as a UUID.

diff --git a/httpmw/organizationparam.go → coderd/httpmw/organizationparam.go b/httpmw/organizationparam.go → coderd/httpmw/organizationparam.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/go-chi/chi/v5"
 
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 type organizationParamContextKey struct{}

diff --git a/httpmw/organizationparam_test.go → coderd/httpmw/organizationparam_test.go b/httpmw/organizationparam_test.go → coderd/httpmw/organizationparam_test.go
@@ -13,10 +13,10 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/database/databasefake"
+	"github.com/coder/coder/coderd/httpmw"
 	"github.com/coder/coder/cryptorand"
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/database/databasefake"
-	"github.com/coder/coder/httpmw"
 )
 
 func TestOrganizationParam(t *testing.T) {

diff --git a/httpmw/projectparam.go → coderd/httpmw/projectparam.go b/httpmw/projectparam.go → coderd/httpmw/projectparam.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/go-chi/chi/v5"
 
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 type projectParamContextKey struct{}

diff --git a/httpmw/projectparam_test.go → coderd/httpmw/projectparam_test.go b/httpmw/projectparam_test.go → coderd/httpmw/projectparam_test.go
@@ -13,10 +13,10 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/database/databasefake"
+	"github.com/coder/coder/coderd/httpmw"
 	"github.com/coder/coder/cryptorand"
-	"github.com/coder/coder/database"
-	"github.com/coder/coder/database/databasefake"
-	"github.com/coder/coder/httpmw"
 )
 
 func TestProjectParam(t *testing.T) {