chore(time): format to local time

duanhongyi · duanhongyi · commit 3bbd94006a8e · 2024-05-28T11:21:58.000+08:00
diff --git a/cmd/apps.go b/cmd/apps.go
@@ -84,8 +84,8 @@ func (d *DryccCmd) AppsList(results int) error {
 				app.ID,
 				app.UUID,
 				app.Owner,
-				app.Created,
-				app.Updated,
+				d.formatTime(app.Created),
+				d.formatTime(app.Updated),
 			})
 		}
 		table.Render()
@@ -118,8 +118,8 @@ func (d *DryccCmd) AppInfo(appID string) error {
 	table.Append([]string{"URL:", url})
 	table.Append([]string{"UUID:", app.UUID})
 	table.Append([]string{"Owner:", app.Owner})
-	table.Append([]string{"Created:", app.Created})
-	table.Append([]string{"Updated:", app.Updated})
+	table.Append([]string{"Created:", d.formatTime(app.Created)})
+	table.Append([]string{"Updated:", d.formatTime(app.Updated)})
 
 	// print the app processes
 	processes, _, err := ps.List(s.Client, appID, defaultLimit)
@@ -151,8 +151,8 @@ func (d *DryccCmd) AppInfo(appID string) error {
 		table.Append([]string{"Domains:"})
 		for index, domain := range domains {
 			table.Append([]string{"", "Domain:", domain.Domain})
-			table.Append([]string{"", "Created:", domain.Created})
-			table.Append([]string{"", "Updated:", domain.Updated})
+			table.Append([]string{"", "Created:", d.formatTime(domain.Created)})
+			table.Append([]string{"", "Updated:", d.formatTime(domain.Updated)})
 			if len(domains) > index+1 {
 				table.Append([]string{""})
 			}
diff --git a/cmd/builds.go b/cmd/builds.go
@@ -32,7 +32,7 @@ func (d *DryccCmd) BuildsList(appID string, results int) error {
 				build.UUID,
 				safeGetString(build.Owner),
 				safeGetString(build.Sha),
-				build.Created,
+				d.formatTime(build.Created),
 			})
 		}
 		table.Render()
diff --git a/cmd/canary.go b/cmd/canary.go
@@ -27,8 +27,8 @@ func (d *DryccCmd) CanaryInfo(appID string) error {
 				appSettings.UUID,
 				appSettings.Owner,
 				procType,
-				appSettings.Created,
-				appSettings.Updated,
+				d.formatTime(appSettings.Created),
+				d.formatTime(appSettings.Updated),
 			})
 		}
 		table.Render()
diff --git a/cmd/certs.go b/cmd/certs.go
@@ -136,8 +136,8 @@ func (d *DryccCmd) CertInfo(name string) error {
 	table.Append([]string{""})
 	table.Append([]string{"Connected Domains:", safeGetString(strings.Join(cert.Domains[:], ","))})
 	table.Append([]string{"Owner:", safeGetString(cert.Owner)})
-	table.Append([]string{"Created:", safeGetTime(cert.Created, time.RFC3339)})
-	table.Append([]string{"Updated:", safeGetTime(cert.Updated, time.RFC3339)})
+	table.Append([]string{"Created:", d.formatTime(safeGetTime(cert.Created, time.RFC3339))})
+	table.Append([]string{"Updated:", d.formatTime(safeGetTime(cert.Updated, time.RFC3339))})
 	table.Render()
 	return nil
 }
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"io"
+	"time"
 
 	drycc "github.com/drycc/controller-sdk-go"
 	"github.com/drycc/controller-sdk-go/api"
@@ -143,6 +144,7 @@ type DryccCmd struct {
 	WOut       io.Writer
 	WErr       io.Writer
 	WIn        io.Reader
+	Location   *time.Location
 }
 
 // Println prints a line to an output writer.
diff --git a/cmd/domains.go b/cmd/domains.go
@@ -29,8 +29,8 @@ func (d *DryccCmd) DomainsList(appID string, results int) error {
 				domain.App,
 				domain.Owner,
 				domain.ProcfileType,
-				domain.Created,
-				domain.Updated,
+				d.formatTime(domain.Created),
+				d.formatTime(domain.Updated),
 				domain.Domain,
 			})
 		}
diff --git a/cmd/healthchecks.go b/cmd/healthchecks.go
@@ -70,8 +70,8 @@ func (d *DryccCmd) HealthchecksList(appID, procType string) error {
 			table.Append([]string{"App:", config.App})
 			table.Append([]string{"UUID:", config.UUID})
 			table.Append([]string{"Owner:", config.Owner})
-			table.Append([]string{"Created:", config.Created})
-			table.Append([]string{"Updated:", config.Updated})
+			table.Append([]string{"Created:", d.formatTime(config.Created)})
+			table.Append([]string{"Updated:", d.formatTime(config.Updated)})
 			table.Append([]string{"Healthchecks:"})
 			for _, key := range keys {
 				for _, probe := range getHealthchecksStrings(key, config.Healthcheck[key]) {
@@ -88,8 +88,8 @@ func (d *DryccCmd) HealthchecksList(appID, procType string) error {
 			table.Append([]string{"App:", config.App})
 			table.Append([]string{"UUID:", config.UUID})
 			table.Append([]string{"Owner:", config.Owner})
-			table.Append([]string{"Created:", config.Created})
-			table.Append([]string{"Updated:", config.Updated})
+			table.Append([]string{"Created:", d.formatTime(config.Created)})
+			table.Append([]string{"Updated:", d.formatTime(config.Updated)})
 			table.Append([]string{"Healthchecks:"})
 			for _, probe := range getHealthchecksStrings(procType, healthcheck) {
 				if probe != "" {
diff --git a/cmd/releases.go b/cmd/releases.go
@@ -31,7 +31,7 @@ func (d *DryccCmd) ReleasesList(appID string, results int) error {
 			if len(summary) > 64 {
 				summary = fmt.Sprintf("%s[...]", summary[:64])
 			}
-			table.Append([]string{r.UUID, r.Owner, r.State, fmt.Sprintf("v%d", r.Version), r.Created, summary})
+			table.Append([]string{r.UUID, r.Owner, r.State, fmt.Sprintf("v%d", r.Version), d.formatTime(r.Created), summary})
 		}
 		table.Render()
 	}
@@ -57,8 +57,8 @@ func (d *DryccCmd) ReleasesInfo(appID string, version int) error {
 	table.Append([]string{"Owner:", r.Owner})
 	table.Append([]string{"Build:", r.Build})
 	table.Append([]string{"Config:", r.Config})
-	table.Append([]string{"Created:", r.Created})
-	table.Append([]string{"Updated:", r.Updated})
+	table.Append([]string{"Created:", d.formatTime(r.Created)})
+	table.Append([]string{"Updated:", d.formatTime(r.Updated)})
 	table.Append([]string{"Summary:", d.wrapString(r.Summary)})
 	table.Append([]string{"Version:", fmt.Sprintf("v%v", r.Version)})
 	table.Render()
diff --git a/cmd/resources.go b/cmd/resources.go
@@ -156,7 +156,7 @@ func (d *DryccCmd) ResourcesList(appID string, results int) error {
 				resource.Name,
 				resource.Owner,
 				resource.Plan,
-				resource.Updated,
+				d.formatTime(resource.Updated),
 			})
 		}
 		table.Render()
@@ -195,8 +195,8 @@ func (d *DryccCmd) ResourceGet(appID, name string) error {
 		table.Append([]string{"", fmt.Sprintf("%s:", key), fmt.Sprintf("%s", resource.Options[key])})
 	}
 	table.Append([]string{"Message:", d.wrapString(safeGetString(resource.Message))})
-	table.Append([]string{"Created:", resource.Created})
-	table.Append([]string{"Updated:", resource.Updated})
+	table.Append([]string{"Created:", d.formatTime(resource.Created)})
+	table.Append([]string{"Updated:", d.formatTime(resource.Updated)})
 	table.Render()
 	return nil
 }
diff --git a/cmd/token.go b/cmd/token.go
@@ -37,8 +37,8 @@ func (d *DryccCmd) TokensList(results int) error {
 			token.Owner,
 			safeGetString(token.Alias),
 			token.Key,
-			token.Created,
-			token.Updated,
+			d.formatTime(token.Created),
+			d.formatTime(token.Updated),
 		})
 	}
 	table.Render()
diff --git a/cmd/utils.go b/cmd/utils.go
@@ -115,6 +115,18 @@ func (d *DryccCmd) getDefaultFormatTable(headers []string) *tablewriter.Table {
 	return table
 }
 
+// format time string to local time
+func (d *DryccCmd) formatTime(timeStr string) string {
+	t, err := time.Parse(time.RFC3339, timeStr)
+	if err != nil {
+		return timeStr
+	}
+	if d.Location != nil {
+		return t.In(d.Location).Format(time.RFC3339)
+	}
+	return t.In(time.UTC).Format(time.RFC3339)
+}
+
 // wrapString wraps s into a paragraph of lines of length lim, with minimal raggedness.
 func (d *DryccCmd) wrapString(s string) string {
 	sa, _ := tablewriter.WrapString(s, defaultLines)
diff --git a/cmd/volumes.go b/cmd/volumes.go
@@ -65,8 +65,8 @@ func (d *DryccCmd) VolumesInfo(appID, name string) error {
 		return err
 	}
 	table.Append([]string{"", string(parameters)})
-	table.Append([]string{"Created: ", volume.Created})
-	table.Append([]string{"Updated: ", volume.Updated})
+	table.Append([]string{"Created: ", d.formatTime(volume.Created)})
+	table.Append([]string{"Updated: ", d.formatTime(volume.Updated)})
 	table.Render()
 	return nil
 }
diff --git a/drycc.go b/drycc.go
@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"strings"
 	"syscall"
+	"time"
 
 	docopt "github.com/docopt/docopt-go"
 	"github.com/drycc/workflow-cli/cli"
@@ -107,7 +108,7 @@ Use 'git push drycc main' to deploy to an application.
 	configFlag := getConfigFlag(argv)
 	// Don't pass down config flag to parser because it isn't defined there.
 	argv = removeConfigFlag(argv)
-	cmdr := cmd.DryccCmd{ConfigFile: configFlag, WOut: wOut, WErr: wErr, WIn: wIn}
+	cmdr := cmd.DryccCmd{ConfigFile: configFlag, WOut: wOut, WErr: wErr, WIn: wIn, Location: time.Local}
 
 	// Dispatch the command, passing the argv through so subcommands can
 	// re-parse it according to their usage strings.

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func (d *DryccCmd) BuildsList(appID string, results int) error {`
`32`	`32`	`build.UUID,`
`33`	`33`	`safeGetString(build.Owner),`
`34`	`34`	`safeGetString(build.Sha),`
`35`		`- build.Created,`
	`35`	`+ d.formatTime(build.Created),`
`36`	`36`	`})`
`37`	`37`	`}`
`38`	`38`	`table.Render()`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func (d *DryccCmd) ReleasesList(appID string, results int) error {`
`31`	`31`	`if len(summary) > 64 {`
`32`	`32`	`summary = fmt.Sprintf("%s[...]", summary[:64])`
`33`	`33`	`}`
`34`		`- table.Append([]string{r.UUID, r.Owner, r.State, fmt.Sprintf("v%d", r.Version), r.Created, summary})`
	`34`	`+ table.Append([]string{r.UUID, r.Owner, r.State, fmt.Sprintf("v%d", r.Version), d.formatTime(r.Created), summary})`
`35`	`35`	`}`
`36`	`36`	`table.Render()`
`37`	`37`	`}`
`@@ -57,8 +57,8 @@ func (d *DryccCmd) ReleasesInfo(appID string, version int) error {`
`57`	`57`	`table.Append([]string{"Owner:", r.Owner})`
`58`	`58`	`table.Append([]string{"Build:", r.Build})`
`59`	`59`	`table.Append([]string{"Config:", r.Config})`
`60`		`- table.Append([]string{"Created:", r.Created})`
`61`		`- table.Append([]string{"Updated:", r.Updated})`
	`60`	`+ table.Append([]string{"Created:", d.formatTime(r.Created)})`
	`61`	`+ table.Append([]string{"Updated:", d.formatTime(r.Updated)})`
`62`	`62`	`table.Append([]string{"Summary:", d.wrapString(r.Summary)})`
`63`	`63`	`table.Append([]string{"Version:", fmt.Sprintf("v%v", r.Version)})`
`64`	`64`	`table.Render()`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ func (d *DryccCmd) ResourcesList(appID string, results int) error {`
`156`	`156`	`resource.Name,`
`157`	`157`	`resource.Owner,`
`158`	`158`	`resource.Plan,`
`159`		`- resource.Updated,`
	`159`	`+ d.formatTime(resource.Updated),`
`160`	`160`	`})`
`161`	`161`	`}`
`162`	`162`	`table.Render()`
`@@ -195,8 +195,8 @@ func (d *DryccCmd) ResourceGet(appID, name string) error {`
`195`	`195`	`table.Append([]string{"", fmt.Sprintf("%s:", key), fmt.Sprintf("%s", resource.Options[key])})`
`196`	`196`	`}`
`197`	`197`	`table.Append([]string{"Message:", d.wrapString(safeGetString(resource.Message))})`
`198`		`- table.Append([]string{"Created:", resource.Created})`
`199`		`- table.Append([]string{"Updated:", resource.Updated})`
	`198`	`+ table.Append([]string{"Created:", d.formatTime(resource.Created)})`
	`199`	`+ table.Append([]string{"Updated:", d.formatTime(resource.Updated)})`
`200`	`200`	`table.Render()`
`201`	`201`	`return nil`
`202`	`202`	`}`