chore: Move httpapi, httpmw, & database into coderd (#568)

* chore: Move httpmw to /coderd directory
httpmw is specific to coderd and should be scoped under coderd

* chore: Move httpapi to /coderd directory
httpapi is specific to coderd and should be scoped under coderd

* chore: Move database  to /coderd directory
database is specific to coderd and should be scoped under coderd

* chore: Update codecov & gitattributes for generated files
* chore: Update Makefile

.gitattributes

@@ -1,5 +1,5 @@
 # Generated files
-database/dump.sql linguist-generated=true
+coderd/database/dump.sql linguist-generated=true
 peerbroker/proto/*.go linguist-generated=true
 provisionerd/proto/*.go linguist-generated=true
 provisionersdk/proto/*.go linguist-generated=true

Makefile

@@ -10,15 +10,15 @@ 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
+coderd/database/dump.sql: $(wildcard coderd/database/migrations/*.sql)
+	go run coderd/database/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
-.PHONY: database/generate
+coderd/database/generate: fmt/sql coderd/database/dump.sql coderd/database/query.sql
+	cd coderd/database && sqlc generate && rm db_tmp.go
+	cd coderd/database && gofmt -w -r 'Querier -> querier' *.go
+	cd coderd/database && gofmt -w -r 'Queries -> sqlQuerier' *.go
+.PHONY: coderd/database/generate
 
 fmt/prettier:
 	@echo "--- prettier"
@@ -30,18 +30,18 @@ else
 endif
 .PHONY: fmt/prettier
 
-fmt/sql: ./database/query.sql
+fmt/sql: ./coderd/database/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
+		./coderd/database/query.sql \
+		--output ./coderd/database/query.sql
+	sed -i 's/@ /@/g' ./coderd/database/query.sql
 
 fmt: fmt/prettier fmt/sql
 .PHONY: fmt
 
-gen: database/generate peerbroker/proto provisionersdk/proto provisionerd/proto
+gen: coderd/database/generate peerbroker/proto provisionersdk/proto provisionerd/proto
 .PHONY: gen
 
 install: bin

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 {

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 {

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"
 )

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"
 )

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 {

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"
 )
 

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 {

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"

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) {

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 {

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 {

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 {

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 {

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() {

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"

codecov.yml

@@ -24,14 +24,14 @@ coverage:
 
 ignore:
   # This is generated code.
-  - database/models.go
-  - database/query.sql.go
-  - database/databasefake
+  - coderd/database/models.go
+  - coderd/database/query.sql.go
+  - coderd/database/databasefake
   # These are generated or don't require tests.
   - cmd
   - coderd/tunnel
-  - database/dump
-  - database/postgres
+  - coderd/database/dump
+  - coderd/database/postgres
   - peerbroker/proto
   - provisionerd/proto
   - provisionersdk/proto

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"
 )
 

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"

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.

database/db.go → coderd/database/db.go

@@ -4,8 +4,8 @@
 //
 // To modify the database schema:
 // 1. Add a new migration using "create_migration.sh" in database/migrations/
-// 2. Run "make database/generate" in the root to generate models.
-// 3. Add/Edit queries in "query.sql" and run "make database/generate" to create Go code.
+// 2. Run "make coderd/database/generate" in the root to generate models.
+// 3. Add/Edit queries in "query.sql" and run "make coderd/database/generate" to create Go code.
 package database
 
 import (

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() {
@@ -76,7 +76,7 @@ func main() {
 		}
 	}
 
-	dump := fmt.Sprintf("-- Code generated by 'make database/generate'. DO NOT EDIT.\n%s", output.Bytes())
+	dump := fmt.Sprintf("-- Code generated by 'make coderd/database/generate'. DO NOT EDIT.\n%s", output.Bytes())
 	_, mainPath, _, ok := runtime.Caller(0)
 	if !ok {
 		panic("couldn't get caller path")

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) {

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"
 )

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) {

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) {

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) {

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) {

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.

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) {