chore: address comments

ssncferreira · ssncferreira · commit 641dc96e63dc · 2025-07-22T17:56:28.000Z
diff --git a/cli/templateversionpresets.go b/cli/templateversionpresets.go
@@ -39,7 +39,7 @@ func (r *RootCmd) templateVersionPresetsList() *serpent.Command {
 		"name",
 		"parameters",
 		"default",
-		"prebuilds",
+		"desired prebuild instances",
 	}
 	formatter := cliui.NewOutputFormatter(
 		cliui.TableFormat([]templateVersionPresetRow{}, defaultColumns),
@@ -78,7 +78,10 @@ func (r *RootCmd) templateVersionPresetsList() *serpent.Command {
 			}
 
 			if len(presets) == 0 {
-				return xerrors.Errorf("no presets found for template %q and template-version %q", template.Name, version.Name)
+				cliui.Infof(
+					inv.Stdout,
+					"No presets found for template %q and template-version %q.\n", template.Name, version.Name,
+				)
 			}
 
 			rows := templateVersionPresetsToRows(presets...)
@@ -102,10 +105,10 @@ type templateVersionPresetRow struct {
 	TemplateVersionPreset codersdk.Preset `table:"-"`
 
 	// For table format:
-	Name       string `json:"-" table:"name,default_sort"`
-	Parameters string `json:"-" table:"parameters"`
-	Default    bool   `json:"-" table:"default"`
-	Prebuilds  string `json:"-" table:"prebuilds"`
+	Name                     string `json:"-" table:"name,default_sort"`
+	Parameters               string `json:"-" table:"parameters"`
+	Default                  bool   `json:"-" table:"default"`
+	DesiredPrebuildInstances string `json:"-" table:"desired prebuild instances"`
 }
 
 func formatPresetParameters(params []codersdk.PresetParameter) string {
@@ -121,15 +124,15 @@ func formatPresetParameters(params []codersdk.PresetParameter) string {
 func templateVersionPresetsToRows(presets ...codersdk.Preset) []templateVersionPresetRow {
 	rows := make([]templateVersionPresetRow, len(presets))
 	for i, preset := range presets {
-		prebuilds := "-"
-		if preset.Prebuilds != nil {
-			prebuilds = strconv.Itoa(*preset.Prebuilds)
+		prebuildInstances := "-"
+		if preset.DesiredPrebuildInstances != nil {
+			prebuildInstances = strconv.Itoa(*preset.DesiredPrebuildInstances)
 		}
 		rows[i] = templateVersionPresetRow{
-			Name:       preset.Name,
-			Parameters: formatPresetParameters(preset.Parameters),
-			Default:    preset.Default,
-			Prebuilds:  prebuilds,
+			Name:                     preset.Name,
+			Parameters:               formatPresetParameters(preset.Parameters),
+			Default:                  preset.Default,
+			DesiredPrebuildInstances: prebuildInstances,
 		}
 	}
 
diff --git a/cli/templateversionpresets_test.go b/cli/templateversionpresets_test.go
@@ -101,23 +101,19 @@ func TestTemplateVersionPresets(t *testing.T) {
 		inv, root := clitest.New(t, "templates", "versions", "presets", "list", template.Name, version.Name)
 		clitest.SetupConfig(t, member, root)
 
-		ptytest.New(t).Attach(inv)
+		pty := ptytest.New(t).Attach(inv)
 		doneChan := make(chan struct{})
 		var runErr error
 		go func() {
 			defer close(doneChan)
 			runErr = inv.Run()
 		}()
 		<-doneChan
+		require.NoError(t, runErr)
 
-		// Should return an error when no presets are found for the given template and version.
-		require.Error(t, runErr)
-		expectedErr := fmt.Sprintf(
-			"no presets found for template %q and template-version %q",
-			template.Name,
-			version.Name,
-		)
-		require.Contains(t, runErr.Error(), expectedErr)
+		// Should return a message when no presets are found for the given template and version.
+		notFoundMessage := fmt.Sprintf("No presets found for template %q and template-version %q.", template.Name, version.Name)
+		pty.ExpectRegexMatch(notFoundMessage)
 	})
 }
 
diff --git a/coderd/presets.go b/coderd/presets.go
@@ -39,7 +39,7 @@ func (api *API) templateVersionPresets(rw http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	getPrebuildInstances := func(desiredInstances sql.NullInt32) *int {
+	convertPrebuildInstances := func(desiredInstances sql.NullInt32) *int {
 		if desiredInstances.Valid {
 			value := int(desiredInstances.Int32)
 			return &value
@@ -50,10 +50,10 @@ func (api *API) templateVersionPresets(rw http.ResponseWriter, r *http.Request)
 	var res []codersdk.Preset
 	for _, preset := range presets {
 		sdkPreset := codersdk.Preset{
-			ID:        preset.ID,
-			Name:      preset.Name,
-			Default:   preset.IsDefault,
-			Prebuilds: getPrebuildInstances(preset.DesiredInstances),
+			ID:                       preset.ID,
+			Name:                     preset.Name,
+			Default:                  preset.IsDefault,
+			DesiredPrebuildInstances: convertPrebuildInstances(preset.DesiredInstances),
 		}
 		for _, presetParam := range presetParams {
 			if presetParam.TemplateVersionPresetID != preset.ID {
diff --git a/codersdk/presets.go b/codersdk/presets.go
@@ -11,11 +11,11 @@ import (
 )
 
 type Preset struct {
-	ID         uuid.UUID
-	Name       string
-	Parameters []PresetParameter
-	Default    bool
-	Prebuilds  *int
+	ID                       uuid.UUID
+	Name                     string
+	Parameters               []PresetParameter
+	Default                  bool
+	DesiredPrebuildInstances *int
 }
 
 type PresetParameter struct {
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx
@@ -132,7 +132,7 @@ export const PresetsButNoneSelected: Story = {
 						Value: "preset 1 override",
 					},
 				],
-				Prebuilds: null,
+				DesiredPrebuildInstances: null,
 			},
 			{
 				ID: "preset-2",
@@ -144,7 +144,7 @@ export const PresetsButNoneSelected: Story = {
 						Value: "42",
 					},
 				],
-				Prebuilds: null,
+				DesiredPrebuildInstances: null,
 			},
 		],
 		parameters: [
@@ -258,7 +258,7 @@ export const PresetsWithDefault: Story = {
 						Value: "preset 1 override",
 					},
 				],
-				Prebuilds: null,
+				DesiredPrebuildInstances: null,
 			},
 			{
 				ID: "preset-2",
@@ -270,7 +270,7 @@ export const PresetsWithDefault: Story = {
 						Value: "150189",
 					},
 				],
-				Prebuilds: null,
+				DesiredPrebuildInstances: null,
 			},
 		],
 		parameters: [
