From 247ef1b8842077c72226b940361e9bc61bbd73f9 Mon Sep 17 00:00:00 2001
From: Ziming Zhang <zziming@vmware.com>
Date: Thu, 29 Aug 2019 15:35:13 +0800
Subject: [PATCH] enhance tag retention log

Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Id5946c2dd53868fdd5f5abbcca45e453bc9ba4fd
Signed-off-by: Ziming Zhang <zziming@vmware.com>
---
 src/pkg/retention/dao/retention_test.go | 15 ++++++++++-----
 src/pkg/retention/job.go                |  6 ++++--
 src/pkg/retention/launcher.go           |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/pkg/retention/dao/retention_test.go b/src/pkg/retention/dao/retention_test.go
index 0119d542a..245d88e41 100644
--- a/src/pkg/retention/dao/retention_test.go
+++ b/src/pkg/retention/dao/retention_test.go
@@ -172,7 +172,8 @@ func TestExecution(t *testing.T) {
 func TestTask(t *testing.T) {
 	task := &models.RetentionTask{
 		ExecutionID: 1,
-		Status:      "pending",
+		Status:      "Pending",
+		StartTime:   time.Now().Truncate(time.Second),
 	}
 	// create
 	id, err := CreateTask(task)
@@ -182,7 +183,7 @@ func TestTask(t *testing.T) {
 	tk, err := GetTask(id)
 	require.Nil(t, err)
 	require.Equal(t, id, tk.ID)
-	require.Equal(t, "pending", tk.Status)
+	require.Equal(t, "Pending", tk.Status)
 
 	// update
 	task.ID = id
@@ -191,22 +192,26 @@ func TestTask(t *testing.T) {
 	require.Nil(t, err)
 
 	// update status
-	err = UpdateTaskStatus(id, "running", 1, 1)
+	err = UpdateTaskStatus(id, "Running", 1, 1)
 	require.Nil(t, err)
 
 	// list
 	tasks, err := ListTask(&q.TaskQuery{
 		ExecutionID: 1,
-		Status:      "running",
+		Status:      "Running",
 	})
 	require.Nil(t, err)
 	require.Equal(t, 1, len(tasks))
 	assert.Equal(t, 1, tasks[0].Total)
 	assert.Equal(t, int64(1), tasks[0].ExecutionID)
-	assert.Equal(t, "running", tasks[0].Status)
+	assert.Equal(t, "Running", tasks[0].Status)
 	assert.Equal(t, 1, tasks[0].StatusCode)
 	assert.Equal(t, int64(1), tasks[0].StatusRevision)
 
+	// update status
+	err = UpdateTaskStatus(id, "Stopped", 1, 2)
+	require.Nil(t, err)
+
 	// delete
 	err = DeleteTask(id)
 	require.Nil(t, err)
diff --git a/src/pkg/retention/job.go b/src/pkg/retention/job.go
index 607525e22..4839b7002 100644
--- a/src/pkg/retention/job.go
+++ b/src/pkg/retention/job.go
@@ -164,7 +164,8 @@ func logResults(logger logger.Interface, all []*res.Candidate, results []*res.Re
 
 	for _, c := range all {
 		row := []string{
-			arn(c),
+			c.Digest,
+			c.Tag,
 			c.Kind,
 			strings.Join(c.Labels, ","),
 			t(c.PushedTime),
@@ -176,7 +177,8 @@ func logResults(logger logger.Interface, all []*res.Candidate, results []*res.Re
 	}
 
 	table := tablewriter.NewWriter(&buf)
-	table.SetHeader([]string{"Artifact", "Kind", "labels", "PushedTime", "PulledTime", "CreatedTime", "Retention"})
+	table.SetAutoFormatHeaders(false)
+	table.SetHeader([]string{"Digest", "Tag", "Kind", "Labels", "PushedTime", "PulledTime", "CreatedTime", "Retention"})
 	table.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
 	table.SetCenterSeparator("|")
 	table.AppendBulk(data)
diff --git a/src/pkg/retention/launcher.go b/src/pkg/retention/launcher.go
index 8bdf91421..c9f6d4655 100644
--- a/src/pkg/retention/launcher.go
+++ b/src/pkg/retention/launcher.go
@@ -248,7 +248,7 @@ func (l *launcher) createTasks(executionID int64, jobDatas []*jobData) error {
 		taskID, err := l.retentionMgr.CreateTask(&Task{
 			ExecutionID: executionID,
 			Repository:  jobData.Repository.Name,
-			StartTime:   now,
+			StartTime:   now.Truncate(time.Second),
 		})
 		if err != nil {
 			return err