update

Signed-off-by: hongming <talonwan@yunify.com>
2020-04-10 10:16:26 +08:00
parent 0e814bb5e4
commit a3d3c8e427
44 changed files with 2178 additions and 1283 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"
+	iamvealpha2 "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").To(handler.CreateUser))
-	//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, iamvealpha2.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, iamvealpha2.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, iamvealpha2.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, iamvealpha2.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
 }
--- a/pkg/kapis/tenant/v1alpha2/handler.go
+++ b/pkg/kapis/tenant/v1alpha2/handler.go
@@ -1,196 +1,38 @@
 package v1alpha2

 import (
+	"errors"
 	"github.com/emicklei/go-restful"
-	v1 "k8s.io/api/core/v1"
-	k8serr "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/klog"
 	"kubesphere.io/kubesphere/pkg/api"
-	"kubesphere.io/kubesphere/pkg/constants"
+	"kubesphere.io/kubesphere/pkg/apiserver/request"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/models/iam/am"
-	"kubesphere.io/kubesphere/pkg/models/monitoring"
-	"kubesphere.io/kubesphere/pkg/models/resources/v1alpha2"
 	"kubesphere.io/kubesphere/pkg/models/tenant"
-	apierr "kubesphere.io/kubesphere/pkg/server/errors"
-	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/simple/client/k8s"
-	"kubesphere.io/kubesphere/pkg/simple/client/mysql"
-	"net/http"
 )

 type tenantHandler struct {
 	tenant tenant.Interface
-	am     am.AccessManagementInterface
 }

-func newTenantHandler(k8sClient k8s.Client, factory informers.InformerFactory, db *mysql.Database) *tenantHandler {
+func newTenantHandler(k8sClient k8s.Client, factory informers.InformerFactory) *tenantHandler {

 	return &tenantHandler{
-		tenant: tenant.New(k8sClient.Kubernetes(), factory.KubernetesSharedInformerFactory(), factory.KubeSphereSharedInformerFactory(), db),
-		am:     am.NewAMOperator(k8sClient.Kubernetes(), factory.KubernetesSharedInformerFactory()),
+		tenant: tenant.New(k8sClient, factory),
 	}
 }

 func (h *tenantHandler) ListWorkspaces(req *restful.Request, resp *restful.Response) {
-	username := req.HeaderParameter(constants.UserNameHeader)
-	orderBy := params.GetStringValueWithDefault(req, params.OrderByParam, v1alpha2.CreateTime)
-	limit, offset := params.ParsePaging(req)
-	reverse := params.GetBoolValueWithDefault(req, params.ReverseParam, true)
-	conditions, err := params.ParseConditions(req)
+	user, ok := request.UserFrom(req.Request.Context())

-	if err != nil {
+	if !ok {
+		err := errors.New("cannot obtain user info")
 		klog.Errorln(err)
-		api.HandleBadRequest(resp, nil, err)
+		api.HandleForbidden(resp, nil, err)
 		return
 	}

-	result, err := h.tenant.ListWorkspaces(username, conditions, orderBy, reverse, limit, offset)
-
-	if err != nil {
-		api.HandleInternalError(resp, nil, err)
-		return
-	}
-
-	resp.WriteAsJson(result)
-}
-
-func (h *tenantHandler) DescribeWorkspace(req *restful.Request, resp *restful.Response) {
-	username := req.HeaderParameter(constants.UserNameHeader)
-	workspaceName := req.PathParameter("workspace")
-
-	result, err := h.tenant.DescribeWorkspace(username, workspaceName)
-
-	if err != nil {
-		if k8serr.IsNotFound(err) {
-			api.HandleNotFound(resp, nil, err)
-		} else {
-			api.HandleInternalError(resp, nil, err)
-		}
-		return
-	}
-
-	resp.WriteAsJson(result)
-}
-
-func (h *tenantHandler) ListNamespaces(req *restful.Request, resp *restful.Response) {
-	workspace := req.PathParameter("workspace")
-	username := req.PathParameter("member")
-	// /workspaces/{workspace}/members/{username}/namespaces
-	if username == "" {
-		// /workspaces/{workspace}/namespaces
-		username = req.HeaderParameter(constants.UserNameHeader)
-	}
-
-	orderBy := params.GetStringValueWithDefault(req, params.OrderByParam, v1alpha2.CreateTime)
-	limit, offset := params.ParsePaging(req)
-	reverse := params.GetBoolValueWithDefault(req, params.ReverseParam, true)
-	conditions, err := params.ParseConditions(req)
-
-	if err != nil {
-		api.HandleBadRequest(resp, nil, err)
-		return
-	}
-
-	conditions.Match[constants.WorkspaceLabelKey] = workspace
-
-	result, err := h.tenant.ListNamespaces(username, conditions, orderBy, reverse, limit, offset)
-
-	if err != nil {
-		api.HandleInternalError(resp, nil, err)
-		return
-	}
-
-	namespaces := make([]*v1.Namespace, 0)
-
-	for _, item := range result.Items {
-		namespaces = append(namespaces, item.(*v1.Namespace).DeepCopy())
-	}
-
-	namespaces = monitoring.GetNamespacesWithMetrics(namespaces)
-
-	items := make([]interface{}, 0)
-
-	for _, item := range namespaces {
-		items = append(items, item)
-	}
-
-	result.Items = items
-
-	resp.WriteAsJson(result)
-}
-
-func (h *tenantHandler) CreateNamespace(req *restful.Request, resp *restful.Response) {
-	workspace := req.PathParameter("workspace")
-	username := req.HeaderParameter(constants.UserNameHeader)
-	var namespace v1.Namespace
-	err := req.ReadEntity(&namespace)
-	if err != nil {
-		api.HandleNotFound(resp, nil, err)
-		return
-	}
-
-	_, err = h.tenant.DescribeWorkspace("", workspace)
-
-	if err != nil {
-		if k8serr.IsNotFound(err) {
-			api.HandleForbidden(resp, nil, err)
-		} else {
-			api.HandleInternalError(resp, nil, err)
-		}
-		return
-	}
-
-	created, err := h.tenant.CreateNamespace(workspace, &namespace, username)
-
-	if err != nil {
-		if k8serr.IsAlreadyExists(err) {
-			resp.WriteHeaderAndEntity(http.StatusConflict, err)
-		} else {
-			api.HandleInternalError(resp, nil, err)
-		}
-		return
-	}
-	resp.WriteAsJson(created)
-}
-
-func (h *tenantHandler) DeleteNamespace(req *restful.Request, resp *restful.Response) {
-	workspace := req.PathParameter("workspace")
-	namespace := req.PathParameter("namespace")
-
-	err := h.tenant.DeleteNamespace(workspace, namespace)
-
-	if err != nil {
-		if k8serr.IsNotFound(err) {
-			api.HandleNotFound(resp, nil, err)
-		} else {
-			api.HandleInternalError(resp, nil, err)
-		}
-		return
-	}
-
-	resp.WriteAsJson(apierr.None)
-}
-
-func (h *tenantHandler) ListDevopsProjects(req *restful.Request, resp *restful.Response) {
-
-	workspace := req.PathParameter("workspace")
-	username := req.PathParameter("member")
-	if username == "" {
-		username = req.HeaderParameter(constants.UserNameHeader)
-	}
-	orderBy := params.GetStringValueWithDefault(req, params.OrderByParam, v1alpha2.CreateTime)
-	limit, offset := params.ParsePaging(req)
-	reverse := params.GetBoolValueWithDefault(req, params.ReverseParam, true)
-	conditions, err := params.ParseConditions(req)
-
-	if err != nil {
-		api.HandleBadRequest(resp, nil, err)
-		return
-	}
-	conditions.Match["workspace"] = workspace
-
-	result, err := h.tenant.ListDevopsProjects(username, conditions, orderBy, reverse, limit, offset)
+	result, err := h.tenant.ListWorkspaces(user.GetName())

 	if err != nil {
 		api.HandleInternalError(resp, nil, err)
@@ -200,40 +42,24 @@ func (h *tenantHandler) ListDevopsProjects(req *restful.Request, resp *restful.R
 	resp.WriteEntity(result)
 }

-func (h *tenantHandler) GetDevOpsProjectsCount(req *restful.Request, resp *restful.Response) {
-	username := req.HeaderParameter(constants.UserNameHeader)
+func (h *tenantHandler) ListNamespaces(req *restful.Request, resp *restful.Response) {
+	user, ok := request.UserFrom(req.Request.Context())

-	result, err := h.tenant.ListDevopsProjects(username, nil, "", false, 1, 0)
-	if err != nil {
-		api.HandleInternalError(resp, nil, err)
-		return
-	}
-	resp.WriteEntity(struct {
-		Count int `json:"count"`
-	}{Count: result.TotalCount})
-}
-func (h *tenantHandler) DeleteDevopsProject(req *restful.Request, resp *restful.Response) {
-	projectId := req.PathParameter("devops")
-	workspace := req.PathParameter("workspace")
-	username := req.HeaderParameter(constants.UserNameHeader)
-
-	_, err := h.tenant.DescribeWorkspace("", workspace)
-
-	if err != nil {
-		api.HandleInternalError(resp, req, err)
+	if !ok {
+		err := errors.New("cannot obtain user info")
+		klog.Errorln(err)
+		api.HandleForbidden(resp, nil, err)
 		return
 	}

-	err = h.tenant.DeleteDevOpsProject(username, projectId)
+	worksapceName := req.PathParameter("workspace")
+
+	result, err := h.tenant.ListNamespaces(worksapceName, user.GetName())

 	if err != nil {
 		api.HandleInternalError(resp, nil, err)
 		return
 	}

-	resp.WriteEntity(apierr.None)
-}
-
-func (h *tenantHandler) CreateDevopsProject(req *restful.Request, resp *restful.Response) {
-
+	resp.WriteEntity(result)
 }
--- a/pkg/kapis/tenant/v1alpha2/register.go
+++ b/pkg/kapis/tenant/v1alpha2/register.go
@@ -23,17 +23,11 @@ import (
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"kubesphere.io/kubesphere/pkg/api"
-	devopsv1alpha2 "kubesphere.io/kubesphere/pkg/api/devops/v1alpha2"
-	"kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
 	"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/server/errors"
-	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/simple/client/k8s"
-	"kubesphere.io/kubesphere/pkg/simple/client/mysql"
-
 	"net/http"
 )

@@ -43,95 +37,28 @@ const (

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

-func AddToContainer(c *restful.Container, k8sClient k8s.Client, factory informers.InformerFactory, db *mysql.Database) error {
+func AddToContainer(c *restful.Container, k8sClient k8s.Client, factory informers.InformerFactory) error {
 	ws := runtime.NewWebService(GroupVersion)
-	handler := newTenantHandler(k8sClient, factory, db)
+	handler := newTenantHandler(k8sClient, factory)

 	ws.Route(ws.GET("/workspaces").
 		To(handler.ListWorkspaces).
 		Returns(http.StatusOK, api.StatusOK, models.PageableResponse{}).
 		Doc("List all workspaces that belongs to the current user").
 		Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag}))
-	ws.Route(ws.GET("/workspaces/{workspace}").
-		To(handler.DescribeWorkspace).
-		Doc("Describe the specified workspace").
-		Param(ws.PathParameter("workspace", "workspace name")).
-		Returns(http.StatusOK, api.StatusOK, v1alpha1.Workspace{}).
-		Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag}))
 	ws.Route(ws.GET("/workspaces/{workspace}/namespaces").
 		To(handler.ListNamespaces).
 		Param(ws.PathParameter("workspace", "workspace name")).
 		Doc("List the namespaces of the specified workspace for the current user").
 		Returns(http.StatusOK, api.StatusOK, []v1.Namespace{}).
 		Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag}))
-	ws.Route(ws.GET("/workspaces/{workspace}/members/{member}/namespaces").
+	ws.Route(ws.GET("/workspaces/{workspace}/clusters").
 		To(handler.ListNamespaces).
 		Param(ws.PathParameter("workspace", "workspace name")).
 		Param(ws.PathParameter("member", "workspace member's username")).
 		Doc("List the namespaces for the workspace member").
 		Returns(http.StatusOK, api.StatusOK, []v1.Namespace{}).
 		Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag}))
-	ws.Route(ws.POST("/workspaces/{workspace}/namespaces").
-		To(handler.CreateNamespace).
-		Param(ws.PathParameter("workspace", "workspace name")).
-		Doc("Create a namespace in the specified workspace").
-		Returns(http.StatusOK, api.StatusOK, []v1.Namespace{}).
-		Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag}))
-	ws.Route(ws.DELETE("/workspaces/{workspace}/namespaces/{namespace}").
-		To(handler.DeleteNamespace).
-		Param(ws.PathParameter("workspace", "workspace name")).
-		Param(ws.PathParameter("namespace", "the name of the namespace")).
-		Doc("Delete the specified namespace from the workspace").
-		Returns(http.StatusOK, api.StatusOK, errors.Error{}).
-		Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag}))
-
-	ws.Route(ws.GET("/workspaces/{workspace}/devops").
-		To(handler.ListDevopsProjects).
-		Param(ws.PathParameter("workspace", "workspace name")).
-		Param(ws.QueryParameter(params.PagingParam, "page").
-			Required(false).
-			DataFormat("limit=%d,page=%d").
-			DefaultValue("limit=10,page=1")).
-		Param(ws.QueryParameter(params.ConditionsParam, "query conditions").
-			Required(false).
-			DataFormat("key=%s,key~%s")).
-		Doc("List devops projects for the current user").
-		Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag}))
-	ws.Route(ws.GET("/workspaces/{workspace}/members/{member}/devops").
-		To(handler.ListDevopsProjects).
-		Param(ws.PathParameter("workspace", "workspace name")).
-		Param(ws.PathParameter("member", "workspace member's username")).
-		Param(ws.QueryParameter(params.PagingParam, "page").
-			Required(false).
-			DataFormat("limit=%d,page=%d").
-			DefaultValue("limit=10,page=1")).
-		Param(ws.QueryParameter(params.ConditionsParam, "query conditions").
-			Required(false).
-			DataFormat("key=%s,key~%s")).
-		Returns(http.StatusOK, api.StatusOK, models.PageableResponse{}).
-		Doc("List the devops projects for the workspace member").
-		Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag}))
-	ws.Route(ws.GET("/devopscount").
-		To(handler.GetDevOpsProjectsCount).
-		Returns(http.StatusOK, api.StatusOK, struct {
-			Count uint32 `json:"count"`
-		}{}).
-		Doc("Get the devops projects count for the member").
-		Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag}))
-	ws.Route(ws.POST("/workspaces/{workspace}/devops").
-		To(handler.CreateDevopsProject).
-		Param(ws.PathParameter("workspace", "workspace name")).
-		Doc("Create a devops project in the specified workspace").
-		Reads(devopsv1alpha2.DevOpsProject{}).
-		Returns(http.StatusOK, api.StatusOK, devopsv1alpha2.DevOpsProject{}).
-		Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag}))
-	ws.Route(ws.DELETE("/workspaces/{workspace}/devops/{devops}").
-		To(handler.DeleteDevopsProject).
-		Param(ws.PathParameter("workspace", "workspace name")).
-		Param(ws.PathParameter("devops", "devops project ID")).
-		Doc("Delete the specified devops project from the workspace").
-		Returns(http.StatusOK, api.StatusOK, devopsv1alpha2.DevOpsProject{}).
-		Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag}))

 	c.Add(ws)
 	return nil