add owner information in apis and ui

coder · AbhineetJain · Jun 10, 2022 · Jun 8, 2022 · Jun 9, 2022 · Jun 10, 2022
commit 02cb2930ce57d244c3d34fe12687e41d86451369
diff --git a/coderd/audit/diff_test.go b/coderd/audit/diff_test.go
@@ -88,6 +88,7 @@ func TestDiff(t *testing.T) {
 				ActiveVersionID:      uuid.UUID{3},
 				MaxTtl:               int64(time.Hour),
 				MinAutostartInterval: int64(time.Minute),
+				OwnerID:              uuid.NullUUID{UUID: uuid.UUID{4}, Valid: true},
 			},
 			exp: audit.Map{
 				"id":                     uuid.UUID{1}.String(),
@@ -97,6 +98,7 @@ func TestDiff(t *testing.T) {
 				"active_version_id":      uuid.UUID{3}.String(),
 				"max_ttl":                int64(3600000000000),
 				"min_autostart_interval": int64(60000000000),
+				"owner_id":               uuid.UUID{4}.String(),
 			},
 		},
 	})

diff --git a/coderd/audit/table.go b/coderd/audit/table.go
@@ -72,6 +72,7 @@ var AuditableResources = auditMap(map[any]map[string]Action{
 		"description":            ActionTrack,
 		"max_ttl":                ActionTrack,
 		"min_autostart_interval": ActionTrack,
+		"owner_id":               ActionTrack,
 	},
 	&database.TemplateVersion{}: {
 		"id":              ActionTrack,

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -1316,6 +1316,7 @@ func (q *fakeQuerier) InsertTemplate(_ context.Context, arg database.InsertTempl
 		Description:          arg.Description,
 		MaxTtl:               arg.MaxTtl,
 		MinAutostartInterval: arg.MinAutostartInterval,
+		OwnerID:              arg.OwnerID,
 	}
 	q.templates = append(q.templates, template)
 	return template, nil

diff --git a/coderd/templates.go b/coderd/templates.go
@@ -1,6 +1,7 @@
 package coderd
 
 import (
+	"context"
 	"database/sql"
 	"errors"
 	"fmt"
@@ -49,7 +50,7 @@ func (api *API) template(rw http.ResponseWriter, r *http.Request) {
 		count = uint32(workspaceCounts[0].Count)
 	}
 
-	httpapi.Write(rw, http.StatusOK, convertTemplate(template, count))
+	httpapi.Write(rw, http.StatusOK, convertTemplate(r.Context(), api.Database, template, count))
 }
 
 func (api *API) deleteTemplate(rw http.ResponseWriter, r *http.Request) {
@@ -97,6 +98,7 @@ func (api *API) deleteTemplate(rw http.ResponseWriter, r *http.Request) {
 func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Request) {
 	var createTemplate codersdk.CreateTemplateRequest
 	organization := httpmw.OrganizationParam(r)
+	apiKey := httpmw.APIKey(r)
 	if !api.Authorize(rw, r, rbac.ActionCreate, rbac.ResourceTemplate.InOrg(organization.ID)) {
 		return
 	}
@@ -175,6 +177,10 @@ func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Reque
 			Description:          createTemplate.Description,
 			MaxTtl:               int64(maxTTL),
 			MinAutostartInterval: int64(minAutostartInterval),
+			OwnerID: uuid.NullUUID{
+				UUID:  apiKey.UserID,
+				Valid: true,
+			},
 		})
 		if err != nil {
 			return xerrors.Errorf("insert template: %s", err)
@@ -208,7 +214,7 @@ func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Reque
 			}
 		}
 
-		template = convertTemplate(dbTemplate, 0)
+		template = convertTemplate(r.Context(), db, dbTemplate, 0)
 		return nil
 	})
 	if err != nil {
@@ -258,7 +264,7 @@ func (api *API) templatesByOrganization(rw http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	httpapi.Write(rw, http.StatusOK, convertTemplates(templates, workspaceCounts))
+	httpapi.Write(rw, http.StatusOK, convertTemplates(r.Context(), api.Database, templates, workspaceCounts))
 }
 
 func (api *API) templateByOrganizationAndName(rw http.ResponseWriter, r *http.Request) {
@@ -304,7 +310,7 @@ func (api *API) templateByOrganizationAndName(rw http.ResponseWriter, r *http.Re
 		count = uint32(workspaceCounts[0].Count)
 	}
 
-	httpapi.Write(rw, http.StatusOK, convertTemplate(template, count))
+	httpapi.Write(rw, http.StatusOK, convertTemplate(r.Context(), api.Database, template, count))
 }
 
 func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
@@ -400,29 +406,36 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	httpapi.Write(rw, http.StatusOK, convertTemplate(updated, count))
+	httpapi.Write(rw, http.StatusOK, convertTemplate(r.Context(), api.Database, updated, count))
 }
 
-func convertTemplates(templates []database.Template, workspaceCounts []database.GetWorkspaceOwnerCountsByTemplateIDsRow) []codersdk.Template {
+func convertTemplates(ctx context.Context, db database.Store, templates []database.Template, workspaceCounts []database.GetWorkspaceOwnerCountsByTemplateIDsRow) []codersdk.Template {
 	apiTemplates := make([]codersdk.Template, 0, len(templates))
 	for _, template := range templates {
 		found := false
 		for _, workspaceCount := range workspaceCounts {
 			if workspaceCount.TemplateID.String() != template.ID.String() {
 				continue
 			}
-			apiTemplates = append(apiTemplates, convertTemplate(template, uint32(workspaceCount.Count)))
+			apiTemplates = append(apiTemplates, convertTemplate(ctx, db, template, uint32(workspaceCount.Count)))
 			found = true
 			break
 		}
 		if !found {
-			apiTemplates = append(apiTemplates, convertTemplate(template, uint32(0)))
+			apiTemplates = append(apiTemplates, convertTemplate(ctx, db, template, uint32(0)))
 		}
 	}
 	return apiTemplates
 }
 
-func convertTemplate(template database.Template, workspaceOwnerCount uint32) codersdk.Template {
+func convertTemplate(ctx context.Context, db database.Store, template database.Template, workspaceOwnerCount uint32) codersdk.Template {
+	var ownerName string
+	if template.OwnerID.Valid {
+		owner, err := db.GetUserByID(ctx, template.OwnerID.UUID)
+		if err == nil {
+			ownerName = owner.Username
+		}
+	}
 	return codersdk.Template{
 		ID:                         template.ID,
 		CreatedAt:                  template.CreatedAt,
@@ -435,5 +448,7 @@ func convertTemplate(template database.Template, workspaceOwnerCount uint32) cod
 		Description:                template.Description,
 		MaxTTLMillis:               time.Duration(template.MaxTtl).Milliseconds(),
 		MinAutostartIntervalMillis: time.Duration(template.MinAutostartInterval).Milliseconds(),
+		OwnerID:                    template.OwnerID,
+		OwnerName:                  ownerName,
 	}
 }
diff --git a/codersdk/templates.go b/codersdk/templates.go
@@ -25,6 +25,8 @@ type Template struct {
 	Description                string          `json:"description"`
 	MaxTTLMillis               int64           `json:"max_ttl_ms"`
 	MinAutostartIntervalMillis int64           `json:"min_autostart_interval_ms"`
+	OwnerID                    uuid.NullUUID   `json:"owner_id"`
+	OwnerName                  string          `json:"owner_name"`
 }
 
 type UpdateActiveTemplateVersion struct {

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -247,6 +247,8 @@ export interface Template {
   readonly description: string
   readonly max_ttl_ms: number
   readonly min_autostart_interval_ms: number
+  readonly owner_id?: string
+  readonly owner_name: string
 }
 
 // From codersdk/templateversions.go:14:6
@@ -276,12 +278,12 @@ export interface TemplateVersionParameter {
   readonly default_source_value: boolean
 }
 
-// From codersdk/templates.go:98:6
+// From codersdk/templates.go:100:6
 export interface TemplateVersionsByTemplateRequest extends Pagination {
   readonly template_id: string
 }
 
-// From codersdk/templates.go:30:6
+// From codersdk/templates.go:32:6
 export interface UpdateActiveTemplateVersion {
   readonly id: string
 }
@@ -291,7 +293,7 @@ export interface UpdateRoles {
   readonly roles: string[]
 }
 
-// From codersdk/templates.go:34:6
+// From codersdk/templates.go:36:6
 export interface UpdateTemplateMeta {
   readonly description?: string
   readonly max_ttl_ms?: number

@@ -23,3 +23,12 @@ UsedByMany.args = {
   },
   activeVersion: Mocks.MockTemplateVersion,
 }
+
+export const UnknownOwner = Template.bind({})
+UnknownOwner.args = {
+  template: {
+    ...Mocks.MockTemplate,
+    owner_name: "",
+  },
+  activeVersion: Mocks.MockTemplateVersion,
+}
@@ -13,7 +13,8 @@ const Language = {
   lastUpdateLabel: "Last updated",
   userPlural: "users",
   userSingular: "user",
-  createdByLabel: "Created by"
+  createdByLabel: "Created by",
+  defaultTemplateCreator: "<unknown>",
 }
 
 export interface TemplateStatsProps {
@@ -49,7 +50,7 @@ export const TemplateStats: FC<TemplateStatsProps> = ({ template, activeVersion
       <div className={styles.statsDivider} />
       <div className={styles.statItem}>
         <span className={styles.statsLabel}>{Language.createdByLabel}</span>
-        <span className={styles.statsValue}>admin</span>
+        <span className={styles.statsValue}>{template.owner_name || Language.defaultTemplateCreator}</span>
       </div>
     </div>
   )

@@ -50,6 +50,7 @@ export const Language = {
   templateTooltipText: "With templates you can create a common configuration for your workspaces using Terraform.",
   templateTooltipLink: "Manage templates",
   createdByLabel: "Created by",
+  defaultTemplateOwner: "<unknown>",
 }
 
 const TemplateHelpTooltip: React.FC = () => {
@@ -139,7 +140,7 @@ export const TemplatesPageView: FC<TemplatesPageViewProps> = (props) => {
                 <TableCell>{Language.developerCount(template.workspace_owner_count)}</TableCell>
 
                 <TableCell data-chromatic="ignore">{dayjs().to(dayjs(template.updated_at))}</TableCell>
-                <TableCell>admin</TableCell>
+                <TableCell>{template.owner_name || Language.defaultTemplateOwner}</TableCell>
                 <TableCell>
                   <div className={styles.arrowCell}>
                     <KeyboardArrowRight className={styles.arrowRight} />

diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -114,6 +114,8 @@ export const MockTemplate: TypesGen.Template = {
   description: "This is a test description.",
   max_ttl_ms: 604800000,
   min_autostart_interval_ms: 3600000,
+  owner_id: "test-owner-id",
+  owner_name: "test_owner",
 }
 
 export const MockWorkspaceAutostartDisabled: TypesGen.UpdateWorkspaceAutostartRequest = {