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

fix: add "next_scheduled_time" (#18102)

Browse Source 
Signed-off-by: Shengwen Yu <yshengwen@vmware.com>
This commit is contained in:
Shengwen YU 2023-02-17 17:54:53 +08:00 committed by GitHub
parent 2b82f99986
commit 94dbc3fa8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pkg/retention/manager.go
View File

@ -21,7 +21,9 @@ import (
"time" "time"
"github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/client/orm"
"github.com/go-openapi/strfmt"
"github.com/goharbor/harbor/src/common/utils"
"github.com/goharbor/harbor/src/pkg/retention/dao" "github.com/goharbor/harbor/src/pkg/retention/dao"
"github.com/goharbor/harbor/src/pkg/retention/dao/models" "github.com/goharbor/harbor/src/pkg/retention/dao/models"
"github.com/goharbor/harbor/src/pkg/retention/policy" "github.com/goharbor/harbor/src/pkg/retention/policy"
@ -92,6 +94,12 @@ func (d *DefaultManager) GetPolicy(ctx context.Context, id int64) (*policy.Metad
return nil, err return nil, err
} }
p.ID = id p.ID = id
if p.Trigger.Kind == policy.TriggerKindSchedule {
cron, ok := p.Trigger.Settings[policy.TriggerSettingsCron]
if ok && len(cron.(string)) > 0 {
p.Trigger.Settings[policy.TriggerSettingNextScheduledTime] = strfmt.DateTime(utils.NextSchedule(cron.(string), time.Now()))
}
}
return p, nil return p, nil
} }

3
src/pkg/retention/policy/models.go
View File

@ -32,6 +32,9 @@ const (
// TriggerSettingsCron cron // TriggerSettingsCron cron
TriggerSettingsCron = "cron" TriggerSettingsCron = "cron"
// TriggerSettingNextScheduledTime next_scheduled_time
TriggerSettingNextScheduledTime = "next_scheduled_time"
// ScopeLevelProject project // ScopeLevelProject project
ScopeLevelProject = "project" ScopeLevelProject = "project"
) )