@@ -121,27 +121,25 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
121
121
)
122
122
client := new (codersdk.Client )
123
123
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
+ ),
135
130
Handler : func (inv * clibase.Invocation ) error {
136
131
uploadFlags .setWorkdir (workdir )
132
+
137
133
organization , err := CurrentOrganization (inv , client )
138
134
if err != nil {
139
135
return err
140
136
}
137
+
141
138
name , err := uploadFlags .templateName (inv .Args )
142
139
if err != nil {
143
140
return err
144
141
}
142
+
145
143
template , err := client .TemplateByName (inv .Context (), organization .ID , name )
146
144
if err != nil {
147
145
if create {
@@ -173,28 +171,44 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
173
171
if err != nil {
174
172
return err
175
173
}
174
+
176
175
tags , err := ParseProvisionerTags (provisionerTags )
177
176
if err != nil {
178
177
return err
179
178
}
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
+ })
181
192
if err != nil {
182
193
return err
183
194
}
195
+
184
196
if job .Job .Status != codersdk .ProvisionerJobSucceeded {
185
197
return xerrors .Errorf ("job failed: %s" , job .Job .Status )
186
198
}
199
+
187
200
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
+ })
189
204
if err != nil {
190
205
return err
191
206
}
192
207
}
208
+
193
209
_ , _ = fmt .Fprintf (inv .Stdout , "Updated version at %s!\n " , cliui .DefaultStyles .DateTimeStamp .Render (time .Now ().Format (time .Stamp )))
194
210
return nil
195
211
},
196
- HelpHandler : func (i * clibase.Invocation ) error {
197
- },
198
212
}
199
213
200
214
cmd .Options = clibase.OptionSet {
0 commit comments