schema,etc: add more fields for systemdActiveEnterTimestamp

* fix typo in registry/unit_state*.go, from ActiveEnterTimestamp to
  activeEnterTimestamp.
* Add a new field systemdActiveEnterTimestamp to both v1-json.go and
  v1.json.

Author: Dongsu Park

api/state_test.go

@@ -33,10 +33,10 @@ func TestUnitStateList(t *testing.T) {
 	us2 := unit.UnitState{UnitName: "BBB", ActiveState: "inactive", MachineID: "XXX"}
 	us3 := unit.UnitState{UnitName: "CCC", ActiveState: "active", MachineID: "XXX"}
 	us4 := unit.UnitState{UnitName: "CCC", ActiveState: "inactive", MachineID: "YYY"}
-	sus1 := &schema.UnitState{Name: "AAA", SystemdActiveState: "active"}
-	sus2 := &schema.UnitState{Name: "BBB", SystemdActiveState: "inactive", MachineID: "XXX"}
-	sus3 := &schema.UnitState{Name: "CCC", SystemdActiveState: "active", MachineID: "XXX"}
-	sus4 := &schema.UnitState{Name: "CCC", SystemdActiveState: "inactive", MachineID: "YYY"}
+	sus1 := &schema.UnitState{Name: "AAA", SystemdActiveState: "active", SystemdActiveEnterTimestamp: "0"}
+	sus2 := &schema.UnitState{Name: "BBB", SystemdActiveState: "inactive", MachineID: "XXX", SystemdActiveEnterTimestamp: "0"}
+	sus3 := &schema.UnitState{Name: "CCC", SystemdActiveState: "active", MachineID: "XXX", SystemdActiveEnterTimestamp: "0"}
+	sus4 := &schema.UnitState{Name: "CCC", SystemdActiveState: "inactive", MachineID: "YYY", SystemdActiveEnterTimestamp: "0"}
 
 	for i, tt := range []struct {
 		url      string
@@ -163,12 +163,12 @@ func TestUnitStateList(t *testing.T) {
 			return
 		}
 
-		expect1 := &schema.UnitState{Name: "XXX", SystemdActiveState: "active"}
+		expect1 := &schema.UnitState{Name: "XXX", SystemdActiveState: "active", SystemdActiveEnterTimestamp: "0"}
 		if !reflect.DeepEqual(expect1, page.States[0]) {
 			t.Errorf("expected first entity %#v, got %#v", expect1, page.States[0])
 		}
 
-		expect2 := &schema.UnitState{Name: "YYY", SystemdActiveState: "inactive"}
+		expect2 := &schema.UnitState{Name: "YYY", SystemdActiveState: "inactive", SystemdActiveEnterTimestamp: "0"}
 		if !reflect.DeepEqual(expect2, page.States[1]) {
 			t.Errorf("expected first entity %#v, got %#v", expect2, page.States[1])
 		}

fleetctl/list_units.go

@@ -17,6 +17,7 @@ package main
 import (
 	"fmt"
 	"sort"
+	"strconv"
 	"strings"
 	"time"
 
@@ -83,7 +84,8 @@ var (
 			}
 			// SystemdActiveEnterTimestamp is in microseconds, while time.Unix
 			// requires the 2nd parameter as value in nanoseconds.
-			tm := time.Unix(0, int64(us.SystemdActiveEnterTimestamp)*1000)
+			ts, _ := strconv.Atoi(us.SystemdActiveEnterTimestamp)
+			tm := time.Unix(0, int64(ts)*1000)
 			duration := time.Now().Sub(tm)
 			return fmt.Sprintf("%s, Since %ss", tm.Format(tmFormatString), strings.Split(duration.String(), ".")[0])
 		},

registry/unit_state.go

@@ -244,7 +244,7 @@ type unitStateModel struct {
 	SubState             string                `json:"subState"`
 	MachineState         *machine.MachineState `json:"machineState"`
 	UnitHash             string                `json:"unitHash"`
-	ActiveEnterTimestamp uint64                `json:"ActiveEnterTimestamp"`
+	ActiveEnterTimestamp uint64                `json:"activeEnterTimestamp"`
 }
 
 func modelToUnitState(usm *unitStateModel, name string) *unit.UnitState {

registry/unit_state_test.go

@@ -122,7 +122,7 @@ func TestSaveUnitState(t *testing.T) {
 	us.UnitHash = "quickbrownfox"
 	r.SaveUnitState(j, us, time.Second)
 
-	json := `{"loadState":"abc","activeState":"def","subState":"ghi","machineState":{"ID":"mymachine","PublicIP":"","Metadata":null,"Capabilities":null,"Version":""},"unitHash":"quickbrownfox","ActiveEnterTimestamp":1234567890}`
+	json := `{"loadState":"abc","activeState":"def","subState":"ghi","machineState":{"ID":"mymachine","PublicIP":"","Metadata":null,"Capabilities":null,"Version":""},"unitHash":"quickbrownfox","activeEnterTimestamp":1234567890}`
 	p1 := "/fleet/state/foo.service"
 	p2 := "/fleet/states/foo.service/mymachine"
 	want := []action{

schema/mapper.go

@@ -15,6 +15,8 @@
 package schema
 
 import (
+	"strconv"
+
 	gsunit "github.com/coreos/go-systemd/unit"
 
 	"github.com/coreos/fleet/job"
@@ -135,7 +137,7 @@ func MapUnitStateToSchemaUnitState(entity *unit.UnitState) *UnitState {
 		SystemdLoadState:            entity.LoadState,
 		SystemdActiveState:          entity.ActiveState,
 		SystemdSubState:             entity.SubState,
-		SystemdActiveEnterTimestamp: entity.ActiveEnterTimestamp,
+		SystemdActiveEnterTimestamp: strconv.Itoa(int(entity.ActiveEnterTimestamp)),
 	}
 
 	return &us
@@ -144,14 +146,15 @@ func MapUnitStateToSchemaUnitState(entity *unit.UnitState) *UnitState {
 func MapSchemaUnitStatesToUnitStates(entities []*UnitState) []*unit.UnitState {
 	us := make([]*unit.UnitState, len(entities))
 	for i, e := range entities {
+		ts, _ := strconv.Atoi(e.SystemdActiveEnterTimestamp)
 		us[i] = &unit.UnitState{
 			UnitName:             e.Name,
 			UnitHash:             e.Hash,
 			MachineID:            e.MachineID,
 			LoadState:            e.SystemdLoadState,
 			ActiveState:          e.SystemdActiveState,
 			SubState:             e.SystemdSubState,
-			ActiveEnterTimestamp: e.SystemdActiveEnterTimestamp,
+			ActiveEnterTimestamp: uint64(ts),
 		}
 	}
 

schema/v1-json.go

@@ -162,6 +162,9 @@ const DiscoveryJSON = `{
         },
         "systemdSubState": {
           "type": "string"
+        },
+        "systemdActiveEnterTimestamp": {
+          "type": "string"
         }
       }
     },

schema/v1.json

@@ -141,6 +141,9 @@
         },
         "systemdSubState": {
           "type": "string"
+        },
+        "systemdActiveEnterTimestamp": {
+          "type": "string"
         }
       }
     },