mirror of
https://github.com/goharbor/harbor.git
synced 2024-11-19 16:55:16 +01:00
Merge pull request #8255 from goharbor/feat/retention/GH-6660-keep-most-recent-n
Retention: Implement Filter: Keep Latest K
This commit is contained in:
commit
3243d5bce1
@ -15,6 +15,8 @@
|
||||
package latestk
|
||||
|
||||
import (
|
||||
"sort"
|
||||
|
||||
"github.com/goharbor/harbor/src/common/utils/log"
|
||||
"github.com/goharbor/harbor/src/pkg/retention/policy/action"
|
||||
"github.com/goharbor/harbor/src/pkg/retention/policy/rule"
|
||||
@ -38,8 +40,17 @@ type evaluator struct {
|
||||
|
||||
// Process the candidates based on the rule definition
|
||||
func (e *evaluator) Process(artifacts []*res.Candidate) ([]*res.Candidate, error) {
|
||||
// TODO: REPLACE SAMPLE CODE WITH REAL IMPLEMENTATION
|
||||
return artifacts, nil
|
||||
// The updated proposal does not guarantee the order artifacts are provided, so we have to sort them first
|
||||
sort.Slice(artifacts, func(i, j int) bool {
|
||||
return artifacts[i].PushedTime < artifacts[j].PushedTime
|
||||
})
|
||||
|
||||
i := e.k
|
||||
if i > len(artifacts) {
|
||||
i = len(artifacts)
|
||||
}
|
||||
|
||||
return artifacts[:i], nil
|
||||
}
|
||||
|
||||
// Specify what action is performed to the candidates processed by this evaluator
|
||||
@ -51,7 +62,7 @@ func (e *evaluator) Action() string {
|
||||
func New(params rule.Parameters) rule.Evaluator {
|
||||
if params != nil {
|
||||
if param, ok := params[ParameterK]; ok {
|
||||
if v, ok := param.(int); ok {
|
||||
if v, ok := param.(int); ok && v >= 0 {
|
||||
return &evaluator{
|
||||
k: v,
|
||||
}
|
||||
|
71
src/pkg/retention/policy/rule/latestk/evaluator_test.go
Normal file
71
src/pkg/retention/policy/rule/latestk/evaluator_test.go
Normal file
@ -0,0 +1,71 @@
|
||||
package latestk
|
||||
|
||||
import (
|
||||
"math/rand"
|
||||
"strconv"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/suite"
|
||||
|
||||
"github.com/goharbor/harbor/src/pkg/retention/policy/rule"
|
||||
"github.com/goharbor/harbor/src/pkg/retention/res"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
type EvaluatorTestSuite struct {
|
||||
suite.Suite
|
||||
}
|
||||
|
||||
func (e *EvaluatorTestSuite) TestNew() {
|
||||
tests := []struct {
|
||||
Name string
|
||||
args rule.Parameters
|
||||
expectedK int
|
||||
}{
|
||||
{Name: "Valid", args: map[string]rule.Parameter{ParameterK: 5}, expectedK: 5},
|
||||
{Name: "Default If Negative", args: map[string]rule.Parameter{ParameterK: -1}, expectedK: DefaultK},
|
||||
{Name: "Default If Not Set", args: map[string]rule.Parameter{}, expectedK: DefaultK},
|
||||
{Name: "Default If Wrong Type", args: map[string]rule.Parameter{ParameterK: "foo"}, expectedK: DefaultK},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
e.T().Run(tt.Name, func(t *testing.T) {
|
||||
e := New(tt.args).(*evaluator)
|
||||
|
||||
require.Equal(t, tt.expectedK, e.k)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func (e *EvaluatorTestSuite) TestProcess() {
|
||||
data := []*res.Candidate{{PushedTime: 0}, {PushedTime: 1}, {PushedTime: 2}, {PushedTime: 3}, {PushedTime: 4}}
|
||||
rand.Shuffle(len(data), func(i, j int) {
|
||||
data[i], data[j] = data[j], data[i]
|
||||
})
|
||||
|
||||
tests := []struct {
|
||||
k int
|
||||
expected int
|
||||
}{
|
||||
{k: 0, expected: 0},
|
||||
{k: 1, expected: 1},
|
||||
{k: 3, expected: 3},
|
||||
{k: 5, expected: 5},
|
||||
{k: 6, expected: 5},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
e.T().Run(strconv.Itoa(tt.k), func(t *testing.T) {
|
||||
e := New(map[string]rule.Parameter{ParameterK: tt.k})
|
||||
|
||||
result, err := e.Process(data)
|
||||
|
||||
require.NoError(t, err)
|
||||
require.Len(t, result, tt.expected)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestEvaluator(t *testing.T) {
|
||||
suite.Run(t, &EvaluatorTestSuite{})
|
||||
}
|
Loading…
Reference in New Issue
Block a user