admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3773 from LinuxSuRen/fix-filter-parse-err

Browse Source 
Fix the error caused by the wrong filter parse
This commit is contained in:
KubeSphere CI Bot
2021-04-20 14:06:11 +08:00
committed by GitHub
parent fa088425ff 4ba8645bcf
commit b9ea449a4b
3 changed files with 88 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/models/devops/devops.go
View File

@@ -53,6 +53,9 @@ const (
channelMaxCapacity = 100
)
type PipelineFilter func(pipeline *v1alpha3.Pipeline) bool
type PipelineSorter func([]*v1alpha3.Pipeline, int, int) bool
type DevopsOperator interface {
CreateDevOpsProject(workspace string, project *v1alpha3.DevOpsProject) (*v1alpha3.DevOpsProject, error)
GetDevOpsProject(workspace string, projectName string) (*v1alpha3.DevOpsProject, error)
@@ -64,7 +67,7 @@ type DevopsOperator interface {
GetPipelineObj(projectName string, pipelineName string) (*v1alpha3.Pipeline, error)
DeletePipelineObj(projectName string, pipelineName string) error
UpdatePipelineObj(projectName string, pipeline *v1alpha3.Pipeline) (*v1alpha3.Pipeline, error)
ListPipelineObj(projectName string, filterFunc func(*v1alpha3.Pipeline) bool, sortFunc func([]*v1alpha3.Pipeline, int, int) bool, limit, offset int) (api.ListResult, error)
ListPipelineObj(projectName string, filterFunc PipelineFilter, sortFunc PipelineSorter, limit, offset int) (api.ListResult, error)
CreateCredentialObj(projectName string, s *v1.Secret) (*v1.Secret, error)
GetCredentialObj(projectName string, secretName string) (*v1.Secret, error)
@@ -268,8 +271,8 @@ func (d devopsOperator) UpdatePipelineObj(projectName string, pipeline *v1alpha3
return d.ksclient.DevopsV1alpha3().Pipelines(ns).Update(context.Background(), pipeline, metav1.UpdateOptions{})
}
func (d devopsOperator) ListPipelineObj(projectName string, filterFunc func(pipeline *v1alpha3.Pipeline) bool,
sortFunc func([]*v1alpha3.Pipeline, int, int) bool, limit, offset int) (api.ListResult, error) {
func (d devopsOperator) ListPipelineObj(projectName string, filterFunc PipelineFilter,
sortFunc PipelineSorter, limit, offset int) (api.ListResult, error) {
projectObj, err := d.ksInformers.Devops().V1alpha3().DevOpsProjects().Lister().Get(projectName)
if err != nil {
return api.ListResult{}, err