clean old devops code

todo impl use informer

Signed-off-by: runzexia <runzexia@yunify.com>

pkg/apiserver/query/field.go

@@ -1,16 +1,18 @@
 package query
 
 type Field string
+type Value string
 
 const (
 	FieldName                = "name"
+	FieldUID                 = "uid"
 	FieldCreationTimeStamp   = "creationTimestamp"
 	FieldLastUpdateTimestamp = "lastUpdateTimestamp"
 	FieldLabel               = "label"
+	FieldAnnotation          = "annotation"
 	FieldNamespace           = "namespace"
 	FieldStatus              = "status"
-	FieldApplication         = "application"
-	FieldOwner               = "owner"
+	FieldOwnerReference      = "ownerReference"
 	FieldOwnerKind           = "ownerKind"
 )
 
@@ -23,9 +25,11 @@ var SortableFields = []Field{
 // Field contains all the query field that can be compared
 var ComparableFields = []Field{
 	FieldName,
+	FieldUID,
+	FieldLabel,
+	FieldAnnotation,
 	FieldNamespace,
 	FieldStatus,
-	FieldApplication,
-	FieldOwner,
+	FieldOwnerReference,
 	FieldOwnerKind,
 }

pkg/apiserver/query/types.go

@@ -3,7 +3,6 @@ package query
 import (
 	"github.com/emicklei/go-restful"
 	"strconv"
-	"strings"
 )
 
 const (
@@ -16,24 +15,6 @@ const (
 	ParameterAscending     = "ascending"
 )
 
-type Comparable interface {
-	Compare(Comparable) int
-
-	Contains(Comparable) bool
-}
-
-type ComparableString string
-
-func (c ComparableString) Compare(comparable Comparable) int {
-	other := comparable.(ComparableString)
-	return strings.Compare(string(c), string(other))
-}
-
-func (c ComparableString) Contains(comparable Comparable) bool {
-	other := comparable.(ComparableString)
-	return strings.Contains(string(c), string(other))
-}
-
 // Query represents api search terms
 type Query struct {
 	Pagination *Pagination
@@ -52,29 +33,30 @@ type Pagination struct {
 	// items per page
 	Limit int
 
-	// page number
-	Page int
+	// offset
+	Offset int
 }
 
-var NoPagination = newPagination(-1, -1)
+var NoPagination = newPagination(-1, 0)
 
-func newPagination(limit int, page int) *Pagination {
+// make sure that pagination is valid
+func newPagination(limit int, offset int) *Pagination {
 	return &Pagination{
-		Limit: limit,
-		Page:  page,
+		Limit:  limit,
+		Offset: offset,
 	}
 }
 
-func (p *Pagination) IsValidPagintaion() bool {
-	return p.Limit >= 0 && p.Page >= 0
-}
+func (p *Pagination) GetValidPagination(total int) (startIndex, endIndex int) {
+	if p.Limit == NoPagination.Limit {
+		return 0, total
+	}
 
-func (p *Pagination) IsPageAvailable(total, startIndex int) bool {
-	return total > startIndex && p.Limit > 0
-}
+	if p.Limit < 0 || p.Offset < 0 {
+		return 0, 0
+	}
 
-func (p *Pagination) GetPaginationSettings(total int) (startIndex, endIndex int) {
-	startIndex = p.Limit * p.Page
+	startIndex = p.Limit * p.Offset
 	endIndex = startIndex + p.Limit
 
 	if endIndex > total {
@@ -86,33 +68,33 @@ func (p *Pagination) GetPaginationSettings(total int) (startIndex, endIndex int)
 
 func New() *Query {
 	return &Query{
-		Pagination: &Pagination{
-			Limit: -1,
-			Page:  -1,
-		},
-		SortBy:    "",
-		Ascending: false,
-		Filters:   []Filter{},
+		Pagination: NoPagination,
+		SortBy:     "",
+		Ascending:  false,
+		Filters:    []Filter{},
 	}
 }
 
 type Filter struct {
 	Field Field
-	Value Comparable
+	Value Value
 }
 
 func ParseQueryParameter(request *restful.Request) *Query {
 	query := New()
 
-	limit, err := strconv.ParseInt(request.QueryParameter("limit"), 10, 0)
+	limit, err := strconv.Atoi(request.QueryParameter("limit"))
+	// equivalent to undefined, use the default value
 	if err != nil {
-		query.Pagination = NoPagination
+		limit = -1
+	}
+	page, err := strconv.Atoi(request.QueryParameter("page"))
+	// equivalent to undefined, use the default value
+	if err != nil {
+		page = 1
 	}
 
-	page, err := strconv.ParseInt(request.QueryParameter("page"), 10, 0)
-	if err == nil {
-		query.Pagination = newPagination(int(limit), int(page-1))
-	}
+	query.Pagination = newPagination(limit, page-1)
 
 	query.SortBy = Field(defaultString(request.QueryParameter("sortBy"), FieldCreationTimeStamp))
 
@@ -128,13 +110,12 @@ func ParseQueryParameter(request *restful.Request) *Query {
 		if len(f) != 0 {
 			query.Filters = append(query.Filters, Filter{
 				Field: field,
-				Value: ComparableString(f),
+				Value: Value(f),
 			})
 		}
 	}
 
 	return query
-
 }
 
 func defaultString(value, defaultValue string) string {

pkg/apiserver/query/types_test.go

@@ -16,7 +16,7 @@ func TestParseQueryParameter(t *testing.T) {
 	}{
 		{
 			"test normal case",
-			"name=foo&status=Running&application=book&page=1&limit=10&ascending=true",
+			"label=app.kubernetes.io/name:book&name=foo&status=Running&page=1&limit=10&ascending=true",
 			&Query{
 				Pagination: newPagination(10, 0),
 				SortBy:     FieldCreationTimeStamp,
@@ -24,15 +24,15 @@ func TestParseQueryParameter(t *testing.T) {
 				Filters: []Filter{
 					{
 						FieldName,
-						ComparableString("foo"),
+						Value("foo"),
+					},
+					{
+						FieldLabel,
+						Value("app.kubernetes.io/name:book"),
 					},
 					{
 						FieldStatus,
-						ComparableString("Running"),
-					},
-					{
-						FieldApplication,
-						ComparableString("book"),
+						Value("Running"),
 					},
 				},
 			},
@@ -41,13 +41,10 @@ func TestParseQueryParameter(t *testing.T) {
 			"test bad case",
 			"xxxx=xxxx&dsfsw=xxxx&page=abc&limit=add&ascending=ssss",
 			&Query{
-				Pagination: &Pagination{
-					Limit: -1,
-					Page:  -1,
-				},
-				SortBy:    FieldCreationTimeStamp,
-				Ascending: false,
-				Filters:   []Filter{},
+				Pagination: NoPagination,
+				SortBy:     FieldCreationTimeStamp,
+				Ascending:  false,
+				Filters:    []Filter{},
 			},
 		},
 	}