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

Commit7fda8e5

Browse files
committed
unify edit and push
1 parent723812b commit7fda8e5

File tree

1 file changed

+41
-44
lines changed

1 file changed

+41
-44
lines changed

‎cli/templatepush.go

Lines changed: 41 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
227227
allowUserAutostop:allowUserAutostop,
228228
requireActiveVersion:requireActiveVersion,
229229
})
230+
iferr!=nil {
231+
returnerr
232+
}
230233

231234
organization,err:=CurrentOrganization(inv,client)
232235
iferr!=nil {
@@ -323,53 +326,47 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
323326
}
324327
}
325328

326-
editTemplate:=requireActiveVersion||
327-
disableEveryone||
328-
defaultTTL!=0||
329-
failureTTL!=0||
330-
dormancyThreshold!=0||
331-
dormancyAutoDeletion!=0||
332-
maxTTL!=0
333-
ifeditTemplate {
334-
template,err:=client.TemplateByName(inv.Context(),organization.ID,name)
335-
iferr!=nil {
336-
returnerr
337-
}
338-
req:=updateTemplateMetaRequest(updateTemplateMetaArgs{
339-
client:client,
340-
inv:inv,
341-
template:template,
342-
unsetAutostopRequirementDaysOfWeek:unsetAutostopRequirementDaysOfWeek,
343-
344-
displayName:displayName,
345-
description:description,
346-
icon:icon,
347-
requireActiveVersion:requireActiveVersion,
348-
disableEveryone:disableEveryone,
349-
defaultTTL:defaultTTL,
350-
failureTTL:failureTTL,
351-
dormancyThreshold:dormancyThreshold,
352-
dormancyAutoDeletion:dormancyAutoDeletion,
353-
maxTTL:maxTTL,
354-
autostopRequirementDaysOfWeek:autostopRequirementDaysOfWeek,
355-
autostopRequirementWeeks:autostopRequirementWeeks,
356-
autostartRequirementDaysOfWeek:autostartRequirementDaysOfWeek,
357-
allowUserAutostart:allowUserAutostart,
358-
allowUserAutostop:allowUserAutostop,
359-
allowUserCancelWorkspaceJobs:allowUserCancelWorkspaceJobs,
360-
deprecationMessage:deprecationMessage,
361-
})
329+
_,_=fmt.Fprintf(inv.Stdout,"Updated version at %s!\n",pretty.Sprint(cliui.DefaultStyles.DateTimeStamp,time.Now().Format(time.Stamp)))
362330

363-
_,err=client.UpdateTemplateMeta(inv.Context(),template.ID,req)
364-
iferr!=nil {
365-
returnxerrors.Errorf("update template metadata: %w",err)
366-
}
367-
iferr!=nil {
368-
returnerr
369-
}
331+
// refresh template data for edit api call
332+
template,err=client.TemplateByName(inv.Context(),organization.ID,name)
333+
iferr!=nil {
334+
returnerr
370335
}
336+
req:=updateTemplateMetaRequest(updateTemplateMetaArgs{
337+
client:client,
338+
inv:inv,
339+
template:template,
340+
unsetAutostopRequirementDaysOfWeek:unsetAutostopRequirementDaysOfWeek,
341+
342+
displayName:displayName,
343+
description:description,
344+
icon:icon,
345+
requireActiveVersion:requireActiveVersion,
346+
disableEveryone:disableEveryone,
347+
defaultTTL:defaultTTL,
348+
failureTTL:failureTTL,
349+
dormancyThreshold:dormancyThreshold,
350+
dormancyAutoDeletion:dormancyAutoDeletion,
351+
maxTTL:maxTTL,
352+
autostopRequirementDaysOfWeek:autostopRequirementDaysOfWeek,
353+
autostopRequirementWeeks:autostopRequirementWeeks,
354+
autostartRequirementDaysOfWeek:autostartRequirementDaysOfWeek,
355+
allowUserAutostart:allowUserAutostart,
356+
allowUserAutostop:allowUserAutostop,
357+
allowUserCancelWorkspaceJobs:allowUserCancelWorkspaceJobs,
358+
deprecationMessage:deprecationMessage,
359+
})
360+
361+
_,err=client.UpdateTemplateMeta(inv.Context(),template.ID,req)
362+
iferr!=nil {
363+
returnxerrors.Errorf("update template metadata: %w",err)
364+
}
365+
iferr!=nil {
366+
returnerr
367+
}
368+
_,_=fmt.Fprintf(inv.Stdout,"Updated template metadata at %s!\n",pretty.Sprint(cliui.DefaultStyles.DateTimeStamp,time.Now().Format(time.Stamp)))
371369

372-
_,_=fmt.Fprintf(inv.Stdout,"Updated version at %s!\n",pretty.Sprint(cliui.DefaultStyles.DateTimeStamp,time.Now().Format(time.Stamp)))
373370
returnnil
374371
},
375372
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp