upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 15:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: replication policy cron setting - the 1st field must be 0; the Minutes field cannot be * (#18923)

Browse Source 
Signed-off-by: Shengwen Yu <yshengwen@vmware.com>
This commit is contained in:
Shengwen YU 2023-07-20 17:55:48 +08:00 committed by GitHub
parent ce893635aa
commit 9091661539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 68 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/controller/replication/model/model.go
View File

@ -108,6 +108,13 @@ func (p *Policy) Validate() error {
return errors.New(nil).WithCode(errors.BadRequestCode).
WithMessage("invalid cron string for scheduled trigger: %s", p.Trigger.Settings.Cron)
}
cronParts := strings.Split(p.Trigger.Settings.Cron, " ")
if cronParts[0] != "0" {
return errors.New(nil).WithCode(errors.BadRequestCode).WithMessage("the 1st field (indicating Seconds of time) of the cron setting must be 0")
}
if cronParts[1] == "*" {
return errors.New(nil).WithCode(errors.BadRequestCode).WithMessage("* is not allowed for the Minutes field of the cron setting of replication policy")
}
default:
return errors.New(nil).WithCode(errors.BadRequestCode).
WithMessage("invalid trigger type")

60
src/controller/replication/model/model_test.go
View File

@ -199,7 +199,7 @@ func TestValidate(t *testing.T) {
err = policy.Validate()
assert.True(errors.IsErr(err, errors.BadRequestCode))
// pass
// invalid cron: the 1st field (indicating Seconds of time) of the cron setting must be 0
policy = &Policy{
Name: "policy01",
SrcRegistry: &model.Registry{
@ -226,5 +226,63 @@ func TestValidate(t *testing.T) {
},
}
err = policy.Validate()
assert.True(errors.IsErr(err, errors.BadRequestCode))
// invalid cron: * is not allowed for the Minutes field of the cron setting of replication policy
policy = &Policy{
Name: "policy01",
SrcRegistry: &model.Registry{
ID: 0,
},
DestRegistry: &model.Registry{
ID: 1,
},
Filters: []*model.Filter{
{
Type: model.FilterTypeResource,
Value: "image",
},
{
Type: model.FilterTypeName,
Value: "library/**",
},
},
Trigger: &model.Trigger{
Type: model.TriggerTypeScheduled,
Settings: &model.TriggerSettings{
Cron: "0 * * * * *",
},
},
}
err = policy.Validate()
assert.True(errors.IsErr(err, errors.BadRequestCode))
// pass
policy = &Policy{
Name: "policy01",
SrcRegistry: &model.Registry{
ID: 0,
},
DestRegistry: &model.Registry{
ID: 1,
},
Filters: []*model.Filter{
{
Type: model.FilterTypeResource,
Value: "image",
},
{
Type: model.FilterTypeName,
Value: "library/**",
},
},
Trigger: &model.Trigger{
Type: model.TriggerTypeScheduled,
Settings: &model.TriggerSettings{
Cron: "0 0 * * * *",
},
},
}
err = policy.Validate()
assert.Nil(err)
}

4
src/controller/replication/policy_test.go
View File

@ -78,7 +78,7 @@ func (r *replicationTestSuite) TestCreatePolicy() {
Trigger: &model.Trigger{
Type: model.TriggerTypeScheduled,
Settings: &model.TriggerSettings{
Cron: "0 * * * * *",
Cron: "0 0 * * * *",
},
},
Enabled: true,
@ -106,7 +106,7 @@ func (r *replicationTestSuite) TestUpdatePolicy() {
Trigger: &model.Trigger{
Type: model.TriggerTypeScheduled,
Settings: &model.TriggerSettings{
Cron: "0 * * * * *",
Cron: "0 0 * * * *",
},
},
Enabled: true,