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

fix goimport

Browse Source 
Signed-off-by: runzexia <runzexia@yunify.com>
This commit is contained in:
runzexia
2019-04-24 22:45:46 +08:00
parent 2ab1ab7b98
commit 6c928258c6
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/models/devops/project_handler.go
View File

@@ -4,7 +4,7 @@ import (
"github.com/asaskevich/govalidator" "github.com/asaskevich/govalidator"
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful"
"github.com/gocraft/dbr" "github.com/gocraft/dbr"
"k8s.io/klog/glog" "github.com/golang/glog"
"kubesphere.io/kubesphere/pkg/db" "kubesphere.io/kubesphere/pkg/db"
"kubesphere.io/kubesphere/pkg/simple/client/devops_mysql" "kubesphere.io/kubesphere/pkg/simple/client/devops_mysql"
"net/http" "net/http"

31
pkg/models/devops/project_member_handler.go
View File

@@ -7,7 +7,6 @@ import (
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful"
"github.com/gocraft/dbr" "github.com/gocraft/dbr"
"github.com/golang/glog" "github.com/golang/glog"
"kubesphere.io/devops/pkg/utils/stringutils"
"kubesphere.io/kubesphere/pkg/db" "kubesphere.io/kubesphere/pkg/db"
"kubesphere.io/kubesphere/pkg/gojenkins" "kubesphere.io/kubesphere/pkg/gojenkins"
"kubesphere.io/kubesphere/pkg/gojenkins/utils" "kubesphere.io/kubesphere/pkg/gojenkins/utils"
@@ -121,7 +120,7 @@ func AddProjectMember(projectId, operator string, member *DevOpsProjectMembershi
globalRole, err := jenkinsClinet.GetGlobalRole(JenkinsAllUserRoleName) globalRole, err := jenkinsClinet.GetGlobalRole(JenkinsAllUserRoleName)
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
if globalRole == nil { if globalRole == nil {
_, err := jenkinsClinet.AddGlobalRole(JenkinsAllUserRoleName, gojenkins.GlobalPermissionIds{ _, err := jenkinsClinet.AddGlobalRole(JenkinsAllUserRoleName, gojenkins.GlobalPermissionIds{
@@ -129,33 +128,33 @@ func AddProjectMember(projectId, operator string, member *DevOpsProjectMembershi
}, true) }, true)
if err != nil { if err != nil {
glog.Errorf("failed to create jenkins global role %+v", err) glog.Errorf("failed to create jenkins global role %+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
} }
err = globalRole.AssignRole(member.Username) err = globalRole.AssignRole(member.Username)
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
projectRole, err := jenkinsClinet.GetProjectRole(GetProjectRoleName(projectId, member.Role)) projectRole, err := jenkinsClinet.GetProjectRole(GetProjectRoleName(projectId, member.Role))
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
err = projectRole.AssignRole(member.Username) err = projectRole.AssignRole(member.Username)
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
pipelineRole, err := jenkinsClinet.GetProjectRole(GetPipelineRoleName(projectId, member.Role)) pipelineRole, err := jenkinsClinet.GetProjectRole(GetPipelineRoleName(projectId, member.Role))
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
err = pipelineRole.AssignRole(member.Username) err = pipelineRole.AssignRole(member.Username)
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
projectMembership := NewDevOpsProjectMemberShip(member.Username, projectId, member.Role, operator) projectMembership := NewDevOpsProjectMemberShip(member.Username, projectId, member.Role, operator)
_, err = dbconn. _, err = dbconn.
@@ -187,43 +186,43 @@ func UpdateProjectMember(projectId, operator string, member *DevOpsProjectMember
oldProjectRole, err := jenkinsClinet.GetProjectRole(GetProjectRoleName(projectId, oldMembership.Role)) oldProjectRole, err := jenkinsClinet.GetProjectRole(GetProjectRoleName(projectId, oldMembership.Role))
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
err = oldProjectRole.UnAssignRole(member.Username) err = oldProjectRole.UnAssignRole(member.Username)
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
oldPipelineRole, err := jenkinsClinet.GetProjectRole(GetPipelineRoleName(projectId, oldMembership.Role)) oldPipelineRole, err := jenkinsClinet.GetProjectRole(GetPipelineRoleName(projectId, oldMembership.Role))
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
err = oldPipelineRole.UnAssignRole(member.Username) err = oldPipelineRole.UnAssignRole(member.Username)
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
projectRole, err := jenkinsClinet.GetProjectRole(GetProjectRoleName(projectId, member.Role)) projectRole, err := jenkinsClinet.GetProjectRole(GetProjectRoleName(projectId, member.Role))
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
err = projectRole.AssignRole(member.Username) err = projectRole.AssignRole(member.Username)
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
pipelineRole, err := jenkinsClinet.GetProjectRole(GetPipelineRoleName(projectId, member.Role)) pipelineRole, err := jenkinsClinet.GetProjectRole(GetPipelineRoleName(projectId, member.Role))
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
err = pipelineRole.AssignRole(member.Username) err = pipelineRole.AssignRole(member.Username)
if err != nil { if err != nil {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(stringutils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
_, err = dbconn.Update(DevOpsProjectMembershipTableName). _, err = dbconn.Update(DevOpsProjectMembershipTableName).
Set(DevOpsProjectMembershipRoleColumn, member.Role). Set(DevOpsProjectMembershipRoleColumn, member.Role).