Merge branch 'master' into s2ibin-upload

Signed-off-by: runzexia <runzexia@yunify.com>

# Conflicts:
#	vendor/modules.txt

pkg/apiserver/devops/devops.go

@@ -141,6 +141,32 @@ func GetStepLog(req *restful.Request, resp *restful.Response) {
 	resp.Write(res)
 }
 
+func GetSCMServers(req *restful.Request, resp *restful.Response) {
+	scmId := req.PathParameter("scm")
+
+	res, err := devops.GetSCMServers(scmId, req.Request)
+	if err != nil {
+		parseErr(err, resp)
+		return
+	}
+
+	resp.Header().Set(restful.HEADER_ContentType, restful.MIME_JSON)
+	resp.Write(res)
+}
+
+func CreateSCMServers(req *restful.Request, resp *restful.Response) {
+	scmId := req.PathParameter("scm")
+
+	res, err := devops.CreateSCMServers(scmId, req.Request)
+	if err != nil {
+		parseErr(err, resp)
+		return
+	}
+
+	resp.Header().Set(restful.HEADER_ContentType, restful.MIME_JSON)
+	resp.Write(res)
+}
+
 func Validate(req *restful.Request, resp *restful.Response) {
 	scmId := req.PathParameter("scm")
 

pkg/apiserver/tenant/tenant.go

@@ -24,6 +24,7 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	k8serr "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/util/net"
+	"k8s.io/klog"
 	"kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
 	"kubesphere.io/kubesphere/pkg/apiserver/logging"
 	"kubesphere.io/kubesphere/pkg/constants"
@@ -244,6 +245,19 @@ func ListDevopsProjects(req *restful.Request, resp *restful.Response) {
 	resp.WriteAsJson(result)
 }
 
+func GetDevOpsProjectsCount(req *restful.Request, resp *restful.Response) {
+	username := req.HeaderParameter(constants.UserNameHeader)
+
+	result, err := tenant.GetDevOpsProjectsCount(username)
+	if err != nil {
+		klog.Errorf("%+v", err)
+		errors.ParseSvcErr(err, resp)
+		return
+	}
+	resp.WriteAsJson(struct {
+		Count uint32 `json:"count"`
+	}{Count: result})
+}
 func DeleteDevopsProject(req *restful.Request, resp *restful.Response) {
 	projectId := req.PathParameter("devops")
 	workspaceName := req.PathParameter("workspace")