chore(cdr): Move httpapi to /coderd directory

Emyrk · Emyrk · commit 8147977c95fc · 2022-03-25T14:54:30.000-05:00
httpapi is specific to coderd and should be scoped under coderd
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -11,7 +11,7 @@ import (
 
 	"cdr.dev/slog"
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
 	"github.com/coder/coder/site"
 )
diff --git a/coderd/files.go b/coderd/files.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
 )
 
diff --git a/coderd/httpapi/httpapi.go b/coderd/httpapi/httpapi.go
diff --git a/coderd/httpapi/httpapi_test.go b/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/coderd/httpmw/apikey.go b/coderd/httpmw/apikey.go
@@ -14,7 +14,7 @@ import (
 	"golang.org/x/oauth2"
 
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 // AuthCookie represents the name of the cookie the API key is stored in.
diff --git a/coderd/httpmw/apikey_test.go b/coderd/httpmw/apikey_test.go
@@ -15,7 +15,7 @@ import (
 	"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/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
 )
 
diff --git a/coderd/httpmw/httpmw.go b/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/coderd/httpmw/organizationparam.go b/coderd/httpmw/organizationparam.go
@@ -10,7 +10,7 @@ import (
 	"github.com/go-chi/chi/v5"
 
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 type organizationParamContextKey struct{}
diff --git a/coderd/httpmw/projectparam.go b/coderd/httpmw/projectparam.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/go-chi/chi/v5"
 
+	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
 )
 
 type projectParamContextKey struct{}
diff --git a/coderd/httpmw/projectversionparam.go b/coderd/httpmw/projectversionparam.go
@@ -10,7 +10,7 @@ import (
 	"github.com/go-chi/chi/v5"
 
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 type projectVersionParamContextKey struct{}
diff --git a/coderd/httpmw/userparam.go b/coderd/httpmw/userparam.go
@@ -8,7 +8,7 @@ import (
 	"github.com/go-chi/chi/v5"
 
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 type userParamContextKey struct{}
diff --git a/coderd/httpmw/workspaceagent.go b/coderd/httpmw/workspaceagent.go
@@ -10,7 +10,7 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 type workspaceAgentContextKey struct{}
diff --git a/coderd/httpmw/workspacebuildparam.go b/coderd/httpmw/workspacebuildparam.go
@@ -10,7 +10,7 @@ import (
 	"github.com/go-chi/chi/v5"
 
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 type workspaceBuildParamContextKey struct{}
diff --git a/coderd/httpmw/workspaceparam.go b/coderd/httpmw/workspaceparam.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 type workspaceParamContextKey struct{}
diff --git a/coderd/httpmw/workspaceresourceparam.go b/coderd/httpmw/workspaceresourceparam.go
@@ -10,7 +10,7 @@ import (
 	"github.com/go-chi/chi/v5"
 
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 type workspaceResourceParamContextKey struct{}
diff --git a/coderd/organizations.go b/coderd/organizations.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
 )
 
diff --git a/coderd/parameters.go b/coderd/parameters.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/coderd/httpapi"
 )
 
 func (api *api) postParameter(rw http.ResponseWriter, r *http.Request) {
diff --git a/coderd/projects.go b/coderd/projects.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/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
 )
 
diff --git a/coderd/projectversions.go b/coderd/projectversions.go
@@ -11,7 +11,7 @@ import (
 	"github.com/coder/coder/coderd/parameter"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
 )
 
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/coder/coder/coderd/parameter"
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/provisionerd/proto"
 	"github.com/coder/coder/provisionersdk"
 	sdkproto "github.com/coder/coder/provisionersdk/proto"
diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 // Returns provisioner logs based on query parameters.
diff --git a/coderd/users.go b/coderd/users.go
@@ -19,7 +19,7 @@ import (
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/cryptorand"
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
 )
 
diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
 )
 
diff --git a/coderd/workspaceresourceauth.go b/coderd/workspaceresourceauth.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 
 	"github.com/mitchellh/mapstructure"
 )
diff --git a/coderd/workspaceresources.go b/coderd/workspaceresources.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
 	"github.com/coder/coder/peerbroker"
 	"github.com/coder/coder/peerbroker/proto"
diff --git a/coderd/workspaces.go b/coderd/workspaces.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/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
 )
 
diff --git a/codersdk/client.go b/codersdk/client.go
@@ -14,7 +14,7 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/coder/coder/coderd/httpmw"
-	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/coderd/httpapi"
 )
 
 // New creates a Coder client for the provided URL.

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`
`12`	`12`	`"cdr.dev/slog"`
`13`	`13`	`"github.com/coder/coder/database"`
`14`		`- "github.com/coder/coder/httpapi"`
	`14`	`+ "github.com/coder/coder/coderd/httpapi"`
`15`	`15`	`"github.com/coder/coder/coderd/httpmw"`
`16`	`16`	`"github.com/coder/coder/site"`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`
`15`	`15`	`"github.com/coder/coder/codersdk"`
`16`	`16`	`"github.com/coder/coder/database"`
`17`		`- "github.com/coder/coder/httpapi"`
	`17`	`+ "github.com/coder/coder/coderd/httpapi"`
`18`	`18`	`"github.com/coder/coder/coderd/httpmw"`
`19`	`19`	`)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/stretchr/testify/require"`
`11`	`11`
`12`		`- "github.com/coder/coder/httpapi"`
	`12`	`+ "github.com/coder/coder/coderd/httpapi"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func TestWrite(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"github.com/coder/coder/cryptorand"`
`16`	`16`	`"github.com/coder/coder/database"`
`17`	`17`	`"github.com/coder/coder/database/databasefake"`
`18`		`- "github.com/coder/coder/httpapi"`
	`18`	`+ "github.com/coder/coder/coderd/httpapi"`
`19`	`19`	`"github.com/coder/coder/coderd/httpmw"`
`20`	`20`	`)`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/go-chi/chi/v5"`
`8`	`8`	`"github.com/google/uuid"`
`9`	`9`
`10`		`- "github.com/coder/coder/httpapi"`
	`10`	`+ "github.com/coder/coder/coderd/httpapi"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// parseUUID consumes a url parameter and parses it as a UUID.`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/go-chi/chi/v5"`
`11`	`11`
`12`	`12`	`"github.com/coder/coder/database"`
`13`		`- "github.com/coder/coder/httpapi"`
	`13`	`+ "github.com/coder/coder/coderd/httpapi"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`type organizationParamContextKey struct{}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/go-chi/chi/v5"`
`11`	`11`
	`12`	`+ "github.com/coder/coder/coderd/httpapi"`
`12`	`13`	`"github.com/coder/coder/database"`
`13`		`- "github.com/coder/coder/httpapi"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`type projectParamContextKey struct{}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/go-chi/chi/v5"`
`9`	`9`
`10`	`10`	`"github.com/coder/coder/database"`
`11`		`- "github.com/coder/coder/httpapi"`
	`11`	`+ "github.com/coder/coder/coderd/httpapi"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`type userParamContextKey struct{}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"net/http"`
`9`	`9`
`10`	`10`	`"github.com/coder/coder/database"`
`11`		`- "github.com/coder/coder/httpapi"`
	`11`	`+ "github.com/coder/coder/coderd/httpapi"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`type workspaceParamContextKey struct{}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`"github.com/coder/coder/codersdk"`
`14`	`14`	`"github.com/coder/coder/database"`
`15`		`- "github.com/coder/coder/httpapi"`
	`15`	`+ "github.com/coder/coder/coderd/httpapi"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func (api api) postParameter(rw http.ResponseWriter, r http.Request) {`