fixup! cli: templatecreate: add CLI flags --max-ttl --min-autostart-interval

johnstcn · johnstcn · commit 709db5b22f36 · 2022-06-03T16:13:55.000Z
diff --git a/cli/create.go b/cli/create.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/coder/coder/cli/cliflag"
 	"github.com/coder/coder/cli/cliui"
+	"github.com/coder/coder/coderd/autobuild/schedule"
 	"github.com/coder/coder/coderd/util/ptr"
 	"github.com/coder/coder/codersdk"
 )
@@ -114,10 +115,22 @@ func create() *cobra.Command {
 				}
 			}
 
-			schedSpec := buildSchedule(autostartMinute, autostartHour, autostartDow, tzName)
+			schedSpec, err := validSchedule(
+				autostartMinute,
+				autostartHour,
+				autostartDow,
+				tzName,
+				time.Duration(template.MinAutostartIntervalMillis)*time.Millisecond,
+			)
+			if err != nil {
+				return xerrors.Errorf("Invalid autostart schedule: %w", err)
+			}
 			if ttl < time.Minute {
 				return xerrors.Errorf("TTL must be at least 1 minute")
 			}
+			if ttlMax := time.Duration(template.MaxTTLMillis) * time.Millisecond; ttl > ttlMax {
+				return xerrors.Errorf("TTL must be below template maximum %s", ttlMax)
+			}
 
 			templateVersion, err := client.TemplateVersion(cmd.Context(), template.ActiveVersionID)
 			if err != nil {
@@ -257,11 +270,17 @@ func create() *cobra.Command {
 	return cmd
 }
 
-func buildSchedule(minute, hour, dow, tzName string) *string {
-	if minute == "" || hour == "" || dow == "" {
-		return nil
+func validSchedule(minute, hour, dow, tzName string, min time.Duration) (*string, error) {
+	schedSpec := fmt.Sprintf("CRON_TZ=%s %s %s * * %s", tzName, minute, hour, dow)
+
+	sched, err := schedule.Weekly(schedSpec)
+	if err != nil {
+		return nil, err
 	}
 
-	schedSpec := fmt.Sprintf("CRON_TZ=%s %s %s * * %s", tzName, minute, hour, dow)
-	return &schedSpec
+	if schedMin := sched.Min(); schedMin < min {
+		return nil, xerrors.Errorf("minimum autostart interval %s is above template constraint %s", schedMin, min)
+	}
+
+	return &schedSpec, nil
 }
diff --git a/cli/create_test.go b/cli/create_test.go
@@ -85,7 +85,7 @@ func TestCreate(t *testing.T) {
 		cmd.SetIn(pty.Input())
 		cmd.SetOut(pty.Output())
 		err := cmd.Execute()
-		assert.ErrorContains(t, err, "ttl_ms: ttl must be below template maximum 12h0m0s")
+		assert.ErrorContains(t, err, "TTL must be below template maximum 12h0m0s")
 	})
 
 	t.Run("BelowTemplateMinAutostartInterval", func(t *testing.T) {
@@ -111,7 +111,7 @@ func TestCreate(t *testing.T) {
 		cmd.SetIn(pty.Input())
 		cmd.SetOut(pty.Output())
 		err := cmd.Execute()
-		assert.ErrorContains(t, err, "Minimum autostart interval 1m0s below template minimum 1h0m0s")
+		assert.ErrorContains(t, err, "minimum autostart interval 1m0s is above template constraint 1h0m0s")
 	})
 
 	t.Run("CreateErrInvalidTz", func(t *testing.T) {
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -314,14 +314,16 @@ func convertTemplates(templates []database.Template, workspaceCounts []database.
 
 func convertTemplate(template database.Template, workspaceOwnerCount uint32) codersdk.Template {
 	return codersdk.Template{
-		ID:                  template.ID,
-		CreatedAt:           template.CreatedAt,
-		UpdatedAt:           template.UpdatedAt,
-		OrganizationID:      template.OrganizationID,
-		Name:                template.Name,
-		Provisioner:         codersdk.ProvisionerType(template.Provisioner),
-		ActiveVersionID:     template.ActiveVersionID,
-		WorkspaceOwnerCount: workspaceOwnerCount,
-		Description:         template.Description,
+		ID:                         template.ID,
+		CreatedAt:                  template.CreatedAt,
+		UpdatedAt:                  template.UpdatedAt,
+		OrganizationID:             template.OrganizationID,
+		Name:                       template.Name,
+		Provisioner:                codersdk.ProvisionerType(template.Provisioner),
+		ActiveVersionID:            template.ActiveVersionID,
+		WorkspaceOwnerCount:        workspaceOwnerCount,
+		Description:                template.Description,
+		MaxTTLMillis:               time.Duration(template.MaxTtl).Milliseconds(),
+		MinAutostartIntervalMillis: time.Duration(template.MinAutostartInterval).Milliseconds(),
 	}
 }
diff --git a/codersdk/templates.go b/codersdk/templates.go
@@ -13,15 +13,17 @@ import (
 // Template is the JSON representation of a Coder template. This type matches the
 // database object for now, but is abstracted for ease of change later on.
 type Template struct {
-	ID                  uuid.UUID       `json:"id"`
-	CreatedAt           time.Time       `json:"created_at"`
-	UpdatedAt           time.Time       `json:"updated_at"`
-	OrganizationID      uuid.UUID       `json:"organization_id"`
-	Name                string          `json:"name"`
-	Provisioner         ProvisionerType `json:"provisioner"`
-	ActiveVersionID     uuid.UUID       `json:"active_version_id"`
-	WorkspaceOwnerCount uint32          `json:"workspace_owner_count"`
-	Description         string          `json:"description"`
+	ID                         uuid.UUID       `json:"id"`
+	CreatedAt                  time.Time       `json:"created_at"`
+	UpdatedAt                  time.Time       `json:"updated_at"`
+	OrganizationID             uuid.UUID       `json:"organization_id"`
+	Name                       string          `json:"name"`
+	Provisioner                ProvisionerType `json:"provisioner"`
+	ActiveVersionID            uuid.UUID       `json:"active_version_id"`
+	WorkspaceOwnerCount        uint32          `json:"workspace_owner_count"`
+	Description                string          `json:"description"`
+	MaxTTLMillis               int64           `json:"max_ttl_ms"`
+	MinAutostartIntervalMillis int64           `json:"min_autostart_interval_ms"`
 }
 
 type UpdateActiveTemplateVersion struct {
