add support for example id in route

coder · f0ssel · Dec 9, 2022 · Dec 6, 2022 · Dec 7, 2022 · Dec 7, 2022
commit da9fc00a70f94ee9ad97769471e95779ac9ac624
diff --git a/coderd/files.go b/coderd/files.go
@@ -19,6 +19,10 @@ import (
 	"github.com/coder/coder/codersdk"
 )
 
+const (
+	uploadFileContentTypeHeader = "application/x-tar"
+)
+
 func (api *API) postFile(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	apiKey := httpmw.APIKey(r)
@@ -32,7 +36,7 @@ func (api *API) postFile(rw http.ResponseWriter, r *http.Request) {
 	contentType := r.Header.Get("Content-Type")
 
 	switch contentType {
-	case "application/x-tar":
+	case uploadFileContentTypeHeader:
 	default:
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 			Message: fmt.Sprintf("Unsupported content type header %q.", contentType),

diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -2,7 +2,9 @@ package coderd
 
 import (
 	"context"
+	"crypto/sha256"
 	"database/sql"
+	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -23,6 +25,7 @@ import (
 	"github.com/coder/coder/coderd/provisionerdserver"
 	"github.com/coder/coder/coderd/rbac"
 	"github.com/coder/coder/codersdk"
+	"github.com/coder/coder/examples"
 )
 
 func (api *API) templateVersion(rw http.ResponseWriter, r *http.Request) {
@@ -834,19 +837,79 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
 	// Ensures the "owner" is properly applied.
 	tags := provisionerdserver.MutateTags(apiKey.UserID, req.ProvisionerTags)
 
-	file, err := api.Database.GetFileByID(ctx, req.FileID)
-	if errors.Is(err, sql.ErrNoRows) {
-		httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
-			Message: "File not found.",
+	if req.ExampleID != "" && req.FileID != uuid.Nil {
+		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
+			Message: "You cannot specify both an example_id and a file_id.",
 		})
 		return
 	}
-	if err != nil {
-		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Internal error fetching file.",
-			Detail:  err.Error(),
+
+	var file database.File
+	var err error
+	// if example id is specified we need to copy the embedded tar into a new file in the database
+	if req.ExampleID != "" {
+		if !api.Authorize(r, rbac.ActionCreate, rbac.ResourceFile.WithOwner(apiKey.UserID.String())) {
+			httpapi.Forbidden(rw)
+			return
+		}
+		// ensure we can read the file that either already exists or will be created
+		if !api.Authorize(r, rbac.ActionRead, rbac.ResourceFile.WithOwner(apiKey.UserID.String())) {
+			httpapi.Forbidden(rw)
+			return
+		}
+
+		// lookup template tar from embedded examples
+		tar, err := examples.Archive(req.ExampleID)
+		if err != nil {
+			if xerrors.Is(err, examples.ErrNotFound) {
+				httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
+					Message: "Example not found.",
+					Detail:  err.Error(),
+				})
+				return
+			}
+			httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+				Message: "Internal error fetching example.",
+				Detail:  err.Error(),
+			})
+			return
+		}
+
+		// upload a copy of the template tar as a file in the database
+		hashBytes := sha256.Sum256(tar)
+		hash := hex.EncodeToString(hashBytes[:])
+		file, err = api.Database.InsertFile(ctx, database.InsertFileParams{
+			ID:        uuid.New(),
+			Hash:      hash,
+			CreatedBy: apiKey.UserID,
+			CreatedAt: database.Now(),
+			Mimetype:  uploadFileContentTypeHeader,
+			Data:      tar,
 		})
-		return
+		if err != nil {
+			httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+				Message: "Internal error creating file.",
+				Detail:  err.Error(),
+			})
+			return
+		}
+	}
+
+	if req.FileID != uuid.Nil {
+		file, err = api.Database.GetFileByID(ctx, req.FileID)
+		if errors.Is(err, sql.ErrNoRows) {
+			httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
+				Message: "File not found.",
+			})
+			return
+		}
+		if err != nil {
+			httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+				Message: "Internal error fetching file.",
+				Detail:  err.Error(),
+			})
+			return
+		}
 	}
 
 	if !api.Authorize(r, rbac.ActionRead, file) {

diff --git a/codersdk/organizations.go b/codersdk/organizations.go
@@ -39,7 +39,7 @@ type CreateTemplateVersionRequest struct {
 	TemplateID      uuid.UUID                `json:"template_id,omitempty"`
 	StorageMethod   ProvisionerStorageMethod `json:"storage_method" validate:"oneof=file,required"`
 	FileID          uuid.UUID                `json:"file_id,omitempty" validate:"required_without=ExampleID"`
-	ExampleID       uuid.UUID                `json:"example_id,omitempty" validate:"required_without=FileID"`
+	ExampleID       string                   `json:"example_id,omitempty" validate:"required_without=FileID"`
 	Provisioner     ProvisionerType          `json:"provisioner" validate:"oneof=terraform echo,required"`
 	ProvisionerTags map[string]string        `json:"tags"`
 

diff --git a/examples/examples.go b/examples/examples.go
@@ -24,6 +24,7 @@ var (
 	examples        = make([]codersdk.TemplateExample, 0)
 	parseExamples   sync.Once
 	archives        = singleflight.Group{}
+	ErrNotFound     = xerrors.New("example not found")
 )
 
 const rootDir = "templates"
@@ -116,7 +117,7 @@ func Archive(exampleID string) ([]byte, error) {
 		}
 
 		if selected.ID == "" {
-			return nil, xerrors.Errorf("example with id %q not found", exampleID)
+			return nil, xerrors.Errorf("example with id %q not found: %w", exampleID, ErrNotFound)
 		}
 
 		exampleFiles, err := fs.Sub(files, path.Join(rootDir, exampleID))