upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2025-04-27 07:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8883 from bitsf/tag_retention_log

Browse Source 
enhance tag retention log
This commit is contained in:
Wenkai Yin(尹文开) 2019-08-30 10:48:01 +08:00 committed by GitHub
commit 881884786d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pkg/retention/dao/retention_test.go
View File

@ -172,7 +172,8 @@ func TestExecution(t *testing.T) {
func TestTask(t *testing.T) { func TestTask(t *testing.T) {
task := &models.RetentionTask{ task := &models.RetentionTask{
ExecutionID: 1, ExecutionID: 1,
Status: "pending", Status: "Pending",
StartTime: time.Now().Truncate(time.Second),
} }
// create // create
id, err := CreateTask(task) id, err := CreateTask(task)
@ -182,7 +183,7 @@ func TestTask(t *testing.T) {
tk, err := GetTask(id) tk, err := GetTask(id)
require.Nil(t, err) require.Nil(t, err)
require.Equal(t, id, tk.ID) require.Equal(t, id, tk.ID)
require.Equal(t, "pending", tk.Status) require.Equal(t, "Pending", tk.Status)
// update // update
task.ID = id task.ID = id
@ -191,22 +192,26 @@ func TestTask(t *testing.T) {
require.Nil(t, err) require.Nil(t, err)
// update status // update status
err = UpdateTaskStatus(id, "running", 1, 1) err = UpdateTaskStatus(id, "Running", 1, 1)
require.Nil(t, err) require.Nil(t, err)
// list // list
tasks, err := ListTask(&q.TaskQuery{ tasks, err := ListTask(&q.TaskQuery{
ExecutionID: 1, ExecutionID: 1,
Status: "running", Status: "Running",
}) })
require.Nil(t, err) require.Nil(t, err)
require.Equal(t, 1, len(tasks)) require.Equal(t, 1, len(tasks))
assert.Equal(t, 1, tasks[0].Total) assert.Equal(t, 1, tasks[0].Total)
assert.Equal(t, int64(1), tasks[0].ExecutionID) 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, 1, tasks[0].StatusCode)
assert.Equal(t, int64(1), tasks[0].StatusRevision) assert.Equal(t, int64(1), tasks[0].StatusRevision)
// update status
err = UpdateTaskStatus(id, "Stopped", 1, 2)
require.Nil(t, err)
// delete // delete
err = DeleteTask(id) err = DeleteTask(id)
require.Nil(t, err) require.Nil(t, err)

6
src/pkg/retention/job.go
View File

@ -164,7 +164,8 @@ func logResults(logger logger.Interface, all []*res.Candidate, results []*res.Re
for _, c := range all { for _, c := range all {
row := []string{ row := []string{
arn(c), c.Digest,
c.Tag,
c.Kind, c.Kind,
strings.Join(c.Labels, ","), strings.Join(c.Labels, ","),
t(c.PushedTime), t(c.PushedTime),
@ -176,7 +177,8 @@ func logResults(logger logger.Interface, all []*res.Candidate, results []*res.Re
} }
table := tablewriter.NewWriter(&buf) 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.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
table.SetCenterSeparator("|") table.SetCenterSeparator("|")
table.AppendBulk(data) table.AppendBulk(data)

2
src/pkg/retention/launcher.go
View File

@ -248,7 +248,7 @@ func (l *launcher) createTasks(executionID int64, jobDatas []*jobData) error {
taskID, err := l.retentionMgr.CreateTask(&Task{ taskID, err := l.retentionMgr.CreateTask(&Task{
ExecutionID: executionID, ExecutionID: executionID,
Repository: jobData.Repository.Name, Repository: jobData.Repository.Name,
StartTime: now, StartTime: now.Truncate(time.Second),
}) })
if err != nil { if err != nil {
return err return err