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

1. change glog to klog

Browse Source 
2. move types to api package to avoid cyclic import
This commit is contained in:
Jeff
2019-09-16 12:46:53 +08:00
committed by zryfish
parent 79735c4543
commit 97c9a1786a
109 changed files with 1076 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apiserver/devops/devops.go
View File

@@ -20,7 +20,7 @@ package devops
import (
"encoding/json"
"github.com/emicklei/go-restful"
log "github.com/golang/glog"
log "k8s.io/klog"
"kubesphere.io/kubesphere/pkg/models/devops"
"net/http"
"strings"

40
pkg/apiserver/devops/member.go
View File

@@ -17,11 +17,11 @@ import (
"fmt"
"github.com/asaskevich/govalidator"
"github.com/emicklei/go-restful"
"github.com/golang/glog"
"k8s.io/klog"
"kubesphere.io/kubesphere/pkg/constants"
"kubesphere.io/kubesphere/pkg/errors"
"kubesphere.io/kubesphere/pkg/models/devops"
"kubesphere.io/kubesphere/pkg/params"
"kubesphere.io/kubesphere/pkg/server/errors"
"kubesphere.io/kubesphere/pkg/server/params"
"kubesphere.io/kubesphere/pkg/utils/reflectutils"
"net/http"
)
@@ -33,7 +33,7 @@ func GetDevOpsProjectMembersHandler(request *restful.Request, resp *restful.Resp
err := devops.CheckProjectUserInRole(username, projectId, devops.AllRoleSlice)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
@@ -45,7 +45,7 @@ func GetDevOpsProjectMembersHandler(request *restful.Request, resp *restful.Resp
project, err := devops.GetProjectMembers(projectId, conditions, orderBy, reverse, limit, offset)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -62,14 +62,14 @@ func GetDevOpsProjectMemberHandler(request *restful.Request, resp *restful.Respo
err := devops.CheckProjectUserInRole(username, projectId, devops.AllRoleSlice)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
project, err := devops.GetProjectMember(projectId, member)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -85,34 +85,34 @@ func AddDevOpsProjectMemberHandler(request *restful.Request, resp *restful.Respo
member := &devops.DevOpsProjectMembership{}
err := request.ReadEntity(&member)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp)
return
}
if govalidator.IsNull(member.Username) {
err := fmt.Errorf("error need username")
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp)
return
}
if !reflectutils.In(member.Role, devops.AllRoleSlice) {
err := fmt.Errorf("err role [%s] not in [%s]", member.Role,
devops.AllRoleSlice)
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp)
return
}
err = devops.CheckProjectUserInRole(username, projectId, []string{devops.ProjectOwner})
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
project, err := devops.AddProjectMember(projectId, username, member)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -128,41 +128,41 @@ func UpdateDevOpsProjectMemberHandler(request *restful.Request, resp *restful.Re
member := &devops.DevOpsProjectMembership{}
err := request.ReadEntity(&member)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp)
return
}
member.Username = request.PathParameter("member")
if govalidator.IsNull(member.Username) {
err := fmt.Errorf("error need username")
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp)
return
}
if username == member.Username {
err := fmt.Errorf("you can not change your role")
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp)
return
}
if !reflectutils.In(member.Role, devops.AllRoleSlice) {
err := fmt.Errorf("err role [%s] not in [%s]", member.Role,
devops.AllRoleSlice)
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp)
return
}
err = devops.CheckProjectUserInRole(username, projectId, []string{devops.ProjectOwner})
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
project, err := devops.UpdateProjectMember(projectId, username, member)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -179,13 +179,13 @@ func DeleteDevOpsProjectMemberHandler(request *restful.Request, resp *restful.Re
err := devops.CheckProjectUserInRole(username, projectId, []string{devops.ProjectOwner})
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
username, err = devops.DeleteProjectMember(projectId, member)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}

18
pkg/apiserver/devops/project.go
View File

@@ -15,11 +15,11 @@ package devops
import (
"github.com/emicklei/go-restful"
"github.com/golang/glog"
"k8s.io/klog"
"kubesphere.io/kubesphere/pkg/api/devops/v1alpha2"
"kubesphere.io/kubesphere/pkg/constants"
"kubesphere.io/kubesphere/pkg/errors"
"kubesphere.io/kubesphere/pkg/models/devops"
"kubesphere.io/kubesphere/pkg/server/errors"
"net/http"
)
@@ -30,14 +30,14 @@ func GetDevOpsProjectHandler(request *restful.Request, resp *restful.Response) {
err := devops.CheckProjectUserInRole(username, projectId, devops.AllRoleSlice)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
project, err := devops.GetProject(projectId)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -50,24 +50,24 @@ func UpdateProjectHandler(request *restful.Request, resp *restful.Response) {
projectId := request.PathParameter("devops")
username := request.HeaderParameter(constants.UserNameHeader)
var project *devops.DevOpsProject
var project *v1alpha2.DevOpsProject
err := request.ReadEntity(&project)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp)
return
}
project.ProjectId = projectId
err = devops.CheckProjectUserInRole(username, projectId, []string{devops.ProjectOwner})
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
project, err = devops.UpdateProject(project)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}

30
pkg/apiserver/devops/project_credential.go
View File

@@ -15,10 +15,10 @@ package devops
import (
"github.com/emicklei/go-restful"
"github.com/golang/glog"
"k8s.io/klog"
"kubesphere.io/kubesphere/pkg/constants"
"kubesphere.io/kubesphere/pkg/errors"
"kubesphere.io/kubesphere/pkg/models/devops"
"kubesphere.io/kubesphere/pkg/server/errors"
"net/http"
)
@@ -29,20 +29,20 @@ func CreateDevOpsProjectCredentialHandler(request *restful.Request, resp *restfu
var credential *devops.JenkinsCredential
err := request.ReadEntity(&credential)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp)
return
}
err = devops.CheckProjectUserInRole(username, projectId, []string{devops.ProjectOwner, devops.ProjectMaintainer})
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
credentialId, err := devops.CreateProjectCredential(projectId, username, credential)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -61,20 +61,20 @@ func UpdateDevOpsProjectCredentialHandler(request *restful.Request, resp *restfu
var credential *devops.JenkinsCredential
err := request.ReadEntity(&credential)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp)
return
}
err = devops.CheckProjectUserInRole(username, projectId, []string{devops.ProjectOwner, devops.ProjectMaintainer})
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
credentialId, err = devops.UpdateProjectCredential(projectId, credentialId, credential)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -93,20 +93,20 @@ func DeleteDevOpsProjectCredentialHandler(request *restful.Request, resp *restfu
var credential *devops.JenkinsCredential
err := request.ReadEntity(&credential)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp)
return
}
err = devops.CheckProjectUserInRole(username, projectId, []string{devops.ProjectOwner, devops.ProjectMaintainer})
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
credentialId, err = devops.DeleteProjectCredential(projectId, credentialId, credential)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -127,14 +127,14 @@ func GetDevOpsProjectCredentialHandler(request *restful.Request, resp *restful.R
err := devops.CheckProjectUserInRole(username, projectId, []string{devops.ProjectOwner, devops.ProjectMaintainer})
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
response, err := devops.GetProjectCredential(projectId, credentialId, domain, getContent)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -150,13 +150,13 @@ func GetDevOpsProjectCredentialsHandler(request *restful.Request, resp *restful.
err := devops.CheckProjectUserInRole(username, projectId, []string{devops.ProjectOwner, devops.ProjectMaintainer})
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
jenkinsCredentials, err := devops.GetProjectCredentials(projectId, domain)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}

32
pkg/apiserver/devops/project_pipeline.go
View File

@@ -15,10 +15,10 @@ package devops
import (
"github.com/emicklei/go-restful"
"github.com/golang/glog"
"k8s.io/klog"
"kubesphere.io/kubesphere/pkg/constants"
"kubesphere.io/kubesphere/pkg/errors"
"kubesphere.io/kubesphere/pkg/models/devops"
"kubesphere.io/kubesphere/pkg/server/errors"
"net/http"
)
@@ -29,20 +29,20 @@ func CreateDevOpsProjectPipelineHandler(request *restful.Request, resp *restful.
var pipeline *devops.ProjectPipeline
err := request.ReadEntity(&pipeline)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp)
return
}
err = devops.CheckProjectUserInRole(username, projectId, []string{devops.ProjectOwner, devops.ProjectMaintainer})
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
pipelineName, err := devops.CreateProjectPipeline(projectId, pipeline)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -60,14 +60,14 @@ func DeleteDevOpsProjectPipelineHandler(request *restful.Request, resp *restful.
err := devops.CheckProjectUserInRole(username, projectId, []string{devops.ProjectOwner, devops.ProjectMaintainer})
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
pipelineName, err := devops.DeleteProjectPipeline(projectId, pipelineId)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -86,20 +86,20 @@ func UpdateDevOpsProjectPipelineHandler(request *restful.Request, resp *restful.
var pipeline *devops.ProjectPipeline
err := request.ReadEntity(&pipeline)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp)
return
}
err = devops.CheckProjectUserInRole(username, projectId, []string{devops.ProjectOwner, devops.ProjectMaintainer})
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
pipelineName, err := devops.UpdateProjectPipeline(projectId, pipelineId, pipeline)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -118,14 +118,14 @@ func GetDevOpsProjectPipelineHandler(request *restful.Request, resp *restful.Res
err := devops.CheckProjectUserInRole(username, projectId, []string{devops.ProjectOwner, devops.ProjectMaintainer})
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
pipeline, err := devops.GetProjectPipeline(projectId, pipelineId)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -140,13 +140,13 @@ func GetPipelineSonarStatusHandler(request *restful.Request, resp *restful.Respo
pipelineId := request.PathParameter("pipeline")
err := devops.CheckProjectUserInRole(username, projectId, devops.AllRoleSlice)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
sonarStatus, err := devops.GetPipelineSonar(projectId, pipelineId)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}
@@ -160,13 +160,13 @@ func GetMultiBranchesPipelineSonarStatusHandler(request *restful.Request, resp *
branchId := request.PathParameter("branch")
err := devops.CheckProjectUserInRole(username, projectId, devops.AllRoleSlice)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(restful.NewError(http.StatusForbidden, err.Error()), resp)
return
}
sonarStatus, err := devops.GetMultiBranchPipelineSonar(projectId, pipelineId, branchId)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}

2
pkg/apiserver/devops/s2ibinary.go
View File

@@ -5,8 +5,8 @@ import (
"fmt"
"github.com/emicklei/go-restful"
"k8s.io/klog"
"kubesphere.io/kubesphere/pkg/errors"
"kubesphere.io/kubesphere/pkg/models/devops"
"kubesphere.io/kubesphere/pkg/server/errors"
"kubesphere.io/kubesphere/pkg/utils/hashutil"
"net/http"
)