Merge pull request #1412 from ripienaar/kv_times

Render various timestamps using the standard renderer

Author: ripienaar

cli/auth_account_exports.go

@@ -19,7 +19,6 @@ import (
 	"os"
 	"sort"
 	"strings"
-	"time"
 
 	"github.com/nats-io/natscli/internal/util"
 
@@ -161,7 +160,7 @@ func (c *authAccountCommand) showExport(exp ab.Export) (string, error) {
 
 	if len(exp.Revocations().List()) > 0 {
 		for _, rev := range exp.Revocations().List() {
-			cols.AddRow(rev.At().Format(time.RFC3339), rev.PublicKey())
+			cols.AddRow(f(rev.At()), rev.PublicKey())
 		}
 	} else {
 		cols.Println()

cli/consumer_command.go

@@ -1130,9 +1130,9 @@ func (c *consumerCmd) showInfo(config api.ConsumerConfig, state api.ConsumerInfo
 
 	var cols *columns.Writer
 	if c.showStateOnly {
-		cols = newColumns(fmt.Sprintf("State for Consumer %s > %s created %s", state.Stream, state.Name, state.Created.Local().Format(time.RFC3339)))
+		cols = newColumns(fmt.Sprintf("State for Consumer %s > %s created %s", state.Stream, state.Name, f(state.Created)))
 	} else {
-		cols = newColumns(fmt.Sprintf("Information for Consumer %s > %s created %s", state.Stream, state.Name, state.Created.Local().Format(time.RFC3339)))
+		cols = newColumns(fmt.Sprintf("Information for Consumer %s > %s created %s", state.Stream, state.Name, f(state.Created)))
 	}
 
 	if !c.showStateOnly {

cli/kv_command.go

@@ -704,7 +704,7 @@ func (c *kvCommand) getAction(_ *fisk.ParseContext) error {
 		return nil
 	}
 
-	fmt.Printf("%s > %s revision: %d created @ %s\n", res.Bucket(), res.Key(), res.Revision(), res.Created().Format(time.RFC822))
+	fmt.Printf("%s > %s revision: %d created @ %s\n", res.Bucket(), res.Key(), res.Revision(), f(res.Created()))
 	fmt.Println()
 	pv := iu.Base64IfNotPrintable(res.Value())
 	lpv := len(pv)
@@ -987,7 +987,7 @@ func (c *kvCommand) showStatus(store jetstream.KeyValue) error {
 	if nfo == nil {
 		cols.SetHeading(fmt.Sprintf("Information for Key-Value Store Bucket %s", status.Bucket()))
 	} else {
-		cols.SetHeading(fmt.Sprintf("Information for Key-Value Store Bucket %s created %s", status.Bucket(), nfo.Created.Local().Format(time.RFC3339)))
+		cols.SetHeading(fmt.Sprintf("Information for Key-Value Store Bucket %s created %s", status.Bucket(), f(nfo.Created)))
 	}
 
 	cols.AddSectionTitle("Configuration")

cli/object_command.go

@@ -318,7 +318,7 @@ func (c *objCommand) showBucketInfo(store jetstream.ObjectStore) error {
 	if nfo == nil {
 		cols.SetHeading(fmt.Sprintf("Information for Object Store Bucket %s", status.Bucket()))
 	} else {
-		cols.SetHeading(fmt.Sprintf("Information for Object Store Bucket %s created %s", status.Bucket(), nfo.Created.Local().Format(time.RFC3339)))
+		cols.SetHeading(fmt.Sprintf("Information for Object Store Bucket %s created %s", status.Bucket(), f(nfo.Created)))
 	}
 
 	cols.AddSectionTitle("Configuration")
@@ -466,7 +466,7 @@ func (c *objCommand) lsAction(_ *fisk.ParseContext) error {
 	table.AddHeaders("Name", "Size", "Time")
 
 	for _, i := range contents {
-		table.AddRow(i.Name, humanize.IBytes(i.Size), i.ModTime.Format(time.RFC3339))
+		table.AddRow(i.Name, humanize.IBytes(i.Size), f(i.ModTime))
 	}
 
 	fmt.Println(table.Render())

cli/service_command.go

@@ -83,7 +83,7 @@ func (c *serviceCmd) echoHandler(req micro.Request) {
 	hdr.Add("ConnectedUrl", c.nc.ConnectedUrlRedacted())
 	hdr.Add("Handler", strconv.Itoa(os.Getpid()))
 	hdr.Add("Subject", req.Subject())
-	hdr.Add("Timestamp", time.Now().Format(time.RFC3339))
+	hdr.Add("Timestamp", f(time.Now()))
 	if c.nc.ConnectedClusterName() != "" {
 		hdr.Add("ConnectedCluster", c.nc.ConnectedClusterName())
 	}

cli/stream_command.go

@@ -1152,7 +1152,7 @@ func (c *streamCmd) viewAction(_ *fisk.ParseContext) error {
 		default:
 			meta, err := jsm.ParseJSMsgMetadata(msg)
 			if err == nil {
-				fmt.Printf("[%d] Subject: %s Received: %s\n", meta.StreamSequence(), msg.Subject, meta.TimeStamp().Format(time.RFC3339))
+				fmt.Printf("[%d] Subject: %s Received: %s\n", meta.StreamSequence(), msg.Subject, f(meta.TimeStamp()))
 			} else {
 				fmt.Printf("Subject: %s Reply: %s\n", msg.Subject, msg.Reply)
 			}

cli/sub_command.go

@@ -961,7 +961,7 @@ func (c *subCmd) printMsg(msg *nats.Msg, reply *nats.Msg, ctr uint, startTime ti
 				fmt.Printf("[#%d]%s Received on %q\n", ctr, timeStamp, msg.Subject)
 			}
 		} else if c.jetStream {
-			fmt.Printf("[#%d] Received JetStream message: stream: %s seq %d / subject: %s / time: %v\n", ctr, info.Stream(), info.StreamSequence(), msg.Subject, info.TimeStamp().UTC().Format(time.RFC3339))
+			fmt.Printf("[#%d] Received JetStream message: stream: %s seq %d / subject: %s / time: %v\n", ctr, info.Stream(), info.StreamSequence(), msg.Subject, f(info.TimeStamp()))
 		} else {
 			fmt.Printf("[#%d] Received JetStream message: consumer: %s > %s / subject: %s / delivered: %d / consumer seq: %d / stream seq: %d\n", ctr, info.Stream(), info.Consumer(), msg.Subject, info.Delivered(), info.ConsumerSequence(), info.StreamSequence())
 		}
@@ -976,7 +976,7 @@ func (c *subCmd) printMsg(msg *nats.Msg, reply *nats.Msg, ctr uint, startTime ti
 			if info == nil {
 				fmt.Printf("[#%d]%s Matched reply on %q\n", ctr, timeStamp, reply.Subject)
 			} else if c.jetStream {
-				fmt.Printf("[#%d] Matched reply JetStream message: stream: %s seq %d / subject: %s / time: %v\n", ctr, info.Stream(), info.StreamSequence(), reply.Subject, info.TimeStamp().Format(time.RFC3339))
+				fmt.Printf("[#%d] Matched reply JetStream message: stream: %s seq %d / subject: %s / time: %v\n", ctr, info.Stream(), info.StreamSequence(), reply.Subject, f(info.TimeStamp()))
 			} else {
 				fmt.Printf("[#%d] Matched reply JetStream message: consumer: %s > %s / subject: %s / delivered: %d / consumer seq: %d / stream seq: %d\n", ctr, info.Stream(), info.Consumer(), reply.Subject, info.Delivered(), info.ConsumerSequence(), info.StreamSequence())
 			}

nats/tests/sub_command_test.go

@@ -218,7 +218,7 @@ func TestSubscribe(t *testing.T) {
 			}
 
 			output := string(runNatsCli(t, fmt.Sprintf("--server='%s' sub --stream TEST_STREAM --last --count=1", srv.ClientURL())))
-			pattern := `\[#\d\] Received JetStream message: stream: TEST_STREAM seq (\d+) / subject: TEST_STREAM.1 / time: \d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ`
+			pattern := `\[#\d\] Received JetStream message: stream: TEST_STREAM seq (\d+) / subject: TEST_STREAM.1 / time: \d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d`
 			matcher := regexp.MustCompile(pattern)
 			outputSlice := strings.Split(output, "\n")