resource router仅用于标签和Resource标识

Author: yumaojun03

http/router/httprouter/httprouter.go

@@ -54,8 +54,8 @@ func (r *httpRouter) AddProtected(method, path string, h http.HandlerFunc) {
 			Method:       method,
 			Path:         path,
 			FunctionName: router.GetHandlerFuncName(h),
-			Protected:    true,
 			Labels:       map[string]string{},
+			Protected:    true,
 		},
 		h: h,
 	}
@@ -68,7 +68,6 @@ func (r *httpRouter) AddPublict(method, path string, h http.HandlerFunc) {
 			Method:       method,
 			Path:         path,
 			FunctionName: router.GetHandlerFuncName(h),
-			Protected:    false,
 			Labels:       map[string]string{},
 		},
 		h: h,

http/router/httprouter/httprouter_test.go

@@ -151,14 +151,17 @@ func TestAPIRootOrderOK(t *testing.T) {
 
 	r.AddProtected("GET", "/test1", IndexHandler)
 	r.AddProtected("GET", "/test2", IndexHandler)
-	r.AddProtected("GET", "/test3", IndexHandler)
+	r.AddPublict("GET", "/test3", IndexHandler)
 	r.EnableAPIRoot()
 	r.ServeHTTP(w, req)
 
 	es := router.NewEntrySet()
 	if should.NoError(response.GetDataFromBody(w.Result().Body, es)) {
-		should.NotNil("/test1", es.Items[0].Path)
-		should.NotNil("/test2", es.Items[1].Path)
-		should.NotNil("/test3", es.Items[2].Path)
+		should.Equal("/test1", es.Items[0].Path)
+		should.Equal("/test2", es.Items[1].Path)
+		should.Equal(true, es.Items[1].Protected)
+		should.Equal("/test3", es.Items[2].Path)
+		should.Equal(false, es.Items[2].Protected)
+
 	}
 }

http/router/httprouter/subrouter.go

@@ -47,6 +47,7 @@ func (r *subRouter) AddProtected(method, path string, h http.HandlerFunc) {
 			Path:         path,
 			FunctionName: router.GetHandlerFuncName(h),
 			Labels:       map[string]string{},
+			Protected:    true,
 		},
 		needAuth: true,
 		h:        h,
@@ -75,11 +76,12 @@ func (r *subRouter) SetLabel(labels ...*router.Label) {
 	r.labels = append(r.labels, labels...)
 }
 
-func (r *subRouter) ResourceRouter(resourceName string) router.SubRouter {
+func (r *subRouter) ResourceRouter(resourceName string, labels ...*router.Label) router.SubRouter {
 	return &subRouter{
 		resourceName: resourceName,
-		basePath:     r.basePath + "/" + resourceName,
+		basePath:     r.basePath,
 		root:         r.root,
+		labels:       append(r.labels, labels...),
 	}
 }
 

http/router/httprouter/subrouter_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/infraboard/mcube/http/router"
 	"github.com/infraboard/mcube/http/router/httprouter"
-	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSubRouterTestSuit(t *testing.T) {
@@ -22,14 +22,14 @@ func TestSubRouterTestSuit(t *testing.T) {
 
 func newSubRouterTestSuit(t *testing.T) *subRouterTestSuit {
 	return &subRouterTestSuit{
-		should: require.New(t),
+		should: assert.New(t),
 	}
 }
 
 type subRouterTestSuit struct {
 	root   router.Router
 	sub    router.SubRouter
-	should *require.Assertions
+	should *assert.Assertions
 }
 
 func (s *subRouterTestSuit) SetUp() {
@@ -69,13 +69,14 @@ func (a *subRouterTestSuit) testAddPublictOK() func(t *testing.T) {
 
 func (a *subRouterTestSuit) testResourceRouterOK() func(t *testing.T) {
 	return func(t *testing.T) {
-		a.sub.ResourceRouter("resources").AddPublict("GET", "/", IndexHandler)
+		a.sub.ResourceRouter("resourceName", router.NewLable("k1", "v1")).AddPublict("GET", "/resources", IndexHandler)
 
 		w := httptest.NewRecorder()
-		req, _ := http.NewRequest("GET", "/v1/resources/", nil)
+		req, _ := http.NewRequest("GET", "/v1/resources", nil)
 		a.root.ServeHTTP(w, req)
 
-		t.Log(a.root.GetEndpoints())
+		entry := a.root.GetEndpoints().GetEntry("/v1/resources", "GET")
 		a.should.Equal(w.Code, 200)
+		a.should.Equal(entry.Labels["k1"], "v1")
 	}
 }

http/router/router.go

@@ -47,6 +47,7 @@ type SubRouter interface {
 	With(m ...Middleware) SubRouter
 	// SetLabel 设置子路由标签, 作用于Entry上
 	SetLabel(...*Label)
-	// ResourceRouter 资源路由器
-	ResourceRouter(resourceName string) SubRouter
+	// ResourceRouter 资源路由器, 主要用于设置路由标签和资源名称,
+	// 方便配置灵活的权限策略
+	ResourceRouter(resourceName string, labels ...*Label) SubRouter
 }