Skip to content

Commit 72291f5

Browse files
committed
make lint
1 parent 229af80 commit 72291f5

File tree

2 files changed

+38
-15
lines changed

2 files changed

+38
-15
lines changed

cli/templatepush.go

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -121,27 +121,25 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
121121
)
122122
client := new(codersdk.Client)
123123
cmd := &clibase.Cmd{
124-
Parent: &clibase.Cmd{},
125-
Children: []*clibase.Cmd{},
126-
Use: "push [template]",
127-
Aliases: []string{},
128-
Short: "Push a new template version from the current directory or as specified by flag",
129-
Hidden: false,
130-
RawArgs: false,
131-
Long: "",
132-
Options: []clibase.Option{},
133-
Annotations: map[string]string{},
134-
Middleware: clibase.Chain(clibase.RequireRangeArgs(0, 1), r.InitClient(client)),
124+
Use: "push [template]",
125+
Short: "Push a new template version from the current directory or as specified by flag",
126+
Middleware: clibase.Chain(
127+
clibase.RequireRangeArgs(0, 1),
128+
r.InitClient(client),
129+
),
135130
Handler: func(inv *clibase.Invocation) error {
136131
uploadFlags.setWorkdir(workdir)
132+
137133
organization, err := CurrentOrganization(inv, client)
138134
if err != nil {
139135
return err
140136
}
137+
141138
name, err := uploadFlags.templateName(inv.Args)
142139
if err != nil {
143140
return err
144141
}
142+
145143
template, err := client.TemplateByName(inv.Context(), organization.ID, name)
146144
if err != nil {
147145
if create {
@@ -173,28 +171,44 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
173171
if err != nil {
174172
return err
175173
}
174+
176175
tags, err := ParseProvisionerTags(provisionerTags)
177176
if err != nil {
178177
return err
179178
}
180-
job, err := createValidTemplateVersion(inv, createValidTemplateVersionArgs{Name: versionName, Client: client, Organization: organization, Provisioner: database.ProvisionerType(provisioner), FileID: resp.ID, VariablesFile: variablesFile, Variables: variables, Template: &template, ReuseParameters: !alwaysPrompt, ProvisionerTags: tags})
179+
180+
job, err := createValidTemplateVersion(inv, createValidTemplateVersionArgs{
181+
Name: versionName,
182+
Client: client,
183+
Organization: organization,
184+
Provisioner: database.ProvisionerType(provisioner),
185+
FileID: resp.ID,
186+
VariablesFile: variablesFile,
187+
Variables: variables,
188+
Template: &template,
189+
ReuseParameters: !alwaysPrompt,
190+
ProvisionerTags: tags,
191+
})
181192
if err != nil {
182193
return err
183194
}
195+
184196
if job.Job.Status != codersdk.ProvisionerJobSucceeded {
185197
return xerrors.Errorf("job failed: %s", job.Job.Status)
186198
}
199+
187200
if activate {
188-
err = client.UpdateActiveTemplateVersion(inv.Context(), template.ID, codersdk.UpdateActiveTemplateVersion{ID: job.ID})
201+
err = client.UpdateActiveTemplateVersion(inv.Context(), template.ID, codersdk.UpdateActiveTemplateVersion{
202+
ID: job.ID,
203+
})
189204
if err != nil {
190205
return err
191206
}
192207
}
208+
193209
_, _ = fmt.Fprintf(inv.Stdout, "Updated version at %s!\n", cliui.DefaultStyles.DateTimeStamp.Render(time.Now().Format(time.Stamp)))
194210
return nil
195211
},
196-
HelpHandler: func(i *clibase.Invocation) error {
197-
},
198212
}
199213

200214
cmd.Options = clibase.OptionSet{

docs/cli/templates_push.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,15 @@ Whether the new template will be marked active.
2929

3030
Always prompt all parameters. Does not pull parameter values from active template version.
3131

32+
### --create
33+
34+
| | |
35+
| ------- | ------------------ |
36+
| Type | <code>bool</code> |
37+
| Default | <code>false</code> |
38+
39+
Create a new template if one does not already exist.
40+
3241
### -d, --directory
3342

3443
| | |

0 commit comments

Comments
 (0)