coder · coadler · May 17, 2022 · May 17, 2022 · May 17, 2022 · May 17, 2022
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -73,6 +73,10 @@
       {
         "match": "database/queries/*.sql",
         "cmd": "make gen"
+      },
+      {
+        "match": "provisionerd/proto/provisionerd.proto",
+        "cmd": "make provisionerd/proto/provisionerd.pb.go",
       }
     ]
   },

diff --git a/coderd/audit/table.go b/coderd/audit/table.go
@@ -78,7 +78,7 @@ var AuditableResources = auditMap(map[any]map[string]Action{
 		"created_at":      ActionIgnore, // Never changes, but is implicit and not helpful in a diff.
 		"updated_at":      ActionIgnore, // Changes, but is implicit and not helpful in a diff.
 		"name":            ActionTrack,
-		"description":     ActionTrack,
+		"readme":          ActionTrack,
 		"job_id":          ActionIgnore, // Not helpful in a diff because jobs aren't tracked in audit logs.
 	},
 	&database.User{}: {

diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -175,8 +175,8 @@ func New(options *Options) (http.Handler, func()) {
 			r.Use(
 				apiKeyMiddleware,
 				httpmw.ExtractTemplateParam(options.Database),
-				httpmw.ExtractOrganizationParam(options.Database),
 			)
+
 			r.Get("/", api.template)
 			r.Delete("/", api.deleteTemplate)
 			r.Route("/versions", func(r chi.Router) {
@@ -189,7 +189,6 @@ func New(options *Options) (http.Handler, func()) {
 			r.Use(
 				apiKeyMiddleware,
 				httpmw.ExtractTemplateVersionParam(options.Database),
-				httpmw.ExtractOrganizationParam(options.Database),
 			)
 
 			r.Get("/", api.templateVersion)

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -6,6 +6,7 @@ import (
 	"sort"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/google/uuid"
 	"golang.org/x/exp/slices"
@@ -1189,7 +1190,7 @@ func (q *fakeQuerier) InsertTemplateVersion(_ context.Context, arg database.Inse
 		CreatedAt:      arg.CreatedAt,
 		UpdatedAt:      arg.UpdatedAt,
 		Name:           arg.Name,
-		Description:    arg.Description,
+		Readme:         arg.Readme,
 		JobID:          arg.JobID,
 	}
 	q.templateVersions = append(q.templateVersions, version)
@@ -1478,7 +1479,7 @@ func (q *fakeQuerier) UpdateTemplateActiveVersionByID(_ context.Context, arg dat
 	defer q.mutex.Unlock()
 
 	for index, template := range q.templates {
-		if template.ID.String() != arg.ID.String() {
+		if template.ID != arg.ID {
 			continue
 		}
 		template.ActiveVersionID = arg.ActiveVersionID
@@ -1493,7 +1494,7 @@ func (q *fakeQuerier) UpdateTemplateDeletedByID(_ context.Context, arg database.
 	defer q.mutex.Unlock()
 
 	for index, template := range q.templates {
-		if template.ID.String() != arg.ID.String() {
+		if template.ID != arg.ID {
 			continue
 		}
 		template.Deleted = arg.Deleted
@@ -1508,7 +1509,7 @@ func (q *fakeQuerier) UpdateTemplateVersionByID(_ context.Context, arg database.
 	defer q.mutex.Unlock()
 
 	for index, templateVersion := range q.templateVersions {
-		if templateVersion.ID.String() != arg.ID.String() {
+		if templateVersion.ID != arg.ID {
 			continue
 		}
 		templateVersion.TemplateID = arg.TemplateID
@@ -1519,12 +1520,28 @@ func (q *fakeQuerier) UpdateTemplateVersionByID(_ context.Context, arg database.
 	return sql.ErrNoRows
 }
 
+func (q *fakeQuerier) UpdateTemplateVersionDescriptionByJobID(_ context.Context, arg database.UpdateTemplateVersionDescriptionByJobIDParams) error {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for index, templateVersion := range q.templateVersions {
+		if templateVersion.JobID != arg.JobID {
+			continue
+		}
+		templateVersion.Readme = arg.Readme
+		templateVersion.UpdatedAt = time.Now()
+		q.templateVersions[index] = templateVersion
+		return nil
+	}
+	return sql.ErrNoRows
+}
+
 func (q *fakeQuerier) UpdateProvisionerDaemonByID(_ context.Context, arg database.UpdateProvisionerDaemonByIDParams) error {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
 	for index, daemon := range q.provisionerDaemons {
-		if arg.ID.String() != daemon.ID.String() {
+		if arg.ID != daemon.ID {
 			continue
 		}
 		daemon.UpdatedAt = arg.UpdatedAt
@@ -1540,7 +1557,7 @@ func (q *fakeQuerier) UpdateWorkspaceAgentConnectionByID(_ context.Context, arg
 	defer q.mutex.Unlock()
 
 	for index, agent := range q.provisionerJobAgents {
-		if agent.ID.String() != arg.ID.String() {
+		if agent.ID != arg.ID {
 			continue
 		}
 		agent.FirstConnectedAt = arg.FirstConnectedAt
@@ -1557,7 +1574,7 @@ func (q *fakeQuerier) UpdateProvisionerJobByID(_ context.Context, arg database.U
 	defer q.mutex.Unlock()
 
 	for index, job := range q.provisionerJobs {
-		if arg.ID.String() != job.ID.String() {
+		if arg.ID != job.ID {
 			continue
 		}
 		job.UpdatedAt = arg.UpdatedAt
@@ -1572,7 +1589,7 @@ func (q *fakeQuerier) UpdateProvisionerJobWithCancelByID(_ context.Context, arg
 	defer q.mutex.Unlock()
 
 	for index, job := range q.provisionerJobs {
-		if arg.ID.String() != job.ID.String() {
+		if arg.ID != job.ID {
 			continue
 		}
 		job.CanceledAt = arg.CanceledAt
@@ -1587,7 +1604,7 @@ func (q *fakeQuerier) UpdateProvisionerJobWithCompleteByID(_ context.Context, ar
 	defer q.mutex.Unlock()
 
 	for index, job := range q.provisionerJobs {
-		if arg.ID.String() != job.ID.String() {
+		if arg.ID != job.ID {
 			continue
 		}
 		job.UpdatedAt = arg.UpdatedAt
@@ -1604,7 +1621,7 @@ func (q *fakeQuerier) UpdateWorkspaceAutostart(_ context.Context, arg database.U
 	defer q.mutex.Unlock()
 
 	for index, workspace := range q.workspaces {
-		if workspace.ID.String() != arg.ID.String() {
+		if workspace.ID != arg.ID {
 			continue
 		}
 		workspace.AutostartSchedule = arg.AutostartSchedule
@@ -1620,7 +1637,7 @@ func (q *fakeQuerier) UpdateWorkspaceAutostop(_ context.Context, arg database.Up
 	defer q.mutex.Unlock()
 
 	for index, workspace := range q.workspaces {
-		if workspace.ID.String() != arg.ID.String() {
+		if workspace.ID != arg.ID {
 			continue
 		}
 		workspace.AutostopSchedule = arg.AutostopSchedule
@@ -1636,7 +1653,7 @@ func (q *fakeQuerier) UpdateWorkspaceBuildByID(_ context.Context, arg database.U
 	defer q.mutex.Unlock()
 
 	for index, workspaceBuild := range q.workspaceBuilds {
-		if workspaceBuild.ID.String() != arg.ID.String() {
+		if workspaceBuild.ID != arg.ID {
 			continue
 		}
 		workspaceBuild.UpdatedAt = arg.UpdatedAt
@@ -1653,7 +1670,7 @@ func (q *fakeQuerier) UpdateWorkspaceDeletedByID(_ context.Context, arg database
 	defer q.mutex.Unlock()
 
 	for index, workspace := range q.workspaces {
-		if workspace.ID.String() != arg.ID.String() {
+		if workspace.ID != arg.ID {
 			continue
 		}
 		workspace.Deleted = arg.Deleted

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000012_template_version_readme.down.sql b/coderd/database/migrations/000012_template_version_readme.down.sql
@@ -0,0 +1 @@
+ALTER TABLE template_versions RENAME README TO description;
diff --git a/coderd/database/migrations/000012_template_version_readme.up.sql b/coderd/database/migrations/000012_template_version_readme.up.sql
@@ -0,0 +1 @@
+ALTER TABLE template_versions RENAME description TO readme;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templateversions.sql b/coderd/database/queries/templateversions.sql
@@ -66,7 +66,7 @@ INSERT INTO
 		created_at,
 		updated_at,
 		"name",
-		description,
+		readme,
 		job_id
 	)
 VALUES
@@ -80,3 +80,12 @@ SET
 	updated_at = $3
 WHERE
 	id = $1;
+
+-- name: UpdateTemplateVersionDescriptionByJobID :exec
+UPDATE
+	template_versions
+SET
+	readme = $2,
+	updated_at = now()
+WHERE
+	job_id = $1;
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -348,6 +348,16 @@ func (server *provisionerdServer) UpdateJob(ctx context.Context, request *proto.
 		}
 	}
 
+	if len(request.Readme) > 0 {
+		err := server.Database.UpdateTemplateVersionDescriptionByJobID(ctx, database.UpdateTemplateVersionDescriptionByJobIDParams{
+			JobID:  job.ID,
+			Readme: string(request.Readme),
+		})
+		if err != nil {
+			return nil, xerrors.Errorf("update template version description: %w", err)
+		}
+	}
+
 	if len(request.ParameterSchemas) > 0 {
 		for _, protoParameter := range request.ParameterSchemas {
 			validationTypeSystem, err := convertValidationTypeSystem(protoParameter.ValidationTypeSystem)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE template_versions RENAME README TO description;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE template_versions RENAME description TO readme;