clean old devops code

todo impl use informer Signed-off-by: runzexia <runzexia@yunify.com>
2020-04-01 15:54:57 +08:00
parent 56482f1feb
commit 9a6ba04a37
1000 changed files with 31387 additions and 139332 deletions
--- a/pkg/kapis/iam/v1alpha2/handler.go
+++ b/pkg/kapis/iam/v1alpha2/handler.go
@@ -2,24 +2,24 @@ package v1alpha2

 import (
 	"github.com/emicklei/go-restful"
+	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	"kubesphere.io/kubesphere/pkg/api"
+	iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2"
 	authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options"
-	"kubesphere.io/kubesphere/pkg/informers"
 	"kubesphere.io/kubesphere/pkg/models/iam/am"
 	"kubesphere.io/kubesphere/pkg/models/iam/im"
-	"kubesphere.io/kubesphere/pkg/simple/client/cache"
-	"kubesphere.io/kubesphere/pkg/simple/client/k8s"
-	ldappool "kubesphere.io/kubesphere/pkg/simple/client/ldap"
+	"strings"
 )

 type iamHandler struct {
-	amOperator am.AccessManagementInterface
-	imOperator im.IdentityManagementInterface
+	am am.AccessManagementInterface
+	im im.IdentityManagementInterface
 }

-func newIAMHandler(k8sClient k8s.Client, factory informers.InformerFactory, ldapClient ldappool.Interface, cacheClient cache.Interface, options *authoptions.AuthenticationOptions) *iamHandler {
+func newIAMHandler(im im.IdentityManagementInterface, am am.AccessManagementInterface, options *authoptions.AuthenticationOptions) *iamHandler {
 	return &iamHandler{
-		amOperator: am.NewAMOperator(k8sClient.Kubernetes(), factory.KubernetesSharedInformerFactory()),
-		imOperator: im.NewLDAPOperator(ldapClient),
+		am: am,
+		im: im,
 	}
 }

@@ -36,7 +36,22 @@ func (h *iamHandler) ModifyUser(request *restful.Request, response *restful.Resp
 }

 func (h *iamHandler) DescribeUser(req *restful.Request, resp *restful.Response) {
-	panic("implement me")
+	username := req.PathParameter("user")
+	user, err := h.im.DescribeUser(username)
+	if err != nil {
+		api.HandleInternalError(resp, req, err)
+		return
+	}
+
+	globalRole, err := h.am.GetRoleOfUserInTargetScope(iamv1alpha2.GlobalScope, "", username)
+
+	if err != nil {
+		api.HandleInternalError(resp, req, err)
+		return
+	}
+	result := iamv1alpha2.UserDetail{User: user, GlobalRole: globalRole}
+
+	resp.WriteEntity(result)
 }

 func (h *iamHandler) ListUsers(req *restful.Request, resp *restful.Response) {
@@ -48,9 +63,39 @@ func (h *iamHandler) ListUserRoles(req *restful.Request, resp *restful.Response)
 }

 func (h *iamHandler) ListRoles(req *restful.Request, resp *restful.Response) {
-
 	panic("implement me")
 }
+
+func (h *iamHandler) ListRolesOfUser(req *restful.Request, resp *restful.Response) {
+	username := req.PathParameter("user")
+
+	var roles []iamv1alpha2.Role
+	var err error
+
+	if strings.HasSuffix(req.Request.URL.Path, "workspaceroles") {
+		roles, err = h.am.ListRolesOfUser(iamv1alpha2.WorkspaceScope, username)
+	} else if strings.HasSuffix(req.Request.URL.Path, "clusterroles") {
+		roles, err = h.am.ListRolesOfUser(iamv1alpha2.ClusterScope, username)
+	} else if strings.HasSuffix(req.Request.URL.Path, "namespaceroles") {
+		roles, err = h.am.ListRolesOfUser(iamv1alpha2.NamespaceScope, username)
+	}
+
+	if err != nil {
+		api.HandleInternalError(resp, req, err)
+		return
+	}
+
+	result := iamv1alpha2.RoleList{
+		TypeMeta: v1.TypeMeta{
+			Kind:       "List",
+			APIVersion: "v1",
+		},
+		ListMeta: v1.ListMeta{},
+		Items:    roles,
+	}
+
+	resp.WriteEntity(result)
+}
 func (h *iamHandler) ListClusterRoles(req *restful.Request, resp *restful.Response) {
 	panic("implement me")
 }
--- a/pkg/kapis/iam/v1alpha2/register.go
+++ b/pkg/kapis/iam/v1alpha2/register.go
@@ -22,15 +22,14 @@ import (
 	"github.com/emicklei/go-restful-openapi"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"kubesphere.io/kubesphere/pkg/api"
+	iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2"
 	authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options"
 	"kubesphere.io/kubesphere/pkg/apiserver/runtime"
 	"kubesphere.io/kubesphere/pkg/constants"
-	"kubesphere.io/kubesphere/pkg/informers"
 	"kubesphere.io/kubesphere/pkg/models"
+	"kubesphere.io/kubesphere/pkg/models/iam/am"
+	"kubesphere.io/kubesphere/pkg/models/iam/im"
 	"kubesphere.io/kubesphere/pkg/server/errors"
-	"kubesphere.io/kubesphere/pkg/simple/client/cache"
-	"kubesphere.io/kubesphere/pkg/simple/client/k8s"
-	ldappool "kubesphere.io/kubesphere/pkg/simple/client/ldap"
 	"net/http"
 )

@@ -38,19 +37,38 @@ const groupName = "iam.kubesphere.io"

 var GroupVersion = schema.GroupVersion{Group: groupName, Version: "v1alpha2"}

-func AddToContainer(c *restful.Container, k8sClient k8s.Client, factory informers.InformerFactory, ldapClient ldappool.Interface, cacheClient cache.Interface, options *authoptions.AuthenticationOptions) error {
+func AddToContainer(container *restful.Container, im im.IdentityManagementInterface, am am.AccessManagementInterface, options *authoptions.AuthenticationOptions) error {
 	ws := runtime.NewWebService(GroupVersion)

-	handler := newIAMHandler(k8sClient, factory, ldapClient, cacheClient, options)
+	handler := newIAMHandler(im, am, options)

-	// implemented by create CRD object.
-	//ws.Route(ws.POST("/users"))
-	//ws.Route(ws.DELETE("/users/{user}"))
-	//ws.Route(ws.PUT("/users/{user}"))
-	//ws.Route(ws.GET("/users/{user}"))
+	ws.Route(ws.GET("/users/{user}").
+		To(handler.DescribeUser).
+		Doc("Retrieve user details.").
+		Param(ws.PathParameter("user", "username")).
+		Returns(http.StatusOK, api.StatusOK, iamv1alpha2.UserDetail{}).
+		Metadata(restfulspec.KeyOpenAPITags, []string{constants.AccessManagementTag}))

-	// TODO move to resources api
-	//ws.Route(ws.GET("/users"))
+	ws.Route(ws.GET("/users/{user}/workspaceroles").
+		To(handler.ListRolesOfUser).
+		Doc("Retrieve user roles in workspaces.").
+		Param(ws.PathParameter("user", "username")).
+		Returns(http.StatusOK, api.StatusOK, iamv1alpha2.RoleList{}).
+		Metadata(restfulspec.KeyOpenAPITags, []string{constants.AccessManagementTag}))
+
+	ws.Route(ws.GET("/users/{user}/clusterroles").
+		To(handler.ListRolesOfUser).
+		Doc("Retrieve user roles in clusters.").
+		Param(ws.PathParameter("user", "username")).
+		Returns(http.StatusOK, api.StatusOK, iamv1alpha2.RoleList{}).
+		Metadata(restfulspec.KeyOpenAPITags, []string{constants.AccessManagementTag}))
+
+	ws.Route(ws.GET("/users/{user}/namespaceroles").
+		To(handler.ListRolesOfUser).
+		Doc("Retrieve user roles in namespaces.").
+		Param(ws.PathParameter("user", "username")).
+		Returns(http.StatusOK, api.StatusOK, iamv1alpha2.RoleList{}).
+		Metadata(restfulspec.KeyOpenAPITags, []string{constants.AccessManagementTag}))

 	ws.Route(ws.GET("/namespaces/{namespace}/roles").
 		To(handler.ListRoles).
@@ -104,6 +122,6 @@ func AddToContainer(c *restful.Container, k8sClient k8s.Client, factory informer
 		Returns(http.StatusOK, api.StatusOK, errors.Error{}).
 		Metadata(restfulspec.KeyOpenAPITags, []string{constants.AccessManagementTag}))

-	c.Add(ws)
+	container.Add(ws)
 	return nil
 }