Apply suggestions from code review

johnstcn · mafredri · web-flow · commit 54984b4f06d5 · 2022-06-08T13:30:21.000+01:00
Co-authored-by: Mathias Fredriksson &lt;mafredri@gmail.com&gt;
diff --git a/cli/templateedit.go b/cli/templateedit.go
@@ -60,7 +60,7 @@ func templateEdit() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVarP(&description, "description", "", "", "Edit the template deescription")
+	cmd.Flags().StringVarP(&description, "description", "", "", "Edit the template description")
 	cmd.Flags().DurationVarP(&maxTTL, "max_ttl", "", 0, "Edit the template maximum time before shutdown")
 	cmd.Flags().DurationVarP(&minAutostartInterval, "min_autostart_interval", "", 0, "Edit the template minimum autostart interval")
 	cliui.AllowSkipPrompt(cmd)
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -371,7 +371,6 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 		}
 		return nil
 	})
-
 	if err != nil {
 		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
 			Message: "Internal error updating template metadata.",
diff --git a/codersdk/templates.go b/codersdk/templates.go
@@ -32,9 +32,9 @@ type UpdateActiveTemplateVersion struct {
 }
 
 type UpdateTemplateMeta struct {
-	Description                string `json:"description" validate:"omitempty"`
-	MaxTTLMillis               int64  `json:"max_ttl_ms" validate:"omitempty"`
-	MinAutostartIntervalMillis int64  `json:"min_autostart_interval_ms" validate:"omitempty"`
+	Description                string `json:"description,omitempty"`
+	MaxTTLMillis               int64  `json:"max_ttl_ms,omitempty"`
+	MinAutostartIntervalMillis int64  `json:"min_autostart_interval_ms,omitempty"`
 }
 
 // Template returns a single template.

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func templateEdit() *cobra.Command {`
`60`	`60`	`},`
`61`	`61`	`}`
`62`	`62`
`63`		`- cmd.Flags().StringVarP(&description, "description", "", "", "Edit the template deescription")`
	`63`	`+ cmd.Flags().StringVarP(&description, "description", "", "", "Edit the template description")`
`64`	`64`	`cmd.Flags().DurationVarP(&maxTTL, "max_ttl", "", 0, "Edit the template maximum time before shutdown")`
`65`	`65`	`cmd.Flags().DurationVarP(&minAutostartInterval, "min_autostart_interval", "", 0, "Edit the template minimum autostart interval")`
`66`	`66`	`cliui.AllowSkipPrompt(cmd)`
Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,6 @@ func (api API) patchTemplateMeta(rw http.ResponseWriter, r http.Request) {`
`371`	`371`	`}`
`372`	`372`	`return nil`
`373`	`373`	`})`
`374`		`-`
`375`	`374`	`if err != nil {`
`376`	`375`	`httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{`
`377`	`376`	`Message: "Internal error updating template metadata.",`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ type UpdateActiveTemplateVersion struct {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`type UpdateTemplateMeta struct {`
`35`		- Description string `json:"description" validate:"omitempty"`
`36`		- MaxTTLMillis int64 `json:"max_ttl_ms" validate:"omitempty"`
`37`		- MinAutostartIntervalMillis int64 `json:"min_autostart_interval_ms" validate:"omitempty"`
	`35`	+ Description string `json:"description,omitempty"`
	`36`	+ MaxTTLMillis int64 `json:"max_ttl_ms,omitempty"`
	`37`	+ MinAutostartIntervalMillis int64 `json:"min_autostart_interval_ms,omitempty"`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// Template returns a single template.`