Merge pull request #1144 from allencloud/add-finishat

feature: add FinishedAt and StartAt in container get api

Author: allencloud

apis/swagger.yml

@@ -2879,6 +2879,7 @@ definitions:
 
   ContainerState:
     type: "object"
+    required: [StartedAt, FinishedAt]
     properties:
       Status:
         $ref: "#/definitions/Status"
@@ -2919,9 +2920,11 @@ definitions:
       StartedAt:
         description: "The time when this container was last started."
         type: "string"
+        x-nullable: false
       FinishedAt:
         description: "The time when this container last exited."
         type: "string"
+        x-nullable: false
 
   ContainerLogsOptions:
     type: "object"

apis/types/container_state.go

@@ -450,7 +450,9 @@ func (mgr *ContainerManager) Create(ctx context.Context, name string, config *ty
 
 	meta := &ContainerMeta{
 		State: &types.ContainerState{
-			Status: types.StatusCreated,
+			Status:     types.StatusCreated,
+			StartedAt:  time.Time{}.UTC().Format(utils.TimeLayout),
+			FinishedAt: time.Time{}.UTC().Format(utils.TimeLayout),
 		},
 		ID:         id,
 		Image:      image.ID,

daemon/mgr/container.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"time"
+
 	"github.com/alibaba/pouch/apis/types"
 	"github.com/alibaba/pouch/test/environment"
 	"github.com/alibaba/pouch/test/request"
@@ -45,6 +47,10 @@ func (suite *APIContainerInspectSuite) TestInpectOk(c *check.C) {
 	c.Assert(got.Image, check.Equals, busyboxImage)
 	c.Assert(got.Name, check.Equals, cname)
 	c.Assert(got.Created, check.NotNil)
+	// StartedAt time should be 0001-01-01T00:00:00Z for a non-started container
+	c.Assert(got.State.StartedAt, check.Equals, time.Time{}.UTC().Format(time.RFC3339Nano))
+	// FinishAt time should be 0001-01-01T00:00:00Z for a non-stopped container
+	c.Assert(got.State.FinishedAt, check.Equals, time.Time{}.UTC().Format(time.RFC3339Nano))
 
 	DelContainerForceOk(c, cname)
 }