fixup! feat: add autostart/autostop show, show autostart/autostop schedule in ls output

johnstcn · johnstcn · commit 4f994cb91c46 · 2022-05-13T18:48:25.000Z
diff --git a/cli/autostart.go b/cli/autostart.go
@@ -52,18 +52,18 @@ func autostartShow() *cobra.Command {
 			}
 
 			if workspace.AutostartSchedule == "" {
-				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "not enabled")
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "not enabled\n")
 				return nil
 			}
 
 			validSchedule, err := schedule.Weekly(workspace.AutostartSchedule)
 			if err != nil {
 				// This should never happen.
-				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "invalid autostart schedule %q for workspace %s: %s", workspace.AutostartSchedule, workspace.Name, err.Error())
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "invalid autostart schedule %q for workspace %s: %s\n", workspace.AutostartSchedule, workspace.Name, err.Error())
 				return nil
 			}
 
-			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "\nschedule: %s\nnext: %s\n", workspace.AutostartSchedule, validSchedule.Next(time.Now()))
+			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "schedule: %s\nnext: %s\n", workspace.AutostartSchedule, validSchedule.Next(time.Now()))
 
 			return nil
 		},
diff --git a/cli/autostop.go b/cli/autostop.go
@@ -52,18 +52,18 @@ func autostopShow() *cobra.Command {
 			}
 
 			if workspace.AutostopSchedule == "" {
-				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "not enabled")
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "not enabled\n")
 				return nil
 			}
 
 			validSchedule, err := schedule.Weekly(workspace.AutostopSchedule)
 			if err != nil {
 				// This should never happen.
-				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "invalid autostop schedule %q for workspace %s: %s", workspace.AutostopSchedule, workspace.Name, err.Error())
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "invalid autostop schedule %q for workspace %s: %s\n", workspace.AutostopSchedule, workspace.Name, err.Error())
 				return nil
 			}
 
-			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "\nschedule: %s\nnext: %s\n", workspace.AutostopSchedule, validSchedule.Next(time.Now()))
+			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "schedule: %s\nnext: %s\n", workspace.AutostopSchedule, validSchedule.Next(time.Now()))
 
 			return nil
 		},

Original file line number	Diff line number	Diff line change
`@@ -52,18 +52,18 @@ func autostartShow() *cobra.Command {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`if workspace.AutostartSchedule == "" {`
`55`		`- _, _ = fmt.Fprintf(cmd.OutOrStdout(), "not enabled")`
	`55`	`+ _, _ = fmt.Fprintf(cmd.OutOrStdout(), "not enabled\n")`
`56`	`56`	`return nil`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`validSchedule, err := schedule.Weekly(workspace.AutostartSchedule)`
`60`	`60`	`if err != nil {`
`61`	`61`	`// This should never happen.`
`62`		`- _, _ = fmt.Fprintf(cmd.OutOrStdout(), "invalid autostart schedule %q for workspace %s: %s", workspace.AutostartSchedule, workspace.Name, err.Error())`
	`62`	`+ _, _ = fmt.Fprintf(cmd.OutOrStdout(), "invalid autostart schedule %q for workspace %s: %s\n", workspace.AutostartSchedule, workspace.Name, err.Error())`
`63`	`63`	`return nil`
`64`	`64`	`}`
`65`	`65`
`66`		`- _, _ = fmt.Fprintf(cmd.OutOrStdout(), "\nschedule: %s\nnext: %s\n", workspace.AutostartSchedule, validSchedule.Next(time.Now()))`
	`66`	`+ _, _ = fmt.Fprintf(cmd.OutOrStdout(), "schedule: %s\nnext: %s\n", workspace.AutostartSchedule, validSchedule.Next(time.Now()))`
`67`	`67`
`68`	`68`	`return nil`
`69`	`69`	`},`
Original file line number	Diff line number	Diff line change
`@@ -52,18 +52,18 @@ func autostopShow() *cobra.Command {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`if workspace.AutostopSchedule == "" {`
`55`		`- _, _ = fmt.Fprintf(cmd.OutOrStdout(), "not enabled")`
	`55`	`+ _, _ = fmt.Fprintf(cmd.OutOrStdout(), "not enabled\n")`
`56`	`56`	`return nil`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`validSchedule, err := schedule.Weekly(workspace.AutostopSchedule)`
`60`	`60`	`if err != nil {`
`61`	`61`	`// This should never happen.`
`62`		`- _, _ = fmt.Fprintf(cmd.OutOrStdout(), "invalid autostop schedule %q for workspace %s: %s", workspace.AutostopSchedule, workspace.Name, err.Error())`
	`62`	`+ _, _ = fmt.Fprintf(cmd.OutOrStdout(), "invalid autostop schedule %q for workspace %s: %s\n", workspace.AutostopSchedule, workspace.Name, err.Error())`
`63`	`63`	`return nil`
`64`	`64`	`}`
`65`	`65`
`66`		`- _, _ = fmt.Fprintf(cmd.OutOrStdout(), "\nschedule: %s\nnext: %s\n", workspace.AutostopSchedule, validSchedule.Next(time.Now()))`
	`66`	`+ _, _ = fmt.Fprintf(cmd.OutOrStdout(), "schedule: %s\nnext: %s\n", workspace.AutostopSchedule, validSchedule.Next(time.Now()))`
`67`	`67`
`68`	`68`	`return nil`
`69`	`69`	`},`