Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-10-03 07:47:54 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15280 from chlins/fix/p2p-task-time-format

Browse Source 
fix(p2p): adjust task time format
This commit is contained in:
ChenYu Zhang 2021-07-09 16:29:09 +08:00 committed by GitHub
commit 304aff33db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/v2.0/handler/preheat.go
View File

@ -665,16 +665,16 @@ func convertTaskToPayload(model *task.Task) (*models.Task, error) {
} }
return &models.Task{ return &models.Task{
CreationTime: model.CreationTime.String(), CreationTime: model.CreationTime.Format(time.RFC3339),
EndTime: model.EndTime.String(), EndTime: model.EndTime.Format(time.RFC3339),
ExecutionID: model.ExecutionID, ExecutionID: model.ExecutionID,
ExtraAttrs: model.ExtraAttrs, ExtraAttrs: model.ExtraAttrs,
ID: model.ID, ID: model.ID,
RunCount: model.RunCount, RunCount: model.RunCount,
StartTime: model.StartTime.String(), StartTime: model.StartTime.Format(time.RFC3339),
Status: model.Status, Status: model.Status,
StatusMessage: model.StatusMessage, StatusMessage: model.StatusMessage,
UpdateTime: model.UpdateTime.String(), UpdateTime: model.UpdateTime.Format(time.RFC3339),
}, nil }, nil
} }

8
src/server/v2.0/handler/preheat_test.go
View File

@ -375,16 +375,16 @@ func Test_convertTaskToPayload(t *testing.T) {
EndTime: time.Time{}, EndTime: time.Time{},
}, },
expect: &models.Task{ expect: &models.Task{
CreationTime: "0001-01-01 00:00:00 +0000 UTC", CreationTime: "0001-01-01T00:00:00Z",
EndTime: "0001-01-01 00:00:00 +0000 UTC", EndTime: "0001-01-01T00:00:00Z",
ExecutionID: 0, ExecutionID: 0,
ExtraAttrs: nil, ExtraAttrs: nil,
ID: 0, ID: 0,
RunCount: 0, RunCount: 0,
StartTime: "0001-01-01 00:00:00 +0000 UTC", StartTime: "0001-01-01T00:00:00Z",
Status: "", Status: "",
StatusMessage: "", StatusMessage: "",
UpdateTime: "0001-01-01 00:00:00 +0000 UTC", UpdateTime: "0001-01-01T00:00:00Z",
}, },
}, },
} }