feat: support template bundles as zip archives

coder · mtojek · Jan 31, 2024 · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024
commit 11fd5529bab87b59ce41fdf8df7bcaab005a683d
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/files.go b/coderd/files.go
@@ -21,6 +21,7 @@ import (
 
 const (
 	tarMimeType = "application/x-tar"
+	zipMimeType = "application/zip"
 )
 
 // @Summary Upload file
@@ -30,7 +31,7 @@ const (
 // @Produce json
 // @Accept application/x-tar
 // @Tags Files
-// @Param Content-Type header string true "Content-Type must be `application/x-tar`" default(application/x-tar)
+// @Param Content-Type header string true "Content-Type must be `application/x-tar` or `application/zip`" default(application/x-tar)
 // @Param file formData file true "File to be uploaded"
 // @Success 201 {object} codersdk.UploadResponse
 // @Router /files [post]
@@ -41,7 +42,7 @@ func (api *API) postFile(rw http.ResponseWriter, r *http.Request) {
 	contentType := r.Header.Get("Content-Type")
 
 	switch contentType {
-	case tarMimeType:
+	case tarMimeType, zipMimeType:
 	default:
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 			Message: fmt.Sprintf("Unsupported content type header %q.", contentType),
@@ -78,6 +79,11 @@ func (api *API) postFile(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if contentType == zipMimeType {
+		// FIXME Repack to .tar format.
+		contentType = tarMimeType
+	}
+
 	id := uuid.New()
 	file, err = api.Database.InsertFile(ctx, database.InsertFileParams{
 		ID:        id,

diff --git a/docs/api/files.md b/docs/api/files.md