Merge pull request #42 from littlebeer2100/components

Components

pkg/apis/v1alpha/components/components_handler.go

@@ -0,0 +1,47 @@
+/*
+Copyright 2018 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 components
+
+import (
+	"github.com/emicklei/go-restful"
+	"kubesphere.io/kubesphere/pkg/filter/route"
+	"kubesphere.io/kubesphere/pkg/models"
+	"net/http"
+	"kubesphere.io/kubesphere/pkg/constants"
+)
+
+func Register(ws *restful.WebService, subPath string) {
+	ws.Route(ws.GET(subPath).To(handleGetComponents).Filter(route.RouteLogging)).
+		Consumes(restful.MIME_JSON, restful.MIME_XML).
+		Produces(restful.MIME_JSON)
+
+}
+
+//get all components
+
+func handleGetComponents(request *restful.Request, response *restful.Response) {
+
+	result, err := models.GetComponents()
+
+	if err != nil {
+
+		response.WriteHeaderAndEntity(http.StatusInternalServerError, constants.MessageResponse{Message: err.Error()})
+	}
+
+	response.WriteAsJson(result)
+
+}

pkg/apis/v1alpha/install.go

@@ -27,6 +27,7 @@ import (
 	"kubesphere.io/kubesphere/pkg/apis/v1alpha/storage"
 	"kubesphere.io/kubesphere/pkg/apis/v1alpha/volumes"
 	"kubesphere.io/kubesphere/pkg/apis/v1alpha/iam"
+	"kubesphere.io/kubesphere/pkg/apis/v1alpha/components"
 )
 
 func init() {
@@ -43,6 +44,7 @@ func init() {
 	pods.Register(ws)
 	containers.Register(ws)
 	iam.Register(ws)
+	components.Register(ws,"/components")
 	// add webservice to default container
 	restful.Add(ws)
 

pkg/apis/v1alpha/registries/registries_handler.go

@@ -21,6 +21,7 @@ import (
 	"kubesphere.io/kubesphere/pkg/models"
 	"kubesphere.io/kubesphere/pkg/filter/route"
 	"net/http"
+	"kubesphere.io/kubesphere/pkg/constants"
 )
 
 func Register(ws *restful.WebService, subPath string) {
@@ -39,7 +40,7 @@ func handlerRegistryValidation(request *restful.Request, response *restful.Respo
 
 	if err != nil {
 
-		response.WriteError(http.StatusInternalServerError, err)
+		response.WriteHeaderAndEntity(http.StatusInternalServerError, constants.MessageResponse{Message: err.Error()})
 
 	}