upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-21 10:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8788 from bitsf/tag_retention_validate_model

Browse Source 
add tag retention model test
This commit is contained in:
Wang Yan 2019-08-23 13:57:51 +08:00 committed by GitHub
commit e7488e37b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 150 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/core/api/retention_test.go
View File

@ -37,17 +37,13 @@ func TestCreatePolicy(t *testing.T) {
ID: 1,
Priority: 1,
Template: "recentXdays",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -55,7 +51,7 @@ func TestCreatePolicy(t *testing.T) {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},
@ -104,17 +100,13 @@ func TestCreatePolicy(t *testing.T) {
ID: 1,
Priority: 1,
Template: "recentXdays",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -122,7 +114,7 @@ func TestCreatePolicy(t *testing.T) {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},
@ -154,17 +146,13 @@ func TestCreatePolicy(t *testing.T) {
ID: 1,
Priority: 1,
Template: "recentXdays",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -172,7 +160,7 @@ func TestCreatePolicy(t *testing.T) {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},
@ -183,17 +171,13 @@ func TestCreatePolicy(t *testing.T) {
ID: 2,
Priority: 1,
Template: "recentXdays",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -201,7 +185,7 @@ func TestCreatePolicy(t *testing.T) {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},
@ -237,17 +221,13 @@ func TestPolicy(t *testing.T) {
ID: 1,
Priority: 1,
Template: "recentXdays",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -255,7 +235,7 @@ func TestPolicy(t *testing.T) {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},
@ -307,17 +287,13 @@ func TestPolicy(t *testing.T) {
ID: 1,
Priority: 1,
Template: "recentXdays",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -325,7 +301,7 @@ func TestPolicy(t *testing.T) {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "b.+",
},
@ -359,17 +335,13 @@ func TestPolicy(t *testing.T) {
ID: 1,
Priority: 1,
Template: "recentXdays",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -377,7 +349,7 @@ func TestPolicy(t *testing.T) {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "b.+",
},
@ -388,17 +360,13 @@ func TestPolicy(t *testing.T) {
ID: 2,
Priority: 1,
Template: "recentXdays",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -406,7 +374,7 @@ func TestPolicy(t *testing.T) {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "b.+",
},

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

@ -29,17 +29,13 @@ func TestPolicy(t *testing.T) {
ID: 1,
Priority: 1,
Template: "recentXdays",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -47,7 +43,7 @@ func TestPolicy(t *testing.T) {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},
@ -107,17 +103,13 @@ func TestExecution(t *testing.T) {
ID: 1,
Priority: 1,
Template: "recentXdays",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -125,7 +117,7 @@ func TestExecution(t *testing.T) {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},

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

@ -59,6 +59,14 @@ type Metadata struct {
// Valid Valid
func (m *Metadata) Valid(v *validation.Validation) {
if m.Trigger == nil {
_ = v.SetError("Trigger", "Trigger is required")
return
}
if m.Scope == nil {
_ = v.SetError("Scope", "Scope is required")
return
}
if m.Trigger != nil && m.Trigger.Kind == TriggerKindSchedule {
if m.Trigger.Settings == nil {
_ = v.SetError("Trigger.Settings", "Trigger.Settings is required")
@ -68,6 +76,13 @@ func (m *Metadata) Valid(v *validation.Validation) {
}
}
}
if !v.HasErrors() {
for _, r := range m.Rules {
if ok, _ := v.Valid(&r); !ok {
return
}
}
}
}
// Trigger of the policy

85
src/pkg/retention/policy/models_test.go Normal file
View File

@ -0,0 +1,85 @@
package policy
import (
"fmt"
"github.com/astaxie/beego/validation"
"github.com/goharbor/harbor/src/pkg/retention/policy/rule"
"github.com/stretchr/testify/require"
"testing"
)
func TestAlgorithm(t *testing.T) {
p := Metadata{
Algorithm: "bad",
}
v := &validation.Validation{}
ok, err := v.Valid(p)
require.Nil(t, err)
require.False(t, ok)
}
// beego 1.9.0 has bug to deal with nil interface
// func TestTrigger(t *testing.T) {
// p := Metadata{
// Algorithm: "or",
// }
// v := &validation.Validation{}
// ok, err := v.Valid(p)
//
// require.Nil(t, err)
// require.False(t, ok)
// for _, e := range v.Errors {
// fmt.Print(e.Field, e.Message)
// }
// }
func TestRule(t *testing.T) {
p := &Metadata{
Algorithm: "or",
Rules: []rule.Metadata{
{
ID: 1,
Priority: 1,
Action: "retain",
Template: "recentXdays",
Parameters: rule.Parameters{
"num": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "badkind", // validate doublestar
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
},
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},
},
},
},
},
Trigger: &Trigger{
Kind: "Schedule",
Settings: map[string]interface{}{
"cron": "* 22 11 * * *",
},
},
Scope: &Scope{
Level: "project",
Reference: 1,
},
}
v := &validation.Validation{}
ok, err := v.Valid(p)
require.Nil(t, err)
require.False(t, ok)
for _, e := range v.Errors {
fmt.Printf("%s %s\n", e.Field, e.Message)
}
}

20
src/pkg/retention/policy/rule/models.go
View File

@ -14,6 +14,10 @@
package rule
import (
"github.com/astaxie/beego/validation"
)
// Metadata of the retention rule
type Metadata struct {
// UUID of rule
@ -42,6 +46,22 @@ type Metadata struct {
ScopeSelectors map[string][]*Selector `json:"scope_selectors" valid:"Required"`
}
// Valid Valid
func (m *Metadata) Valid(v *validation.Validation) {
for _, ts := range m.TagSelectors {
if pass, _ := v.Valid(ts); !pass {
return
}
}
for _, ss := range m.ScopeSelectors {
for _, s := range ss {
if pass, _ := v.Valid(s); !pass {
return
}
}
}
}
// Selector to narrow down the list
type Selector struct {
// Kind of the selector