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

Commit1e05960

Browse files
committed
Update deprecated parameter name in CLI
1 parent022eec8 commit1e05960

File tree

5 files changed

+27
-26
lines changed

5 files changed

+27
-26
lines changed

‎cli/cliui/parameter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/coder/coder/codersdk"
1111
)
1212

13-
funcParameterSchema(cmd*cobra.Command,parameterSchema codersdk.DeprecatedParameterSchema) (string,error) {
13+
funcDeprecatedParameterSchema(cmd*cobra.Command,parameterSchema codersdk.DeprecatedParameterSchema) (string,error) {
1414
_,_=fmt.Fprintln(cmd.OutOrStdout(),Styles.Bold.Render("var."+parameterSchema.Name))
1515
ifparameterSchema.Description!="" {
1616
_,_=fmt.Fprintln(cmd.OutOrStdout()," "+strings.TrimSpace(strings.Join(strings.Split(parameterSchema.Description,"\n"),"\n "))+"\n")

‎cli/create.go

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ func create() *cobra.Command {
122122
}
123123

124124
parameters,err:=prepWorkspaceBuild(cmd,client,prepWorkspaceBuildArgs{
125-
Template:template,
126-
ExistingParams: []codersdk.DeprecatedParameter{},
127-
ParameterFile:parameterFile,
128-
NewWorkspaceName:workspaceName,
125+
Template:template,
126+
ExistingDeprecatedParams: []codersdk.DeprecatedParameter{},
127+
ParameterFile:parameterFile,
128+
NewWorkspaceName:workspaceName,
129129
})
130130
iferr!=nil {
131131
returnerr
@@ -170,10 +170,11 @@ func create() *cobra.Command {
170170
}
171171

172172
typeprepWorkspaceBuildArgsstruct {
173-
Template codersdk.Template
174-
ExistingParams []codersdk.DeprecatedParameter
175-
ParameterFilestring
176-
NewWorkspaceNamestring
173+
Template codersdk.Template
174+
ExistingParams []codersdk.WorkspaceBuildParameter
175+
ExistingDeprecatedParams []codersdk.DeprecatedParameter
176+
ParameterFilestring
177+
NewWorkspaceNamestring
177178
}
178179

179180
// prepWorkspaceBuild will ensure a workspace build will succeed on the latest template version.
@@ -184,7 +185,7 @@ func prepWorkspaceBuild(cmd *cobra.Command, client *codersdk.Client, args prepWo
184185
iferr!=nil {
185186
returnnil,err
186187
}
187-
parameterSchemas,err:=client.DeprecatedTemplateVersionSchema(ctx,templateVersion.ID)
188+
deprecatedParameterSchemas,err:=client.DeprecatedTemplateVersionSchema(ctx,templateVersion.ID)
188189
iferr!=nil {
189190
returnnil,err
190191
}
@@ -201,9 +202,9 @@ func prepWorkspaceBuild(cmd *cobra.Command, client *codersdk.Client, args prepWo
201202
}
202203
}
203204
disclaimerPrinted:=false
204-
parameters:=make([]codersdk.DeprecatedCreateParameterRequest,0)
205-
PromptParamLoop:
206-
for_,parameterSchema:=rangeparameterSchemas {
205+
deprecatedParameters:=make([]codersdk.DeprecatedCreateParameterRequest,0)
206+
PromptDeprecatedParamLoop:
207+
for_,parameterSchema:=rangedeprecatedParameterSchemas {
207208
if!parameterSchema.AllowOverrideSource {
208209
continue
209210
}
@@ -214,21 +215,21 @@ PromptParamLoop:
214215

215216
// Param file is all or nothing
216217
if!useParamFile {
217-
for_,e:=rangeargs.ExistingParams {
218+
for_,e:=rangeargs.ExistingDeprecatedParams {
218219
ife.Name==parameterSchema.Name {
219220
// If the param already exists, we do not need to prompt it again.
220221
// The workspace scope will reuse params for each build.
221-
continuePromptParamLoop
222+
continuePromptDeprecatedParamLoop
222223
}
223224
}
224225
}
225226

226-
parameterValue,err:=getParameterValueFromMapOrInput(cmd,parameterMapFromFile,parameterSchema)
227+
parameterValue,err:=getDeprecatedParameterValueFromMapOrInput(cmd,parameterMapFromFile,parameterSchema)
227228
iferr!=nil {
228229
returnnil,err
229230
}
230231

231-
parameters=append(parameters, codersdk.DeprecatedCreateParameterRequest{
232+
deprecatedParameters=append(deprecatedParameters, codersdk.DeprecatedCreateParameterRequest{
232233
Name:parameterSchema.Name,
233234
SourceValue:parameterValue,
234235
SourceScheme:codersdk.DeprecatedParameterSourceSchemeData,
@@ -241,7 +242,7 @@ PromptParamLoop:
241242
after:=time.Now()
242243
dryRun,err:=client.CreateTemplateVersionDryRun(cmd.Context(),templateVersion.ID, codersdk.CreateTemplateVersionDryRunRequest{
243244
WorkspaceName:args.NewWorkspaceName,
244-
ParameterValues:parameters,
245+
ParameterValues:deprecatedParameters,
245246
})
246247
iferr!=nil {
247248
returnnil,xerrors.Errorf("begin workspace dry-run: %w",err)
@@ -281,5 +282,5 @@ PromptParamLoop:
281282
returnnil,err
282283
}
283284

284-
returnparameters,nil
285+
returndeprecatedParameters,nil
285286
}

‎cli/parameter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func createParameterMapFromFile(parameterFile string) (map[string]string, error)
3838

3939
// Returns a parameter value from a given map, if the map exists, else takes input from the user.
4040
// Throws an error if the map exists but does not include a value for the parameter.
41-
funcgetParameterValueFromMapOrInput(cmd*cobra.Command,parameterMapmap[string]string,parameterSchema codersdk.DeprecatedParameterSchema) (string,error) {
41+
funcgetDeprecatedParameterValueFromMapOrInput(cmd*cobra.Command,parameterMapmap[string]string,parameterSchema codersdk.DeprecatedParameterSchema) (string,error) {
4242
varparameterValuestring
4343
ifparameterMap!=nil {
4444
varokbool
@@ -48,7 +48,7 @@ func getParameterValueFromMapOrInput(cmd *cobra.Command, parameterMap map[string
4848
}
4949
}else {
5050
varerrerror
51-
parameterValue,err=cliui.ParameterSchema(cmd,parameterSchema)
51+
parameterValue,err=cliui.DeprecatedParameterSchema(cmd,parameterSchema)
5252
iferr!=nil {
5353
return"",err
5454
}

‎cli/templatecreate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ func createValidTemplateVersion(cmd *cobra.Command, args createValidTemplateVers
276276
_,_=fmt.Fprint(cmd.OutOrStdout(),"\r\n")
277277

278278
for_,parameterSchema:=rangemissingSchemas {
279-
parameterValue,err:=getParameterValueFromMapOrInput(cmd,parameterMapFromFile,parameterSchema)
279+
parameterValue,err:=getDeprecatedParameterValueFromMapOrInput(cmd,parameterMapFromFile,parameterSchema)
280280
iferr!=nil {
281281
returnnil,nil,err
282282
}

‎cli/update.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ func update() *cobra.Command {
4848
}
4949

5050
parameters,err:=prepWorkspaceBuild(cmd,client,prepWorkspaceBuildArgs{
51-
Template:template,
52-
ExistingParams:existingParams,
53-
ParameterFile:parameterFile,
54-
NewWorkspaceName:workspace.Name,
51+
Template:template,
52+
ExistingDeprecatedParams:existingParams,
53+
ParameterFile:parameterFile,
54+
NewWorkspaceName:workspace.Name,
5555
})
5656
iferr!=nil {
5757
returnnil

0 commit comments

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