Merge pull request #685 from Scalingo/feat/CRON-89/add-fields-cron

Add fields to cron tasks list
Scalingo · Oct 20, 2021 · 874f4fc · 874f4fc
2 parents f398821 + f857ba5
commit 874f4fc
Show file tree

Hide file tree

Showing 35 changed files with 84 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ### To be Released
+* feat(cron-task): Add fields to cron tasks list [#685](https://github.com/Scalingo/cli/pull/685)
 
 ### 1.21.1
 

diff --git a/crontasks/list.go b/crontasks/list.go
@@ -3,11 +3,13 @@ package crontasks
 import (
 	"os"
 
+	"github.com/olekukonko/tablewriter"
+	"gopkg.in/errgo.v1"
+
 	"github.com/Scalingo/cli/config"
+	"github.com/Scalingo/cli/utils"
 	httpclient "github.com/Scalingo/go-scalingo/v4/http"
 	"github.com/Scalingo/go-utils/errors"
-	"github.com/olekukonko/tablewriter"
-	"gopkg.in/errgo.v1"
 )
 
 func List(app string) error {
@@ -28,10 +30,15 @@ func List(app string) error {
 
 	t := tablewriter.NewWriter(os.Stdout)
 	t.SetColWidth(60)
-	t.SetHeader([]string{"Command", "Size"})
+	t.SetHeader([]string{"Command", "Size", "Last execution", "Next execution"})
 
 	for _, job := range cronTasks.Jobs {
-		t.Append([]string{job.Command, job.Size})
+		lastExecution := job.LastExecutionDate.Format(utils.TimeFormat)
+		if job.LastExecutionDate.IsZero() {
+			lastExecution = "No previous executions"
+		}
+
+		t.Append([]string{job.Command, job.Size, lastExecution, job.NextExecutionDate.Format(utils.TimeFormat)})
 	}
 	t.Render()
 

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.16
 
 require (
 	github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5
-	github.com/Scalingo/go-scalingo/v4 v4.14.2
+	github.com/Scalingo/go-scalingo/v4 v4.14.3
 	github.com/Scalingo/go-utils/errors v1.0.0
 	github.com/Scalingo/go-utils/retry v1.0.0
 	github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2

diff --git a/go.sum b/go.sum
@@ -9,14 +9,8 @@ github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C6
 github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
 github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5 h1:VauE2GcJNZFun2Och6tIT2zJZK1v6jxALQDA9BIji/E=
 github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5/go.mod h1:gxOHeajFfvGQh/fxlC8oOKBe23xnnJTif00IFFbiT+o=
-github.com/Scalingo/go-scalingo/v4 v4.14.1 h1:2QM7/TOaixLvp3+BsW8kR307LbFwzequzcZoqM/lCyU=
-github.com/Scalingo/go-scalingo/v4 v4.14.1/go.mod h1:GHFZjiKGI3xC0igpx4CtRErBSUmMS0QI6sU080lEkKA=
-github.com/Scalingo/go-scalingo/v4 v4.14.2-0.20211012092626-2b5c0dae107c h1:Yd/udfiixnp7xkAGv131v0ZTxvoAew5TiLnmHN2wP7A=
-github.com/Scalingo/go-scalingo/v4 v4.14.2-0.20211012092626-2b5c0dae107c/go.mod h1:GHFZjiKGI3xC0igpx4CtRErBSUmMS0QI6sU080lEkKA=
-github.com/Scalingo/go-scalingo/v4 v4.14.2-0.20211012094544-a3748506ae9d h1:JTBMFE1C+EKk8zYJFcOs/V2X3vONWDPFxvo9M8iYCNc=
-github.com/Scalingo/go-scalingo/v4 v4.14.2-0.20211012094544-a3748506ae9d/go.mod h1:GHFZjiKGI3xC0igpx4CtRErBSUmMS0QI6sU080lEkKA=
-github.com/Scalingo/go-scalingo/v4 v4.14.2 h1:+2lzo3o0R3rEKO7J9arfWKN1YztkS90SshwLlUVzzb0=
-github.com/Scalingo/go-scalingo/v4 v4.14.2/go.mod h1:GHFZjiKGI3xC0igpx4CtRErBSUmMS0QI6sU080lEkKA=
+github.com/Scalingo/go-scalingo/v4 v4.14.3 h1:RrEYCWTvD2R7JVFV21FZuJB+t0DZDJwyj6Mzxr1YdJ4=
+github.com/Scalingo/go-scalingo/v4 v4.14.3/go.mod h1:GHFZjiKGI3xC0igpx4CtRErBSUmMS0QI6sU080lEkKA=
 github.com/Scalingo/go-utils/errors v1.0.0 h1:9+1zBmT+d0kpAReChheUDX0AmT0/OtrDtHdwRymRufA=
 github.com/Scalingo/go-utils/errors v1.0.0/go.mod h1:X1v0A4DBs4exBWGjYsGLo6nsC49vqf2hEVtigTRv7iY=
 github.com/Scalingo/go-utils/retry v1.0.0 h1:aGT9Voe4rVEzn0bZ68x+nyBvk2sJWrzLP37+tTVdCuc=

diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/CHANGELOG.md b/vendor/github.com/Scalingo/go-scalingo/v4/CHANGELOG.md
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/README.md b/vendor/github.com/Scalingo/go-scalingo/v4/README.md
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/addons_providers.go b/vendor/github.com/Scalingo/go-scalingo/v4/addons_providers.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/apps.go b/vendor/github.com/Scalingo/go-scalingo/v4/apps.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/backups.go b/vendor/github.com/Scalingo/go-scalingo/v4/backups.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/client.go b/vendor/github.com/Scalingo/go-scalingo/v4/client.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/container.go b/vendor/github.com/Scalingo/go-scalingo/v4/container.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/cron_tasks.go b/vendor/github.com/Scalingo/go-scalingo/v4/cron_tasks.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/database_type_versions.go b/vendor/github.com/Scalingo/go-scalingo/v4/database_type_versions.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/databases.go b/vendor/github.com/Scalingo/go-scalingo/v4/databases.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/deployments.go b/vendor/github.com/Scalingo/go-scalingo/v4/deployments.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/domains.go b/vendor/github.com/Scalingo/go-scalingo/v4/domains.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/events.go b/vendor/github.com/Scalingo/go-scalingo/v4/events.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/events_types.go b/vendor/github.com/Scalingo/go-scalingo/v4/events_types.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/http/addon_token_generator.go b/vendor/github.com/Scalingo/go-scalingo/v4/http/addon_token_generator.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/http/api_request.go b/vendor/github.com/Scalingo/go-scalingo/v4/http/api_request.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/http/api_token_generator.go b/vendor/github.com/Scalingo/go-scalingo/v4/http/api_token_generator.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/log_drains.go b/vendor/github.com/Scalingo/go-scalingo/v4/log_drains.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/logs-archives.go b/vendor/github.com/Scalingo/go-scalingo/v4/logs-archives.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/logs.go b/vendor/github.com/Scalingo/go-scalingo/v4/logs.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/notification_platforms.go b/vendor/github.com/Scalingo/go-scalingo/v4/notification_platforms.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/notifiers.go b/vendor/github.com/Scalingo/go-scalingo/v4/notifiers.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/operations.go b/vendor/github.com/Scalingo/go-scalingo/v4/operations.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/region_migrations.go b/vendor/github.com/Scalingo/go-scalingo/v4/region_migrations.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/regions.go b/vendor/github.com/Scalingo/go-scalingo/v4/regions.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/v4/run.go b/vendor/github.com/Scalingo/go-scalingo/v4/run.go