admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix comment

Browse Source 
Signed-off-by: runzexia <runzexia@yunify.com>
This commit is contained in:
runzexia
2019-09-02 12:58:47 +08:00
parent 93db1f982e
commit 003bba5b62
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/apis/tenant/v1alpha2/register.go
View File

@@ -136,7 +136,6 @@ func addWebService(c *restful.Container) error {
Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag})) Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag}))
ws.Route(ws.GET("/devopscount"). ws.Route(ws.GET("/devopscount").
To(tenant.GetDevOpsProjectsCount). To(tenant.GetDevOpsProjectsCount).
Param(ws.PathParameter("member", "workspace member's username")).
Returns(http.StatusOK, ok, struct { Returns(http.StatusOK, ok, struct {
Count uint32 `json:"count"` Count uint32 `json:"count"`
}{}). }{}).

3
pkg/apiserver/tenant/tenant.go
View File

@@ -24,6 +24,7 @@ import (
rbacv1 "k8s.io/api/rbac/v1" rbacv1 "k8s.io/api/rbac/v1"
k8serr "k8s.io/apimachinery/pkg/api/errors" k8serr "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/net"
"k8s.io/klog"
"kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
"kubesphere.io/kubesphere/pkg/apiserver/logging" "kubesphere.io/kubesphere/pkg/apiserver/logging"
"kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/constants"
@@ -249,7 +250,7 @@ func GetDevOpsProjectsCount(req *restful.Request, resp *restful.Response) {
result, err := tenant.GetDevOpsProjectsCount(username) result, err := tenant.GetDevOpsProjectsCount(username)
if err != nil { if err != nil {
glog.Errorf("%+v", err) klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp) errors.ParseSvcErr(err, resp)
return return
} }

4
pkg/models/tenant/devops.go
View File

@@ -113,9 +113,7 @@ func GetDevOpsProjectsCount(username string) (uint32, error) {
From(devops.DevOpsProjectTableName) From(devops.DevOpsProjectTableName)
var sqconditions []dbr.Builder var sqconditions []dbr.Builder
switch username { if username != devops.KS_ADMIN {
case devops.KS_ADMIN:
default:
onCondition := fmt.Sprintf("%s = %s", devops.DevOpsProjectMembershipProjectIdColumn, devops.DevOpsProjectIdColumn) onCondition := fmt.Sprintf("%s = %s", devops.DevOpsProjectMembershipProjectIdColumn, devops.DevOpsProjectIdColumn)
query.Join(devops.DevOpsProjectMembershipTableName, onCondition) query.Join(devops.DevOpsProjectMembershipTableName, onCondition)
sqconditions = append(sqconditions, db.Eq(devops.DevOpsProjectMembershipUsernameColumn, username)) sqconditions = append(sqconditions, db.Eq(devops.DevOpsProjectMembershipUsernameColumn, username))