Commit037b348

committed

feat: cli: prettify autostart/autostop output

1 parent5f7cf87 commit037b348Copy full SHA for 037b348

File tree

+31

-8

lines changed

+31

-8

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,15 @@ func autostartShow() *cobra.Command {`
`63`	`63`	`returnnil`
`64`	`64`	`}`
`65`	`65`
`66`		`-_,_=fmt.Fprintf(cmd.OutOrStdout(),"schedule: %s\nnext: %s\n",workspace.AutostartSchedule,validSchedule.Next(time.Now()))`
	`66`	`+next:=validSchedule.Next(time.Now())`
	`67`	`+loc,_:=time.LoadLocation(validSchedule.Timezone())`
	`68`	`+`
	`69`	`+_,_=fmt.Fprintf(cmd.OutOrStdout(),`
	`70`	`+"schedule: %s\ntimezone: %s\nnext: %s\n",`
	`71`	`+validSchedule.Cron(),`
	`72`	`+validSchedule.Timezone(),`
	`73`	`+next.In(loc),`
	`74`	`+)`
`67`	`75`
`68`	`76`	`returnnil`
`69`	`77`	`},`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ func TestAutostart(t *testing.T) {`
`45`	`45`
`46`	`46`	`err=cmd.Execute()`
`47`	`47`	`require.NoError(t,err,"unexpected error")`
`48`		`-require.Contains(t,stdoutBuf.String(),"schedule: "+sched)`
	`48`	`+// CRON_TZ gets stripped`
	`49`	`+require.Contains(t,stdoutBuf.String(),"schedule: 30 17 * * 1-5")`
`49`	`50`	`})`
`50`	`51`
`51`	`52`	`t.Run("EnableDisableOK",func(t*testing.T) {`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,15 @@ func autostopShow() *cobra.Command {`
`63`	`63`	`returnnil`
`64`	`64`	`}`
`65`	`65`
`66`		`-_,_=fmt.Fprintf(cmd.OutOrStdout(),"schedule: %s\nnext: %s\n",workspace.AutostopSchedule,validSchedule.Next(time.Now()))`
	`66`	`+next:=validSchedule.Next(time.Now())`
	`67`	`+loc,_:=time.LoadLocation(validSchedule.Timezone())`
	`68`	`+`
	`69`	`+_,_=fmt.Fprintf(cmd.OutOrStdout(),`
	`70`	`+"schedule: %s\ntimezone: %s\nnext: %s\n",`
	`71`	`+validSchedule.Cron(),`
	`72`	`+validSchedule.Timezone(),`
	`73`	`+next.In(loc),`
	`74`	`+)`
`67`	`75`
`68`	`76`	`returnnil`
`69`	`77`	`},`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ func TestAutostop(t *testing.T) {`
`45`	`45`
`46`	`46`	`err=cmd.Execute()`
`47`	`47`	`require.NoError(t,err,"unexpected error")`
`48`		`-require.Contains(t,stdoutBuf.String(),"schedule: "+sched)`
	`48`	`+// CRON_TZ gets stripped`
	`49`	`+require.Contains(t,stdoutBuf.String(),"schedule: 30 17 * * 1-5")`
`49`	`50`	`})`
`50`	`51`
`51`	`52`	`t.Run("EnableDisableOK",func(t*testing.T) {`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`	`"github.com/spf13/cobra"`
`11`	`11`
`12`	`12`	`"github.com/coder/coder/cli/cliui"`
	`13`	`+"github.com/coder/coder/coderd/autobuild/schedule"`
`13`	`14`	`"github.com/coder/coder/coderd/database"`
`14`	`15`	`"github.com/coder/coder/codersdk"`
`15`	`16`	`)`
`@@ -108,14 +109,18 @@ func list() *cobra.Command {`
`108`	`109`	`durationDisplay=durationDisplay[:len(durationDisplay)-2]`
`109`	`110`	`}`
`110`	`111`
`111`		`-autostartDisplay:="not enabled"`
	`112`	`+autostartDisplay:="-"`
`112`	`113`	`ifworkspace.AutostartSchedule!="" {`
`113`		`-autostartDisplay=workspace.AutostartSchedule`
	`114`	`+ifsched,err:=schedule.Weekly(workspace.AutostartSchedule);err==nil {`
	`115`	`+autostartDisplay=sched.Cron()`
	`116`	`+}`
`114`	`117`	`}`
`115`	`118`
`116`		`-autostopDisplay:="not enabled"`
	`119`	`+autostopDisplay:="-"`
`117`	`120`	`ifworkspace.AutostopSchedule!="" {`
`118`		`-autostopDisplay=workspace.AutostopSchedule`
	`121`	`+ifsched,err:=schedule.Weekly(workspace.AutostopSchedule);err==nil {`
	`122`	`+autostopDisplay=sched.Cron()`
	`123`	`+}`
`119`	`124`	`}`
`120`	`125`
`121`	`126`	`user:=usersByID[workspace.OwnerID]`

Comments

(0)