Merge branch 'master' into pagination

api/server/middleware/audit.go

@@ -19,6 +19,7 @@ package middleware
 import (
 	"context"
 	"net/http"
+	"strings"
 
 	"github.com/gin-contrib/requestid"
 	"github.com/gin-gonic/gin"
@@ -84,6 +85,15 @@ func (w *auditWriter) asyncAudit(c *gin.Context) {
 
 // getAuditStatus returns the status of operation.
 func getAuditStatus(c *gin.Context) model.AuditOperationStatus {
+	// Directly use the native structure of kubernetes for the request of /pixiu/proxy and do separate processing
+	if strings.Contains(c.Request.RequestURI, "/pixiu/proxy") {
+		if responseOK(c.Writer.Status()) {
+			return model.AuditOpSuccess
+		} else {
+			return model.AuditOpFail
+		}
+	}
+
 	respCode := httputils.GetResponseCode(c)
 	if respCode == 0 {
 		return model.AuditOpUnknown

api/server/router/audit/audit_routes.go

@@ -50,14 +50,14 @@ func (a *auditRouter) listAudits(c *gin.Context) {
 	r := httputils.NewResponse()
 
 	var (
-		err error
-		req types.PageRequest
+		listOption types.ListOptions // 分页设置
+		err        error
 	)
-	if err = httputils.ShouldBindAny(c, nil, nil, &req); err != nil {
+	if err = httputils.ShouldBindAny(c, nil, nil, &listOption); err != nil {
 		httputils.SetFailed(c, r, err)
 		return
 	}
-	if r.Result, err = a.c.Audit().List(c, &req); err != nil {
+	if r.Result, err = a.c.Audit().List(c, listOption); err != nil {
 		httputils.SetFailed(c, r, err)
 		return
 	}

pkg/controller/audit/audit.go

@@ -33,7 +33,7 @@ type AuditGetter interface {
 }
 
 type Interface interface {
-	List(ctx context.Context, req *types.PageRequest) (*types.PageResponse, error)
+	List(ctx context.Context, listOption types.ListOptions) (interface{}, error)
 	Get(ctx context.Context, aid int64) (*types.Audit, error)
 }
 
@@ -54,32 +54,29 @@ func (a *audit) Get(ctx context.Context, aid int64) (*types.Audit, error) {
 	return a.model2Type(object), nil
 }
 
-func (a *audit) List(ctx context.Context, req *types.PageRequest) (*types.PageResponse, error) {
-	var ts []types.Audit
-
+func (a *audit) List(ctx context.Context, listOption types.ListOptions) (interface{}, error) {
+	// 获取对象总数量
 	total, err := a.factory.Audit().Count(ctx)
 	if err != nil {
-		klog.Errorf("failed to get tenant count: %v", err)
-		return nil, errors.ErrServerInternal
-	}
-	if total == 0 {
-		return &types.PageResponse{}, nil
+		klog.Errorf("failed to get audits count: %v", err)
+		return nil, err
 	}
 
-	objects, err := a.factory.Audit().List(ctx, req.BuildPageNation()...)
+	// 获取偏移列表
+	objects, err := a.factory.Audit().List(ctx, db.WithOffset(listOption.Page-1), db.WithLimit(int(listOption.Limit)), db.WithOrderByDesc())
 	if err != nil {
-		klog.Errorf("failed to get tenants: %v", err)
+		klog.Errorf("failed to get audit events: %v", err)
 		return nil, errors.ErrServerInternal
 	}
 
+	var ts []types.Audit
 	for _, object := range objects {
 		ts = append(ts, *a.model2Type(&object))
 	}
-
-	return &types.PageResponse{
-		Total:       total,
+	return types.PageResponse{
+		PageRequest: listOption.PageRequest,
+		Total:       int(total),
 		Items:       ts,
-		PageRequest: *req,
 	}, nil
 }
 

pkg/db/audit.go

@@ -31,7 +31,8 @@ type AuditInterface interface {
 	Get(ctx context.Context, id int64) (*model.Audit, error)
 	Create(ctx context.Context, object *model.Audit) (*model.Audit, error)
 	BatchDelete(ctx context.Context, opts ...Options) (int64, error)
-	Count(ctx context.Context) (int64, error)
+
+	Count(ctx context.Context, opts ...Options) (int64, error)
 }
 
 type audit struct {
@@ -64,17 +65,8 @@ func (a *audit) Get(ctx context.Context, aid int64) (*model.Audit, error) {
 	return audit, nil
 }
 
-func (a *audit) Count(ctx context.Context) (int64, error) {
-	var total int64
-	if err := a.db.WithContext(ctx).Model(&model.Audit{}).Count(&total).Error; err != nil {
-		return 0, err
-	}
-	return total, nil
-}
-
 func (a *audit) List(ctx context.Context, opts ...Options) ([]model.Audit, error) {
 	var audits []model.Audit
-
 	tx := a.db.WithContext(ctx)
 	for _, opt := range opts {
 		tx = opt(tx)
@@ -95,3 +87,14 @@ func (a *audit) BatchDelete(ctx context.Context, opts ...Options) (int64, error)
 	err := tx.Delete(&model.Audit{}).Error
 	return tx.RowsAffected, err
 }
+
+func (a *audit) Count(ctx context.Context, opts ...Options) (int64, error) {
+	tx := a.db.WithContext(ctx)
+	for _, opt := range opts {
+		tx = opt(tx)
+	}
+
+	var total int64
+	err := tx.Model(&model.Audit{}).Count(&total).Error
+	return total, err
+}