Browse Source

all: specify explicit JSON format for time.Duration (#17307)

The default representation of time.Duration has different
JSON representation between v1 and v2.

Apply an explicit format flag that uses the v1 representation
so that this behavior does not change if serialized with v2.

Updates tailscale/corp#791

Signed-off-by: Joe Tsai <[email protected]>
Joe Tsai 5 months ago
parent
commit
a2dc517d7d
2 changed files with 2 additions and 2 deletions
  1. 1 1
      net/speedtest/speedtest.go
  2. 1 1
      tailcfg/tailcfg.go

+ 1 - 1
net/speedtest/speedtest.go

@@ -24,7 +24,7 @@ const (
 // conduct the test.
 type config struct {
 	Version      int           `json:"version"`
-	TestDuration time.Duration `json:"time"`
+	TestDuration time.Duration `json:"time,format:nano"`
 	Direction    Direction     `json:"direction"`
 }
 

+ 1 - 1
tailcfg/tailcfg.go

@@ -2903,7 +2903,7 @@ type SSHAction struct {
 
 	// SessionDuration, if non-zero, is how long the session can stay open
 	// before being forcefully terminated.
-	SessionDuration time.Duration `json:"sessionDuration,omitempty"`
+	SessionDuration time.Duration `json:"sessionDuration,omitempty,format:nano"`
 
 	// AllowAgentForwarding, if true, allows accepted connections to forward
 	// the ssh agent if requested.