chore(cdr): Move httpmw to /coderd directory

Emyrk · Emyrk · commit ba7c7fe75993 · 2022-03-25T14:51:21.000-05:00
httpmw is specific to coderd and should be scoped under coderd
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -12,7 +12,7 @@ import (
 	"cdr.dev/slog"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 	"github.com/coder/coder/site"
 )
 
diff --git a/coderd/files.go b/coderd/files.go
@@ -15,7 +15,7 @@ import (
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func (api *api) postFile(rw http.ResponseWriter, r *http.Request) {
diff --git a/coderd/httpmw/apikey.go b/coderd/httpmw/apikey.go
diff --git a/coderd/httpmw/apikey_test.go b/coderd/httpmw/apikey_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/database/databasefake"
 	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func randomAPIKeyParts() (id string, secret string) {
diff --git a/coderd/httpmw/httpmw.go b/coderd/httpmw/httpmw.go
diff --git a/coderd/httpmw/organizationparam.go b/coderd/httpmw/organizationparam.go
diff --git a/coderd/httpmw/organizationparam_test.go b/coderd/httpmw/organizationparam_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/coder/coder/cryptorand"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/database/databasefake"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func TestOrganizationParam(t *testing.T) {
diff --git a/coderd/httpmw/projectparam.go b/coderd/httpmw/projectparam.go
diff --git a/coderd/httpmw/projectparam_test.go b/coderd/httpmw/projectparam_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/coder/coder/cryptorand"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/database/databasefake"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func TestProjectParam(t *testing.T) {
diff --git a/coderd/httpmw/projectversionparam.go b/coderd/httpmw/projectversionparam.go
diff --git a/coderd/httpmw/projectversionparam_test.go b/coderd/httpmw/projectversionparam_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/coder/coder/cryptorand"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/database/databasefake"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func TestProjectVersionParam(t *testing.T) {
diff --git a/coderd/httpmw/userparam.go b/coderd/httpmw/userparam.go
diff --git a/coderd/httpmw/userparam_test.go b/coderd/httpmw/userparam_test.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/database/databasefake"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func TestUserParam(t *testing.T) {
diff --git a/coderd/httpmw/workspaceagent.go b/coderd/httpmw/workspaceagent.go
diff --git a/coderd/httpmw/workspaceagent_test.go b/coderd/httpmw/workspaceagent_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/database/databasefake"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func TestWorkspaceAgent(t *testing.T) {
diff --git a/coderd/httpmw/workspacebuildparam.go b/coderd/httpmw/workspacebuildparam.go
diff --git a/coderd/httpmw/workspacebuildparam_test.go b/coderd/httpmw/workspacebuildparam_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/coder/coder/cryptorand"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/database/databasefake"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func TestWorkspaceBuildParam(t *testing.T) {
diff --git a/coderd/httpmw/workspaceparam.go b/coderd/httpmw/workspaceparam.go
diff --git a/coderd/httpmw/workspaceparam_test.go b/coderd/httpmw/workspaceparam_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/coder/coder/cryptorand"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/database/databasefake"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func TestWorkspaceParam(t *testing.T) {
diff --git a/coderd/httpmw/workspaceresourceparam.go b/coderd/httpmw/workspaceresourceparam.go
diff --git a/coderd/httpmw/workspaceresourceparam_test.go b/coderd/httpmw/workspaceresourceparam_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/database/databasefake"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func TestWorkspaceResourceParam(t *testing.T) {
diff --git a/coderd/organizations.go b/coderd/organizations.go
@@ -15,7 +15,7 @@ import (
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func (*api) organization(rw http.ResponseWriter, r *http.Request) {
diff --git a/coderd/projects.go b/coderd/projects.go
@@ -13,7 +13,7 @@ import (
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 // Returns a single project.
diff --git a/coderd/projectversions.go b/coderd/projectversions.go
@@ -12,7 +12,7 @@ import (
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func (api *api) projectVersion(rw http.ResponseWriter, r *http.Request) {
diff --git a/coderd/users.go b/coderd/users.go
@@ -20,7 +20,7 @@ import (
 	"github.com/coder/coder/cryptorand"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 // Returns whether the initial user has been created or not.
diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func TestFirstUser(t *testing.T) {
diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go
@@ -10,7 +10,7 @@ import (
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func (api *api) workspaceBuild(rw http.ResponseWriter, r *http.Request) {
diff --git a/coderd/workspaceresources.go b/coderd/workspaceresources.go
@@ -18,7 +18,7 @@ import (
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 	"github.com/coder/coder/peerbroker"
 	"github.com/coder/coder/peerbroker/proto"
 	"github.com/coder/coder/provisionersdk"
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -16,7 +16,7 @@ import (
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 )
 
 func (api *api) workspace(rw http.ResponseWriter, r *http.Request) {
diff --git a/codersdk/client.go b/codersdk/client.go
@@ -13,8 +13,8 @@ import (
 
 	"golang.org/x/xerrors"
 
+	"github.com/coder/coder/coderd/httpmw"
 	"github.com/coder/coder/httpapi"
-	"github.com/coder/coder/httpmw"
 )
 
 // New creates a Coder client for the provided URL.
diff --git a/codersdk/workspaceresources.go b/codersdk/workspaceresources.go
@@ -16,7 +16,7 @@ import (
 	"nhooyr.io/websocket"
 
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpmw"
+	"github.com/coder/coder/coderd/httpmw"
 	"github.com/coder/coder/peer"
 	"github.com/coder/coder/peerbroker"
 	"github.com/coder/coder/peerbroker/proto"

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"cdr.dev/slog"`
`13`	`13`	`"github.com/coder/coder/database"`
`14`	`14`	`"github.com/coder/coder/httpapi"`
`15`		`- "github.com/coder/coder/httpmw"`
	`15`	`+ "github.com/coder/coder/coderd/httpmw"`
`16`	`16`	`"github.com/coder/coder/site"`
`17`	`17`	`)`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"github.com/coder/coder/codersdk"`
`16`	`16`	`"github.com/coder/coder/database"`
`17`	`17`	`"github.com/coder/coder/httpapi"`
`18`		`- "github.com/coder/coder/httpmw"`
	`18`	`+ "github.com/coder/coder/coderd/httpmw"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`func (api api) postFile(rw http.ResponseWriter, r http.Request) {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`"github.com/coder/coder/database"`
`17`	`17`	`"github.com/coder/coder/database/databasefake"`
`18`	`18`	`"github.com/coder/coder/httpapi"`
`19`		`- "github.com/coder/coder/httpmw"`
	`19`	`+ "github.com/coder/coder/coderd/httpmw"`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`func randomAPIKeyParts() (id string, secret string) {`