From 003bba5b62846720ee80953620319784d9a311a6 Mon Sep 17 00:00:00 2001 From: runzexia Date: Mon, 2 Sep 2019 12:58:47 +0800 Subject: [PATCH] fix comment Signed-off-by: runzexia --- pkg/apis/tenant/v1alpha2/register.go | 1 - pkg/apiserver/tenant/tenant.go | 3 ++- pkg/models/tenant/devops.go | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/apis/tenant/v1alpha2/register.go b/pkg/apis/tenant/v1alpha2/register.go index f9dfab8a5..379897c56 100644 --- a/pkg/apis/tenant/v1alpha2/register.go +++ b/pkg/apis/tenant/v1alpha2/register.go @@ -136,7 +136,6 @@ func addWebService(c *restful.Container) error { Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag})) ws.Route(ws.GET("/devopscount"). To(tenant.GetDevOpsProjectsCount). - Param(ws.PathParameter("member", "workspace member's username")). Returns(http.StatusOK, ok, struct { Count uint32 `json:"count"` }{}). diff --git a/pkg/apiserver/tenant/tenant.go b/pkg/apiserver/tenant/tenant.go index c4f5fb8ef..23557d075 100644 --- a/pkg/apiserver/tenant/tenant.go +++ b/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" @@ -249,7 +250,7 @@ func GetDevOpsProjectsCount(req *restful.Request, resp *restful.Response) { result, err := tenant.GetDevOpsProjectsCount(username) if err != nil { - glog.Errorf("%+v", err) + klog.Errorf("%+v", err) errors.ParseSvcErr(err, resp) return } diff --git a/pkg/models/tenant/devops.go b/pkg/models/tenant/devops.go index 90b2e048d..ba287e326 100644 --- a/pkg/models/tenant/devops.go +++ b/pkg/models/tenant/devops.go @@ -113,9 +113,7 @@ func GetDevOpsProjectsCount(username string) (uint32, error) { From(devops.DevOpsProjectTableName) var sqconditions []dbr.Builder - switch username { - case devops.KS_ADMIN: - default: + if username != devops.KS_ADMIN { onCondition := fmt.Sprintf("%s = %s", devops.DevOpsProjectMembershipProjectIdColumn, devops.DevOpsProjectIdColumn) query.Join(devops.DevOpsProjectMembershipTableName, onCondition) sqconditions = append(sqconditions, db.Eq(devops.DevOpsProjectMembershipUsernameColumn, username))