add template update plumbing

sreya · sreya · commit f31b2fdb9d93 · 2023-10-15T23:18:22.000Z
diff --git a/coderd/database/modelmethods.go b/coderd/database/modelmethods.go
@@ -179,7 +179,7 @@ func (w Workspace) ApplicationConnectRBAC() rbac.Object {
 }
 
 func (w Workspace) WorkspaceBuildRBAC(transition WorkspaceTransition) rbac.Object {
-	// If a workspace is locked it cannot be built.
+	// If a workspace is dormant it cannot be built.
 	// However we need to allow stopping a workspace by a caller once a workspace
 	// is locked (e.g. for autobuild). Additionally, if a user wants to delete
 	// a locked workspace, they shouldn't have to have it unlocked first.
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templates.sql b/coderd/database/queries/templates.sql
@@ -123,7 +123,8 @@ SET
 	autostart_block_days_of_week = $9,
 	failure_ttl = $10,
 	time_til_dormant = $11,
-	time_til_dormant_autodelete = $12
+	time_til_dormant_autodelete = $12,
+    require_promoted_version = $13
 WHERE
 	id = $1
 ;
diff --git a/coderd/schedule/template.go b/coderd/schedule/template.go
@@ -151,6 +151,7 @@ type TemplateScheduleOptions struct {
 	// workspaces whose dormant_at field violates the new template time_til_dormant_autodelete
 	// threshold.
 	UpdateWorkspaceDormantAt bool `json:"update_workspace_dormant_at"`
+	RequirePromotedVersion   bool `json:"require_promoted_version"`
 }
 
 // TemplateScheduleStore provides an interface for retrieving template
@@ -200,6 +201,7 @@ func (*agplTemplateScheduleStore) Get(ctx context.Context, db database.Store, te
 		FailureTTL:               0,
 		TimeTilDormant:           0,
 		TimeTilDormantAutoDelete: 0,
+		RequirePromotedVersion:   false,
 	}, nil
 }
 
@@ -214,6 +216,9 @@ func (*agplTemplateScheduleStore) Set(ctx context.Context, db database.Store, tp
 
 	var template database.Template
 	err := db.InTx(func(db database.Store) error {
+		// TODO (JonA): This seems ripe for a bug. Should we not
+		// be reading the template as part of the tx and then also
+		// setting our isolation level to repeatable read?
 		err := db.UpdateTemplateScheduleByID(ctx, database.UpdateTemplateScheduleByIDParams{
 			ID:         tpl.ID,
 			UpdatedAt:  dbtime.Now(),
@@ -229,6 +234,7 @@ func (*agplTemplateScheduleStore) Set(ctx context.Context, db database.Store, tp
 			FailureTTL:                    tpl.FailureTTL,
 			TimeTilDormant:                tpl.TimeTilDormant,
 			TimeTilDormantAutoDelete:      tpl.TimeTilDormantAutoDelete,
+			RequirePromotedVersion:        tpl.RequirePromotedVersion,
 		})
 		if err != nil {
 			return xerrors.Errorf("update template schedule: %w", err)
diff --git a/codersdk/templates.go b/codersdk/templates.go
@@ -221,6 +221,10 @@ type UpdateTemplateMeta struct {
 	// from the template. This is useful for preventing dormant workspaces being immediately
 	// deleted when updating the dormant_ttl field to a new, shorter value.
 	UpdateWorkspaceDormantAt bool `json:"update_workspace_dormant_at"`
+	// RequirePromotedVersion mandates workspaces built using this template
+	// use the latest promoted version of the template. This option has no
+	// effect on template admins.
+	RequirePromotedVersion bool `json:"require_promoted_version"`
 }
 
 type TemplateExample struct {
diff --git a/enterprise/coderd/schedule/template.go b/enterprise/coderd/schedule/template.go
@@ -151,6 +151,7 @@ func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.S
 			FailureTTL:               int64(opts.FailureTTL),
 			TimeTilDormant:           int64(opts.TimeTilDormant),
 			TimeTilDormantAutoDelete: int64(opts.TimeTilDormantAutoDelete),
+			RequirePromotedVersion:   opts.RequirePromotedVersion,
 		})
 		if err != nil {
 			return xerrors.Errorf("update template schedule: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ func (w Workspace) ApplicationConnectRBAC() rbac.Object {`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`func (w Workspace) WorkspaceBuildRBAC(transition WorkspaceTransition) rbac.Object {`
`182`		`- // If a workspace is locked it cannot be built.`
	`182`	`+ // If a workspace is dormant it cannot be built.`
`183`	`183`	`// However we need to allow stopping a workspace by a caller once a workspace`
`184`	`184`	`// is locked (e.g. for autobuild). Additionally, if a user wants to delete`
`185`	`185`	`// a locked workspace, they shouldn't have to have it unlocked first.`