Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit641dc96

Browse files
committed
chore: address comments
1 parent356fb39 commit641dc96

File tree

6 files changed

+36
-37
lines changed

6 files changed

+36
-37
lines changed

‎cli/templateversionpresets.go‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (r *RootCmd) templateVersionPresetsList() *serpent.Command {
3939
"name",
4040
"parameters",
4141
"default",
42-
"prebuilds",
42+
"desired prebuild instances",
4343
}
4444
formatter:=cliui.NewOutputFormatter(
4545
cliui.TableFormat([]templateVersionPresetRow{},defaultColumns),
@@ -78,7 +78,10 @@ func (r *RootCmd) templateVersionPresetsList() *serpent.Command {
7878
}
7979

8080
iflen(presets)==0 {
81-
returnxerrors.Errorf("no presets found for template %q and template-version %q",template.Name,version.Name)
81+
cliui.Infof(
82+
inv.Stdout,
83+
"No presets found for template %q and template-version %q.\n",template.Name,version.Name,
84+
)
8285
}
8386

8487
rows:=templateVersionPresetsToRows(presets...)
@@ -102,10 +105,10 @@ type templateVersionPresetRow struct {
102105
TemplateVersionPreset codersdk.Preset`table:"-"`
103106

104107
// For table format:
105-
Namestring`json:"-" table:"name,default_sort"`
106-
Parametersstring`json:"-" table:"parameters"`
107-
Defaultbool`json:"-" table:"default"`
108-
Prebuildsstring`json:"-" table:"prebuilds"`
108+
Namestring`json:"-" table:"name,default_sort"`
109+
Parametersstring`json:"-" table:"parameters"`
110+
Defaultbool`json:"-" table:"default"`
111+
DesiredPrebuildInstancesstring`json:"-" table:"desired prebuild instances"`
109112
}
110113

111114
funcformatPresetParameters(params []codersdk.PresetParameter)string {
@@ -121,15 +124,15 @@ func formatPresetParameters(params []codersdk.PresetParameter) string {
121124
functemplateVersionPresetsToRows(presets...codersdk.Preset) []templateVersionPresetRow {
122125
rows:=make([]templateVersionPresetRow,len(presets))
123126
fori,preset:=rangepresets {
124-
prebuilds:="-"
125-
ifpreset.Prebuilds!=nil {
126-
prebuilds=strconv.Itoa(*preset.Prebuilds)
127+
prebuildInstances:="-"
128+
ifpreset.DesiredPrebuildInstances!=nil {
129+
prebuildInstances=strconv.Itoa(*preset.DesiredPrebuildInstances)
127130
}
128131
rows[i]=templateVersionPresetRow{
129-
Name:preset.Name,
130-
Parameters:formatPresetParameters(preset.Parameters),
131-
Default:preset.Default,
132-
Prebuilds:prebuilds,
132+
Name:preset.Name,
133+
Parameters:formatPresetParameters(preset.Parameters),
134+
Default:preset.Default,
135+
DesiredPrebuildInstances:prebuildInstances,
133136
}
134137
}
135138

‎cli/templateversionpresets_test.go‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,23 +101,19 @@ func TestTemplateVersionPresets(t *testing.T) {
101101
inv,root:=clitest.New(t,"templates","versions","presets","list",template.Name,version.Name)
102102
clitest.SetupConfig(t,member,root)
103103

104-
ptytest.New(t).Attach(inv)
104+
pty:=ptytest.New(t).Attach(inv)
105105
doneChan:=make(chanstruct{})
106106
varrunErrerror
107107
gofunc() {
108108
deferclose(doneChan)
109109
runErr=inv.Run()
110110
}()
111111
<-doneChan
112+
require.NoError(t,runErr)
112113

113-
// Should return an error when no presets are found for the given template and version.
114-
require.Error(t,runErr)
115-
expectedErr:=fmt.Sprintf(
116-
"no presets found for template %q and template-version %q",
117-
template.Name,
118-
version.Name,
119-
)
120-
require.Contains(t,runErr.Error(),expectedErr)
114+
// Should return a message when no presets are found for the given template and version.
115+
notFoundMessage:=fmt.Sprintf("No presets found for template %q and template-version %q.",template.Name,version.Name)
116+
pty.ExpectRegexMatch(notFoundMessage)
121117
})
122118
}
123119

‎coderd/presets.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (api *API) templateVersionPresets(rw http.ResponseWriter, r *http.Request)
3939
return
4040
}
4141

42-
getPrebuildInstances:=func(desiredInstances sql.NullInt32)*int {
42+
convertPrebuildInstances:=func(desiredInstances sql.NullInt32)*int {
4343
ifdesiredInstances.Valid {
4444
value:=int(desiredInstances.Int32)
4545
return&value
@@ -50,10 +50,10 @@ func (api *API) templateVersionPresets(rw http.ResponseWriter, r *http.Request)
5050
varres []codersdk.Preset
5151
for_,preset:=rangepresets {
5252
sdkPreset:= codersdk.Preset{
53-
ID:preset.ID,
54-
Name:preset.Name,
55-
Default:preset.IsDefault,
56-
Prebuilds:getPrebuildInstances(preset.DesiredInstances),
53+
ID:preset.ID,
54+
Name:preset.Name,
55+
Default:preset.IsDefault,
56+
DesiredPrebuildInstances:convertPrebuildInstances(preset.DesiredInstances),
5757
}
5858
for_,presetParam:=rangepresetParams {
5959
ifpresetParam.TemplateVersionPresetID!=preset.ID {

‎codersdk/presets.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
)
1212

1313
typePresetstruct {
14-
ID uuid.UUID
15-
Namestring
16-
Parameters []PresetParameter
17-
Defaultbool
18-
Prebuilds*int
14+
IDuuid.UUID
15+
Namestring
16+
Parameters[]PresetParameter
17+
Defaultbool
18+
DesiredPrebuildInstances*int
1919
}
2020

2121
typePresetParameterstruct {

‎site/src/api/typesGenerated.ts‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export const PresetsButNoneSelected: Story = {
132132
Value:"preset 1 override",
133133
},
134134
],
135-
Prebuilds:null,
135+
DesiredPrebuildInstances:null,
136136
},
137137
{
138138
ID:"preset-2",
@@ -144,7 +144,7 @@ export const PresetsButNoneSelected: Story = {
144144
Value:"42",
145145
},
146146
],
147-
Prebuilds:null,
147+
DesiredPrebuildInstances:null,
148148
},
149149
],
150150
parameters:[
@@ -258,7 +258,7 @@ export const PresetsWithDefault: Story = {
258258
Value:"preset 1 override",
259259
},
260260
],
261-
Prebuilds:null,
261+
DesiredPrebuildInstances:null,
262262
},
263263
{
264264
ID:"preset-2",
@@ -270,7 +270,7 @@ export const PresetsWithDefault: Story = {
270270
Value:"150189",
271271
},
272272
],
273-
Prebuilds:null,
273+
DesiredPrebuildInstances:null,
274274
},
275275
],
276276
parameters:[

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp