refactor iam api

Signed-off-by: hongming <talonwan@yunify.com>

pkg/apiserver/iam/users.go

@@ -66,6 +66,10 @@ func CreateUser(req *restful.Request, resp *restful.Response) {
 	err = iam.CreateUser(user)
 
 	if err != nil {
+		if ldap.IsErrorWithCode(err, ldap.LDAPResultEntryAlreadyExists) {
+			resp.WriteHeaderAndEntity(http.StatusConflict, errors.Wrap(err))
+			return
+		}
 		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
 		return
 	}
@@ -180,7 +184,7 @@ func CurrentUserDetail(req *restful.Request, resp *restful.Response) {
 
 	if err != nil {
 		if ldap.IsErrorWithCode(err, ldap.LDAPResultNoSuchObject) {
-			resp.WriteHeaderAndEntity(http.StatusForbidden, errors.Wrap(err))
+			resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
 		} else {
 			resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
 		}
@@ -228,6 +232,12 @@ func NamespacesListHandler(req *restful.Request, resp *restful.Response) {
 
 func UserDetail(req *restful.Request, resp *restful.Response) {
 	username := req.PathParameter("name")
+	usernameFromHeader := req.HeaderParameter(constants.UserNameHeader)
+
+	if username == usernameFromHeader {
+		CurrentUserDetail(req, resp)
+		return
+	}
 
 	conn, err := ldapclient.Client()
 

pkg/apiserver/iam/workspaces.go

@@ -29,8 +29,6 @@ import (
 	"github.com/emicklei/go-restful"
 	"k8s.io/api/core/v1"
 	rbac "k8s.io/api/rbac/v1"
-	apierror "k8s.io/apimachinery/pkg/api/errors"
-
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/errors"
 	"kubesphere.io/kubesphere/pkg/models"
@@ -64,20 +62,6 @@ func WorkspaceRoles(req *restful.Request, resp *restful.Response) {
 	resp.WriteAsJson(roles)
 }
 
-func WorkspaceMemberQuery(req *restful.Request, resp *restful.Response) {
-	workspace := req.PathParameter("name")
-	keyword := req.QueryParameter("keyword")
-
-	users, err := workspaces.GetWorkspaceMembers(workspace, keyword)
-
-	if err != nil {
-		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
-		return
-	}
-
-	resp.WriteAsJson(users)
-}
-
 func WorkspaceMemberDetail(req *restful.Request, resp *restful.Response) {
 	workspace := req.PathParameter("name")
 	username := req.PathParameter("member")
@@ -559,26 +543,10 @@ func DevopsRulesHandler(req *restful.Request, resp *restful.Response) {
 }
 
 func NamespacesRulesHandler(req *restful.Request, resp *restful.Response) {
-	workspaceName := req.PathParameter("workspace")
+	//workspaceName := req.PathParameter("workspace")
 	username := req.HeaderParameter(constants.UserNameHeader)
 	namespaceName := req.PathParameter("namespace")
 
-	namespace, err := iam.GetNamespace(namespaceName)
-
-	if err != nil {
-		if apierror.IsNotFound(err) {
-			resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(fmt.Errorf("permission undefined")))
-		} else {
-			resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
-		}
-		return
-	}
-
-	if namespace.Labels == nil || namespace.Labels["kubesphere.io/workspace"] != workspaceName {
-		resp.WriteHeaderAndEntity(http.StatusForbidden, errors.Wrap(fmt.Errorf("permission undefined")))
-		return
-	}
-
 	clusterRoles, err := iam.GetClusterRoles(username)
 
 	if err != nil {

pkg/apiserver/resources/application.go

@@ -0,0 +1,58 @@
+/*
+
+ Copyright 2019 The KubeSphere Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+*/
+package resources
+
+import (
+	"github.com/emicklei/go-restful"
+	"kubesphere.io/kubesphere/pkg/errors"
+	"kubesphere.io/kubesphere/pkg/models/applications"
+	"kubesphere.io/kubesphere/pkg/params"
+	"net/http"
+)
+
+func ApplicationHandler(req *restful.Request, resp *restful.Response) {
+	limit, offset := params.ParsePaging(req)
+	clusterId := req.QueryParameter("cluster_id")
+	runtimeId := req.QueryParameter("runtime_id")
+	conditions, err := params.ParseConditions(req)
+	if err != nil {
+		if err != nil {
+			resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+			return
+		}
+	}
+	if len(clusterId) > 0 {
+		app, err := applications.GetApp(clusterId)
+		if err != nil {
+			resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+			return
+		}
+		resp.WriteEntity(app)
+		return
+	}
+
+	result, err := applications.ListApplication(runtimeId, conditions, limit, offset)
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteAsJson(result)
+
+}

pkg/apiserver/servicemesh/metrics/handlers.go

@@ -0,0 +1,43 @@
+package metrics
+
+import (
+	"fmt"
+	"github.com/emicklei/go-restful"
+	"github.com/kiali/kiali/handlers"
+)
+
+// Get app metrics
+func GetAppMetrics(request *restful.Request, response *restful.Response) {
+	handlers.AppMetrics(response.ResponseWriter, request.Request)
+}
+
+// Get workload metrics
+func GetWorkloadMetrics(request *restful.Request, response *restful.Response) {
+	handlers.WorkloadMetrics(response.ResponseWriter, request.Request)
+}
+
+// Get service metrics
+func GetServiceMetrics(request *restful.Request, response *restful.Response) {
+	handlers.ServiceMetrics(response.ResponseWriter, request.Request)
+}
+
+// Get namespace metrics
+func GetNamespaceMetrics(request *restful.Request, response *restful.Response) {
+	handlers.NamespaceMetrics(response.ResponseWriter, request.Request)
+}
+
+// Get service graph for namespace
+func GetNamespaceGraph(request *restful.Request, response *restful.Response) {
+	namespace := request.PathParameter("namespace")
+
+	if len(namespace) > 0 {
+		request.Request.URL.RawQuery = fmt.Sprintf("%s&namespaces=%s", request.Request.URL.RawQuery, namespace)
+	}
+
+	handlers.GraphNamespaces(response.ResponseWriter, request.Request)
+}
+
+// Get service graph for namespaces
+func GetNamespacesGraph(request *restful.Request, response *restful.Response) {
+	handlers.GraphNamespaces(response.ResponseWriter, request.Request)
+}