coder · f0ssel · Apr 12, 2022 · Apr 8, 2022 · Apr 9, 2022 · Apr 9, 2022
diff --git a/cli/workspaceautostart_test.go b/cli/workspaceautostart_test.go
@@ -5,10 +5,11 @@ import (
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
-	"github.com/stretchr/testify/require"
 )
 
 func TestWorkspaceAutostart(t *testing.T) {

diff --git a/cli/workspaceautostop_test.go b/cli/workspaceautostop_test.go
@@ -5,10 +5,11 @@ import (
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
-	"github.com/stretchr/testify/require"
 )
 
 func TestWorkspaceAutostop(t *testing.T) {

diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/render"
 	"google.golang.org/api/idtoken"
 
 	chitrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/go-chi/chi.v5"
@@ -67,8 +66,7 @@ func New(options *Options) (http.Handler, func()) {
 		})
 		r.Route("/buildinfo", func(r chi.Router) {
 			r.Get("/", func(rw http.ResponseWriter, r *http.Request) {
-				render.Status(r, http.StatusOK)
-				render.JSON(rw, r, codersdk.BuildInfoResponse{
+				httpapi.Write(rw, http.StatusOK, codersdk.BuildInfoResponse{
 					ExternalURL: buildinfo.ExternalURL(),
 					Version:     buildinfo.Version(),
 				})

diff --git a/coderd/files.go b/coderd/files.go
@@ -10,7 +10,6 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/render"
 
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/httpapi"
@@ -44,8 +43,7 @@ func (api *api) postFile(rw http.ResponseWriter, r *http.Request) {
 	file, err := api.Database.GetFileByHash(r.Context(), hash)
 	if err == nil {
 		// The file already exists!
-		render.Status(r, http.StatusOK)
-		render.JSON(rw, r, codersdk.UploadResponse{
+		httpapi.Write(rw, http.StatusOK, codersdk.UploadResponse{
 			Hash: file.Hash,
 		})
 		return
@@ -63,8 +61,8 @@ func (api *api) postFile(rw http.ResponseWriter, r *http.Request) {
 		})
 		return
 	}
-	render.Status(r, http.StatusCreated)
-	render.JSON(rw, r, codersdk.UploadResponse{
+
+	httpapi.Write(rw, http.StatusCreated, codersdk.UploadResponse{
 		Hash: file.Hash,
 	})
 }

diff --git a/coderd/gitsshkey.go b/coderd/gitsshkey.go
@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/go-chi/render"
-
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/gitsshkey"
 	"github.com/coder/coder/coderd/httpapi"
@@ -44,8 +42,7 @@ func (api *api) regenerateGitSSHKey(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, codersdk.GitSSHKey{
+	httpapi.Write(rw, http.StatusOK, codersdk.GitSSHKey{
 		UserID:    newKey.UserID,
 		CreatedAt: newKey.CreatedAt,
 		UpdatedAt: newKey.UpdatedAt,
@@ -64,8 +61,7 @@ func (api *api) gitSSHKey(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, codersdk.GitSSHKey{
+	httpapi.Write(rw, http.StatusOK, codersdk.GitSSHKey{
 		UserID:    gitSSHKey.UserID,
 		CreatedAt: gitSSHKey.CreatedAt,
 		UpdatedAt: gitSSHKey.UpdatedAt,
@@ -108,8 +104,7 @@ func (api *api) agentGitSSHKey(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, codersdk.AgentGitSSHKey{
+	httpapi.Write(rw, http.StatusOK, codersdk.AgentGitSSHKey{
 		PrivateKey: gitSSHKey.PrivateKey,
 	})
 }
diff --git a/coderd/httpapi/httpapi.go b/coderd/httpapi/httpapi.go
@@ -63,7 +63,7 @@ type Error struct {
 }
 
 // Write outputs a standardized format to an HTTP response body.
-func Write(rw http.ResponseWriter, status int, response Response) {
+func Write(rw http.ResponseWriter, status int, response interface{}) {
 	buf := &bytes.Buffer{}
 	enc := json.NewEncoder(buf)
 	enc.SetEscapeHTML(true)

diff --git a/coderd/httpmw/ratelimit.go b/coderd/httpmw/ratelimit.go
@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/go-chi/httprate"
-	"github.com/go-chi/render"
 
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/httpapi"
@@ -26,8 +25,7 @@ func RateLimitPerMinute(count int) func(http.Handler) http.Handler {
 			return httprate.KeyByIP(r)
 		}, httprate.KeyByEndpoint),
 		httprate.WithLimitHandler(func(w http.ResponseWriter, r *http.Request) {
-			render.Status(r, http.StatusTooManyRequests)
-			render.JSON(w, r, httpapi.Response{
+			httpapi.Write(w, http.StatusTooManyRequests, httpapi.Response{
 				Message: "You've been rate limited for sending too many requests!",
 			})
 		}),

diff --git a/coderd/organizations.go b/coderd/organizations.go
@@ -7,7 +7,6 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/render"
 	"github.com/google/uuid"
 	"github.com/moby/moby/pkg/namesgenerator"
 	"golang.org/x/xerrors"
@@ -20,8 +19,7 @@ import (
 
 func (*api) organization(rw http.ResponseWriter, r *http.Request) {
 	organization := httpmw.OrganizationParam(r)
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, convertOrganization(organization))
+	httpapi.Write(rw, http.StatusOK, convertOrganization(organization))
 }
 
 func (api *api) provisionerDaemonsByOrganization(rw http.ResponseWriter, r *http.Request) {
@@ -38,8 +36,7 @@ func (api *api) provisionerDaemonsByOrganization(rw http.ResponseWriter, r *http
 	if daemons == nil {
 		daemons = []database.ProvisionerDaemon{}
 	}
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, daemons)
+	httpapi.Write(rw, http.StatusOK, daemons)
 }
 
 // Creates a new version of a template. An import job is queued to parse the storage method provided.
@@ -147,8 +144,7 @@ func (api *api) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
 		return
 	}
 
-	render.Status(r, http.StatusCreated)
-	render.JSON(rw, r, convertTemplateVersion(templateVersion, convertProvisionerJob(provisionerJob)))
+	httpapi.Write(rw, http.StatusCreated, convertTemplateVersion(templateVersion, convertProvisionerJob(provisionerJob)))
 }
 
 // Create a new template in an organization.
@@ -252,8 +248,7 @@ func (api *api) postTemplatesByOrganization(rw http.ResponseWriter, r *http.Requ
 		return
 	}
 
-	render.Status(r, http.StatusCreated)
-	render.JSON(rw, r, template)
+	httpapi.Write(rw, http.StatusCreated, template)
 }
 
 func (api *api) templatesByOrganization(rw http.ResponseWriter, r *http.Request) {
@@ -284,8 +279,8 @@ func (api *api) templatesByOrganization(rw http.ResponseWriter, r *http.Request)
 		})
 		return
 	}
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, convertTemplates(templates, workspaceCounts))
+
+	httpapi.Write(rw, http.StatusOK, convertTemplates(templates, workspaceCounts))
 }
 
 func (api *api) templateByOrganizationAndName(rw http.ResponseWriter, r *http.Request) {
@@ -325,8 +320,7 @@ func (api *api) templateByOrganizationAndName(rw http.ResponseWriter, r *http.Re
 		count = uint32(workspaceCounts[0].Count)
 	}
 
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, convertTemplate(template, count))
+	httpapi.Write(rw, http.StatusOK, convertTemplate(template, count))
 }
 
 // convertOrganization consumes the database representation and outputs an API friendly representation.

diff --git a/coderd/parameters.go b/coderd/parameters.go
@@ -7,7 +7,6 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/render"
 	"github.com/google/uuid"
 
 	"github.com/coder/coder/coderd/database"
@@ -59,8 +58,7 @@ func (api *api) postParameter(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	render.Status(r, http.StatusCreated)
-	render.JSON(rw, r, convertParameterValue(parameterValue))
+	httpapi.Write(rw, http.StatusCreated, convertParameterValue(parameterValue))
 }
 
 func (api *api) parameters(rw http.ResponseWriter, r *http.Request) {
@@ -86,8 +84,7 @@ func (api *api) parameters(rw http.ResponseWriter, r *http.Request) {
 		apiParameterValues = append(apiParameterValues, convertParameterValue(parameterValue))
 	}
 
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, apiParameterValues)
+	httpapi.Write(rw, http.StatusOK, apiParameterValues)
 }
 
 func (api *api) deleteParameter(rw http.ResponseWriter, r *http.Request) {

diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go
@@ -10,7 +10,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/go-chi/render"
 	"github.com/google/uuid"
 
 	"cdr.dev/slog"
@@ -87,8 +86,8 @@ func (api *api) provisionerJobLogs(rw http.ResponseWriter, r *http.Request, job
 		if logs == nil {
 			logs = []database.ProvisionerJobLog{}
 		}
-		render.Status(r, http.StatusOK)
-		render.JSON(rw, r, logs)
+
+		httpapi.Write(rw, http.StatusOK, logs)
 		return
 	}
 
@@ -229,8 +228,8 @@ func (api *api) provisionerJobResources(rw http.ResponseWriter, r *http.Request,
 		}
 		apiResources = append(apiResources, convertWorkspaceResource(resource, agents))
 	}
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, apiResources)
+
+	httpapi.Write(rw, http.StatusOK, apiResources)
 }
 
 func convertProvisionerJobLog(provisionerJobLog database.ProvisionerJobLog) codersdk.ProvisionerJobLog {

diff --git a/coderd/templates.go b/coderd/templates.go
@@ -7,7 +7,6 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/render"
 	"github.com/google/uuid"
 
 	"github.com/coder/coder/coderd/database"
@@ -34,8 +33,7 @@ func (api *api) template(rw http.ResponseWriter, r *http.Request) {
 		count = uint32(workspaceCounts[0].Count)
 	}
 
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, convertTemplate(template, count))
+	httpapi.Write(rw, http.StatusOK, convertTemplate(template, count))
 }
 
 func (api *api) deleteTemplate(rw http.ResponseWriter, r *http.Request) {
@@ -114,8 +112,8 @@ func (api *api) templateVersionsByTemplate(rw http.ResponseWriter, r *http.Reque
 		}
 		apiVersion = append(apiVersion, convertTemplateVersion(version, convertProvisionerJob(job)))
 	}
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, apiVersion)
+
+	httpapi.Write(rw, http.StatusOK, apiVersion)
 }
 
 func (api *api) templateVersionByName(rw http.ResponseWriter, r *http.Request) {
@@ -148,8 +146,7 @@ func (api *api) templateVersionByName(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, convertTemplateVersion(templateVersion, convertProvisionerJob(job)))
+	httpapi.Write(rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(job)))
 }
 
 func (api *api) patchActiveTemplateVersion(rw http.ResponseWriter, r *http.Request) {

diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/go-chi/render"
-
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
@@ -24,8 +22,8 @@ func (api *api) templateVersion(rw http.ResponseWriter, r *http.Request) {
 		})
 		return
 	}
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, convertTemplateVersion(templateVersion, convertProvisionerJob(job)))
+
+	httpapi.Write(rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(job)))
 }
 
 func (api *api) patchCancelTemplateVersion(rw http.ResponseWriter, r *http.Request) {
@@ -95,8 +93,8 @@ func (api *api) templateVersionSchema(rw http.ResponseWriter, r *http.Request) {
 	if schemas == nil {
 		schemas = []database.ParameterSchema{}
 	}
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, schemas)
+
+	httpapi.Write(rw, http.StatusOK, schemas)
 }
 
 func (api *api) templateVersionParameters(rw http.ResponseWriter, r *http.Request) {
@@ -132,8 +130,8 @@ func (api *api) templateVersionParameters(rw http.ResponseWriter, r *http.Reques
 	if values == nil {
 		values = []parameter.ComputedValue{}
 	}
-	render.Status(r, http.StatusOK)
-	render.JSON(rw, r, values)
+
+	httpapi.Write(rw, http.StatusOK, values)
 }
 
 func (api *api) templateVersionResources(rw http.ResponseWriter, r *http.Request) {