Merge pull request #668 from wansir/refactor-openpitrix

refactor: openpitrix module

pkg/apiserver/openpitrix/applications.go

@@ -0,0 +1,273 @@
+/*
+ *
+ * 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 openpitrix
+
+import (
+	"fmt"
+	"github.com/emicklei/go-restful"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"k8s.io/api/core/v1"
+	"k8s.io/klog"
+	"kubesphere.io/kubesphere/pkg/constants"
+	"kubesphere.io/kubesphere/pkg/models"
+	"kubesphere.io/kubesphere/pkg/models/openpitrix"
+	"kubesphere.io/kubesphere/pkg/models/resources"
+	"kubesphere.io/kubesphere/pkg/server/errors"
+	"kubesphere.io/kubesphere/pkg/server/params"
+	"kubesphere.io/kubesphere/pkg/simple/client"
+	"net/http"
+)
+
+func ListApplications(req *restful.Request, resp *restful.Response) {
+	limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam))
+	namespaceName := req.PathParameter("namespace")
+	conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam))
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	if namespaceName != "" {
+		namespace, err := resources.GetResource("", resources.Namespaces, namespaceName)
+
+		if err != nil {
+			klog.Errorln(err)
+			resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+			return
+		}
+		var runtimeId string
+
+		if ns, ok := namespace.(*v1.Namespace); ok {
+			runtimeId = ns.Annotations[constants.OpenPitrixRuntimeAnnotationKey]
+		}
+
+		if runtimeId == "" {
+			resp.WriteAsJson(models.PageableResponse{Items: []interface{}{}, TotalCount: 0})
+			return
+		} else {
+			conditions.Match["runtime_id"] = runtimeId
+		}
+	}
+
+	result, err := openpitrix.ListApplications(conditions, limit, offset)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteAsJson(result)
+}
+
+func DescribeApplication(req *restful.Request, resp *restful.Response) {
+	clusterId := req.PathParameter("application")
+	namespaceName := req.PathParameter("namespace")
+	app, err := openpitrix.DescribeApplication(namespaceName, clusterId)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	namespace, err := resources.GetResource("", resources.Namespaces, namespaceName)
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	var runtimeId string
+
+	if ns, ok := namespace.(*v1.Namespace); ok {
+		runtimeId = ns.Annotations[constants.OpenPitrixRuntimeAnnotationKey]
+	}
+
+	if runtimeId != app.Cluster.RuntimeId {
+		err = fmt.Errorf("rumtime not match %s,%s", app.Cluster.RuntimeId, runtimeId)
+		klog.V(4).Info(err)
+		resp.WriteHeaderAndEntity(http.StatusForbidden, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(app)
+	return
+}
+
+func CreateApplication(req *restful.Request, resp *restful.Response) {
+	namespace := req.PathParameter("namespace")
+	var createClusterRequest openpitrix.CreateClusterRequest
+	err := req.ReadEntity(&createClusterRequest)
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+	createClusterRequest.Username = req.HeaderParameter(constants.UserNameHeader)
+
+	err = openpitrix.CreateApplication(namespace, createClusterRequest)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+	resp.WriteEntity(errors.None)
+}
+
+func ModifyApplication(req *restful.Request, resp *restful.Response) {
+	var modifyClusterAttributesRequest openpitrix.ModifyClusterAttributesRequest
+	clusterId := req.PathParameter("application")
+	namespaceName := req.PathParameter("namespace")
+	err := req.ReadEntity(&modifyClusterAttributesRequest)
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	app, err := openpitrix.DescribeApplication(namespaceName, clusterId)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	namespace, err := resources.GetResource("", resources.Namespaces, namespaceName)
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+	var runtimeId string
+
+	if ns, ok := namespace.(*v1.Namespace); ok {
+		runtimeId = ns.Annotations[constants.OpenPitrixRuntimeAnnotationKey]
+	}
+
+	if runtimeId != app.Cluster.RuntimeId {
+		err = fmt.Errorf("rumtime not match %s,%s", app.Cluster.RuntimeId, runtimeId)
+		klog.V(4).Info(err)
+		resp.WriteHeaderAndEntity(http.StatusForbidden, errors.Wrap(err))
+		return
+	}
+
+	err = openpitrix.PatchApplication(&modifyClusterAttributesRequest)
+
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(errors.None)
+}
+
+func DeleteApplication(req *restful.Request, resp *restful.Response) {
+	clusterId := req.PathParameter("application")
+	namespaceName := req.PathParameter("namespace")
+	app, err := openpitrix.DescribeApplication(namespaceName, clusterId)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	namespace, err := resources.GetResource("", resources.Namespaces, namespaceName)
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+	var runtimeId string
+
+	if ns, ok := namespace.(*v1.Namespace); ok {
+		runtimeId = ns.Annotations[constants.OpenPitrixRuntimeAnnotationKey]
+	}
+
+	if runtimeId != app.Cluster.RuntimeId {
+		err = fmt.Errorf("rumtime not match %s,%s", app.Cluster.RuntimeId, runtimeId)
+		klog.V(4).Info(err)
+		resp.WriteHeaderAndEntity(http.StatusForbidden, errors.Wrap(err))
+		return
+	}
+
+	err = openpitrix.DeleteApplication(clusterId)
+
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(errors.None)
+}

pkg/apiserver/openpitrix/apps.go

@@ -0,0 +1,544 @@
+/*
+ *
+ * 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 openpitrix
+
+import (
+	"github.com/emicklei/go-restful"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"k8s.io/klog"
+	"kubesphere.io/kubesphere/pkg/constants"
+	"kubesphere.io/kubesphere/pkg/models/openpitrix"
+	"kubesphere.io/kubesphere/pkg/server/errors"
+	"kubesphere.io/kubesphere/pkg/server/params"
+	"kubesphere.io/kubesphere/pkg/simple/client"
+	"net/http"
+	"strconv"
+	"strings"
+)
+
+func GetAppVersionPackage(req *restful.Request, resp *restful.Response) {
+	appId := req.PathParameter("app")
+	versionId := req.PathParameter("version")
+
+	result, err := openpitrix.GetAppVersionPackage(appId, versionId)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}
+
+func DoAppAction(req *restful.Request, resp *restful.Response) {
+	var doActionRequest openpitrix.ActionRequest
+	err := req.ReadEntity(&doActionRequest)
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	appId := req.PathParameter("app")
+
+	err = openpitrix.DoAppAction(appId, &doActionRequest)
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.InvalidArgument {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(errors.None)
+}
+
+func DoAppVersionAction(req *restful.Request, resp *restful.Response) {
+	var doActionRequest openpitrix.ActionRequest
+	err := req.ReadEntity(&doActionRequest)
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+	doActionRequest.Username = req.HeaderParameter(constants.UserNameHeader)
+
+	versionId := req.PathParameter("version")
+
+	err = openpitrix.DoAppVersionAction(versionId, &doActionRequest)
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.InvalidArgument {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(errors.None)
+}
+
+func GetAppVersionFiles(req *restful.Request, resp *restful.Response) {
+	versionId := req.PathParameter("version")
+	getAppVersionFilesRequest := &openpitrix.GetAppVersionFilesRequest{}
+	if f := req.QueryParameter("files"); f != "" {
+		getAppVersionFilesRequest.Files = strings.Split(f, ",")
+	}
+
+	result, err := openpitrix.GetAppVersionFiles(versionId, getAppVersionFilesRequest)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}
+
+func ListAppVersionAudits(req *restful.Request, resp *restful.Response) {
+	conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam))
+	orderBy := req.QueryParameter(params.OrderByParam)
+	limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam))
+	reverse := params.ParseReverse(req)
+	appId := req.PathParameter("app")
+	versionId := req.PathParameter("version")
+	if orderBy == "" {
+		orderBy = "status_time"
+		reverse = true
+	}
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+	conditions.Match["app"] = appId
+	if versionId != "" {
+		conditions.Match["version"] = versionId
+	}
+
+	result, err := openpitrix.ListAppVersionAudits(conditions, orderBy, reverse, limit, offset)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}
+
+func ListReviews(req *restful.Request, resp *restful.Response) {
+	conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam))
+	orderBy := req.QueryParameter(params.OrderByParam)
+	limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam))
+	reverse := params.ParseReverse(req)
+	if orderBy == "" {
+		orderBy = "status_time"
+		reverse = true
+	}
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	result, err := openpitrix.ListAppVersionReviews(conditions, orderBy, reverse, limit, offset)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}
+
+func ListAppVersions(req *restful.Request, resp *restful.Response) {
+	conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam))
+	orderBy := req.QueryParameter(params.OrderByParam)
+	limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam))
+	reverse := params.ParseReverse(req)
+	appId := req.PathParameter("app")
+	statistics, _ := strconv.ParseBool(req.QueryParameter("statistics"))
+	if orderBy == "" {
+		orderBy = "create_time"
+		reverse = true
+	}
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+	conditions.Match["app"] = appId
+
+	result, err := openpitrix.ListAppVersions(conditions, orderBy, reverse, limit, offset)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	if statistics {
+		for _, item := range result.Items {
+			if version, ok := item.(*openpitrix.AppVersion); ok {
+				statisticsResult, err := openpitrix.ListApplications(&params.Conditions{Match: map[string]string{"app_id": version.AppId, "version_id": version.VersionId}}, 0, 0)
+				if err != nil {
+					klog.Errorln(err)
+					resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+					return
+				}
+				version.ClusterTotal = &statisticsResult.TotalCount
+			}
+		}
+	}
+
+	resp.WriteEntity(result)
+}
+
+func ListApps(req *restful.Request, resp *restful.Response) {
+	conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam))
+	orderBy := req.QueryParameter(params.OrderByParam)
+	limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam))
+	reverse := params.ParseReverse(req)
+	statistics, _ := strconv.ParseBool(req.QueryParameter("statistics"))
+	if orderBy == "" {
+		orderBy = "create_time"
+		reverse = true
+	}
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	result, err := openpitrix.ListApps(conditions, orderBy, reverse, limit, offset)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	if statistics {
+		for _, item := range result.Items {
+			if app, ok := item.(*openpitrix.App); ok {
+				statisticsResult, err := openpitrix.ListApplications(&params.Conditions{Match: map[string]string{"app_id": app.AppId, "status": "active|used|enabled|stopped"}}, 0, 0)
+				if err != nil {
+					klog.Errorln(err)
+					resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+					return
+				}
+				app.ClusterTotal = &statisticsResult.TotalCount
+			}
+		}
+	}
+
+	resp.WriteEntity(result)
+}
+
+func ModifyApp(req *restful.Request, resp *restful.Response) {
+
+	var patchAppRequest openpitrix.ModifyAppRequest
+	err := req.ReadEntity(&patchAppRequest)
+	appId := req.PathParameter("app")
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	err = openpitrix.PatchApp(appId, &patchAppRequest)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.InvalidArgument {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(errors.None)
+}
+
+func DescribeApp(req *restful.Request, resp *restful.Response) {
+	appId := req.PathParameter("app")
+
+	result, err := openpitrix.DescribeApp(appId)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}
+
+func DeleteApp(req *restful.Request, resp *restful.Response) {
+	appId := req.PathParameter("app")
+
+	err := openpitrix.DeleteApp(appId)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(errors.None)
+}
+
+func CreateApp(req *restful.Request, resp *restful.Response) {
+	createAppRequest := &openpitrix.CreateAppRequest{}
+	err := req.ReadEntity(createAppRequest)
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	validate, _ := strconv.ParseBool(req.QueryParameter("validate"))
+
+	var result interface{}
+
+	if validate {
+		validatePackageRequest := &openpitrix.ValidatePackageRequest{
+			VersionPackage: createAppRequest.VersionPackage,
+			VersionType:    createAppRequest.VersionType,
+		}
+		result, err = openpitrix.ValidatePackage(validatePackageRequest)
+	} else {
+		result, err = openpitrix.CreateApp(createAppRequest)
+	}
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.InvalidArgument {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}
+
+func CreateAppVersion(req *restful.Request, resp *restful.Response) {
+	var createAppVersionRequest openpitrix.CreateAppVersionRequest
+	err := req.ReadEntity(&createAppVersionRequest)
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+	// override app id
+	appId := req.PathParameter("app")
+	createAppVersionRequest.AppId = appId
+
+	validate, _ := strconv.ParseBool(req.QueryParameter("validate"))
+
+	var result interface{}
+
+	if validate {
+		validatePackageRequest := &openpitrix.ValidatePackageRequest{
+			VersionPackage: createAppVersionRequest.Package,
+			VersionType:    createAppVersionRequest.Type,
+		}
+		result, err = openpitrix.ValidatePackage(validatePackageRequest)
+	} else {
+		result, err = openpitrix.CreateAppVersion(&createAppVersionRequest)
+	}
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.InvalidArgument {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}
+
+func ModifyAppVersion(req *restful.Request, resp *restful.Response) {
+
+	var patchAppVersionRequest openpitrix.ModifyAppVersionRequest
+	err := req.ReadEntity(&patchAppVersionRequest)
+	versionId := req.PathParameter("version")
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	err = openpitrix.PatchAppVersion(versionId, &patchAppVersionRequest)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.InvalidArgument {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(errors.None)
+}
+
+func DeleteAppVersion(req *restful.Request, resp *restful.Response) {
+	versionId := req.PathParameter("version")
+
+	err := openpitrix.DeleteAppVersion(versionId)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(errors.None)
+}
+
+func DescribeAppVersion(req *restful.Request, resp *restful.Response) {
+	versionId := req.PathParameter("version")
+
+	result, err := openpitrix.DescribeAppVersion(versionId)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}

pkg/apiserver/openpitrix/attachments.go

@@ -0,0 +1,54 @@
+/*
+ *
+ * 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 openpitrix
+
+import (
+	"github.com/emicklei/go-restful"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"kubesphere.io/kubesphere/pkg/models/openpitrix"
+	"kubesphere.io/kubesphere/pkg/server/errors"
+	"kubesphere.io/kubesphere/pkg/simple/client"
+	"net/http"
+)
+
+func DescribeAttachment(req *restful.Request, resp *restful.Response) {
+	attachmentId := req.PathParameter("attachment")
+	fileName := req.QueryParameter("filename")
+	result, err := openpitrix.DescribeAttachment(attachmentId)
+	// file raw
+	if fileName != "" {
+		data := result.AttachmentContent[fileName]
+		resp.Write(data)
+		resp.Header().Set("Content-Type", "text/plain")
+		return
+	}
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}

pkg/apiserver/openpitrix/categories.go

@@ -0,0 +1,171 @@
+/*
+ *
+ * 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 openpitrix
+
+import (
+	"github.com/emicklei/go-restful"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"k8s.io/klog"
+	"kubesphere.io/kubesphere/pkg/models/openpitrix"
+	"kubesphere.io/kubesphere/pkg/server/errors"
+	"kubesphere.io/kubesphere/pkg/server/params"
+	"kubesphere.io/kubesphere/pkg/simple/client"
+	"net/http"
+	"strconv"
+)
+
+func CreateCategory(req *restful.Request, resp *restful.Response) {
+	createCategoryRequest := &openpitrix.CreateCategoryRequest{}
+	err := req.ReadEntity(createCategoryRequest)
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	result, err := openpitrix.CreateCategory(createCategoryRequest)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+	if status.Code(err) == codes.InvalidArgument {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}
+func DeleteCategory(req *restful.Request, resp *restful.Response) {
+	categoryId := req.PathParameter("category")
+
+	err := openpitrix.DeleteCategory(categoryId)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(errors.None)
+}
+func ModifyCategory(req *restful.Request, resp *restful.Response) {
+	var modifyCategoryRequest openpitrix.ModifyCategoryRequest
+	categoryId := req.PathParameter("category")
+	err := req.ReadEntity(&modifyCategoryRequest)
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	err = openpitrix.PatchCategory(categoryId, &modifyCategoryRequest)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+	if status.Code(err) == codes.InvalidArgument {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(errors.None)
+}
+func DescribeCategory(req *restful.Request, resp *restful.Response) {
+	categoryId := req.PathParameter("category")
+
+	result, err := openpitrix.DescribeCategory(categoryId)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}
+func ListCategories(req *restful.Request, resp *restful.Response) {
+	conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam))
+	orderBy := req.QueryParameter(params.OrderByParam)
+	limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam))
+	reverse := params.ParseReverse(req)
+	if orderBy == "" {
+		orderBy = "create_time"
+		reverse = true
+	}
+	statistics, _ := strconv.ParseBool(req.QueryParameter("statistics"))
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	result, err := openpitrix.ListCategories(conditions, orderBy, reverse, limit, offset)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	if statistics {
+		for _, item := range result.Items {
+			if category, ok := item.(*openpitrix.Category); ok {
+				statisticsResult, err := openpitrix.ListApps(&params.Conditions{Match: map[string]string{"category_id": category.CategoryID, "status": "active"}}, "", false, 0, 0)
+				if err != nil {
+					klog.Errorln(err)
+					resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+					return
+				}
+				category.AppTotal = &statisticsResult.TotalCount
+			}
+		}
+	}
+
+	resp.WriteEntity(result)
+}

pkg/apiserver/openpitrix/repos.go

@@ -0,0 +1,222 @@
+/*
+ *
+ * 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 openpitrix
+
+import (
+	"github.com/emicklei/go-restful"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"k8s.io/klog"
+	"kubesphere.io/kubesphere/pkg/models/openpitrix"
+	"kubesphere.io/kubesphere/pkg/server/errors"
+	"kubesphere.io/kubesphere/pkg/server/params"
+	"kubesphere.io/kubesphere/pkg/simple/client"
+	"net/http"
+	"strconv"
+)
+
+func CreateRepo(req *restful.Request, resp *restful.Response) {
+	createRepoRequest := &openpitrix.CreateRepoRequest{}
+	err := req.ReadEntity(createRepoRequest)
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+	validate, _ := strconv.ParseBool(req.QueryParameter("validate"))
+
+	var result interface{}
+
+	if validate {
+		validateRepoRequest := &openpitrix.ValidateRepoRequest{
+			Type:       createRepoRequest.Type,
+			Url:        createRepoRequest.URL,
+			Credential: createRepoRequest.Credential,
+		}
+		result, err = openpitrix.ValidateRepo(validateRepoRequest)
+	} else {
+		result, err = openpitrix.CreateRepo(createRepoRequest)
+	}
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+	if status.Code(err) == codes.InvalidArgument {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}
+
+func DoRepoAction(req *restful.Request, resp *restful.Response) {
+	repoActionRequest := &openpitrix.RepoActionRequest{}
+	repoId := req.PathParameter("repo")
+	err := req.ReadEntity(repoActionRequest)
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	err = openpitrix.DoRepoAction(repoId, repoActionRequest)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+	if status.Code(err) == codes.InvalidArgument {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(errors.None)
+}
+
+func DeleteRepo(req *restful.Request, resp *restful.Response) {
+	repoId := req.PathParameter("repo")
+
+	err := openpitrix.DeleteRepo(repoId)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(errors.None)
+}
+
+func ModifyRepo(req *restful.Request, resp *restful.Response) {
+	var updateRepoRequest openpitrix.ModifyRepoRequest
+	repoId := req.PathParameter("repo")
+	err := req.ReadEntity(&updateRepoRequest)
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	err = openpitrix.PatchRepo(repoId, &updateRepoRequest)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+	if status.Code(err) == codes.InvalidArgument {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(errors.None)
+}
+
+func DescribeRepo(req *restful.Request, resp *restful.Response) {
+	repoId := req.PathParameter("repo")
+
+	result, err := openpitrix.DescribeRepo(repoId)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+	if status.Code(err) == codes.NotFound {
+		resp.WriteHeaderAndEntity(http.StatusNotFound, errors.Wrap(err))
+		return
+	}
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}
+func ListRepos(req *restful.Request, resp *restful.Response) {
+	conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam))
+	orderBy := req.QueryParameter(params.OrderByParam)
+	limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam))
+	reverse := params.ParseReverse(req)
+	if orderBy == "" {
+		orderBy = "create_time"
+		reverse = true
+	}
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	result, err := openpitrix.ListRepos(conditions, orderBy, reverse, limit, offset)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}
+
+func ListRepoEvents(req *restful.Request, resp *restful.Response) {
+	repoId := req.PathParameter("repo")
+	conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam))
+	limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam))
+
+	if err != nil {
+		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
+		return
+	}
+
+	result, err := openpitrix.ListRepoEvents(repoId, conditions, limit, offset)
+
+	if _, notEnabled := err.(client.ClientSetNotEnabledError); notEnabled {
+		resp.WriteHeaderAndEntity(http.StatusNotImplemented, errors.Wrap(err))
+		return
+	}
+
+	if err != nil {
+		klog.Errorln(err)
+		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	resp.WriteEntity(result)
+}

pkg/apiserver/resources/application.go

@@ -1,206 +0,0 @@
-/*
-
- 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 (
-	"fmt"
-	"github.com/emicklei/go-restful"
-	"k8s.io/api/core/v1"
-	"k8s.io/klog"
-	"kubesphere.io/kubesphere/pkg/constants"
-	"kubesphere.io/kubesphere/pkg/models"
-	"kubesphere.io/kubesphere/pkg/models/applications"
-	"kubesphere.io/kubesphere/pkg/models/resources"
-	"kubesphere.io/kubesphere/pkg/server/errors"
-	"kubesphere.io/kubesphere/pkg/server/params"
-	"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
-	"net/http"
-)
-
-func ListApplication(req *restful.Request, resp *restful.Response) {
-	limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam))
-	clusterId := req.QueryParameter("cluster_id")
-	runtimeId := req.QueryParameter("runtime_id")
-	conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam))
-	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 {
-			klog.Errorln("get application error", err)
-			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)
-
-}
-
-func ListNamespacedApplication(req *restful.Request, resp *restful.Response) {
-	limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam))
-	namespaceName := req.PathParameter("namespace")
-	clusterId := req.QueryParameter("cluster_id")
-	conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam))
-	if err != nil {
-		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
-		return
-	}
-	if len(clusterId) > 0 {
-		app, err := applications.GetApp(clusterId)
-		if err != nil {
-			klog.Errorln("get app failed", err)
-			resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
-			return
-		}
-		resp.WriteEntity(app)
-		return
-	}
-
-	namespace, err := resources.GetResource("", resources.Namespaces, namespaceName)
-
-	if err != nil {
-		klog.Errorln("get namespace failed", err)
-		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
-		return
-	}
-
-	var runtimeId string
-
-	if ns, ok := namespace.(*v1.Namespace); ok {
-		runtimeId = ns.Annotations[constants.OpenPitrixRuntimeAnnotationKey]
-	}
-
-	if runtimeId == "" {
-		klog.Errorln("runtime id not found")
-		resp.WriteAsJson(models.PageableResponse{Items: []interface{}{}, TotalCount: 0})
-		return
-	}
-
-	result, err := applications.ListApplication(runtimeId, conditions, limit, offset)
-
-	if err != nil {
-		klog.Errorln("list applications failed", err)
-		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
-		return
-	}
-
-	resp.WriteAsJson(result)
-}
-
-func DescribeApplication(req *restful.Request, resp *restful.Response) {
-	clusterId := req.PathParameter("application")
-	namespaceName := req.PathParameter("namespace")
-	app, err := applications.GetApp(clusterId)
-	if err != nil {
-		klog.Errorln("get app failed", err)
-		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
-		return
-	}
-	namespace, err := resources.GetResource("", resources.Namespaces, namespaceName)
-
-	if err != nil {
-		klog.Errorln("get namespace failed", err)
-		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
-		return
-	}
-
-	var runtimeId string
-
-	if ns, ok := namespace.(*v1.Namespace); ok {
-		runtimeId = ns.Annotations[constants.OpenPitrixRuntimeAnnotationKey]
-	}
-
-	if runtimeId != app.RuntimeId {
-		klog.Errorln("runtime not match", app.RuntimeId, runtimeId)
-		resp.WriteHeaderAndEntity(http.StatusForbidden, errors.New(fmt.Sprintf("rumtime not match %s,%s", app.RuntimeId, runtimeId)))
-		return
-	}
-
-	resp.WriteEntity(app)
-	return
-}
-
-func DeployApplication(req *restful.Request, resp *restful.Response) {
-	namespace := req.PathParameter("namespace")
-	var app openpitrix.CreateClusterRequest
-	err := req.ReadEntity(&app)
-	if err != nil {
-		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
-		return
-	}
-	err = applications.DeployApplication(namespace, app)
-	if err != nil {
-		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
-		return
-	}
-	resp.WriteEntity(errors.None)
-}
-
-func DeleteApplication(req *restful.Request, resp *restful.Response) {
-	clusterId := req.PathParameter("application")
-	namespaceName := req.PathParameter("namespace")
-	app, err := applications.GetApp(clusterId)
-	if err != nil {
-		klog.Errorln("get app failed", err)
-		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
-		return
-	}
-	namespace, err := resources.GetResource("", resources.Namespaces, namespaceName)
-
-	if err != nil {
-		klog.Errorln("get namespace failed", err)
-		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
-		return
-	}
-
-	var runtimeId string
-
-	if ns, ok := namespace.(*v1.Namespace); ok {
-		runtimeId = ns.Annotations[constants.OpenPitrixRuntimeAnnotationKey]
-	}
-
-	if runtimeId != app.RuntimeId {
-		klog.Errorln("runtime not match", app.RuntimeId, runtimeId)
-		resp.WriteHeaderAndEntity(http.StatusForbidden, errors.New(fmt.Sprintf("rumtime not match %s,%s", app.RuntimeId, runtimeId)))
-		return
-	}
-
-	err = applications.DeleteApplication(clusterId)
-
-	if err != nil {
-		klog.Errorln("delete application failed", err)
-		resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
-		return
-	}
-
-	resp.WriteEntity(errors.None)
-}

pkg/apiserver/runtime/runtime.go

@@ -31,10 +31,16 @@ var Container = restful.NewContainer()
 
 type ContainerBuilder []func(c *restful.Container) error
 
-//
+const MimeMergePatchJson = "application/merge-patch+json"
+const MimeJsonPatchJson = "application/json-patch+json"
+
+func init() {
+	restful.RegisterEntityAccessor(MimeMergePatchJson, restful.NewEntityAccessorJSON(restful.MIME_JSON))
+	restful.RegisterEntityAccessor(MimeJsonPatchJson, restful.NewEntityAccessorJSON(restful.MIME_JSON))
+}
+
 func NewWebService(gv schema.GroupVersion) *restful.WebService {
 	webservice := restful.WebService{}
-
 	webservice.Path(ApiRootPath + "/" + gv.String()).
 		Consumes(restful.MIME_JSON).
 		Produces(restful.MIME_JSON)