diff --git a/pkg/models/devops/project_handler.go b/pkg/models/devops/project_handler.go index f412c5f9b95d4524187ac362a31f6d5071813a9a..4dc6c7a67418efe092f5af98b513911e26d6a169 100644 --- a/pkg/models/devops/project_handler.go +++ b/pkg/models/devops/project_handler.go @@ -4,7 +4,7 @@ import ( "github.com/asaskevich/govalidator" "github.com/emicklei/go-restful" "github.com/gocraft/dbr" - "k8s.io/klog/glog" + "github.com/golang/glog" "kubesphere.io/kubesphere/pkg/db" "kubesphere.io/kubesphere/pkg/simple/client/devops_mysql" "net/http" diff --git a/pkg/models/devops/project_member_handler.go b/pkg/models/devops/project_member_handler.go index f1e7692551838a10f7624c9441aff82e4dbfab5f..cde8e0e1affafab0f7ac3ccf50305b88f420c0e9 100644 --- a/pkg/models/devops/project_member_handler.go +++ b/pkg/models/devops/project_member_handler.go @@ -7,7 +7,6 @@ import ( "github.com/emicklei/go-restful" "github.com/gocraft/dbr" "github.com/golang/glog" - "kubesphere.io/devops/pkg/utils/stringutils" "kubesphere.io/kubesphere/pkg/db" "kubesphere.io/kubesphere/pkg/gojenkins" "kubesphere.io/kubesphere/pkg/gojenkins/utils" @@ -121,7 +120,7 @@ func AddProjectMember(projectId, operator string, member *DevOpsProjectMembershi globalRole, err := jenkinsClinet.GetGlobalRole(JenkinsAllUserRoleName) if err != nil { 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 { _, err := jenkinsClinet.AddGlobalRole(JenkinsAllUserRoleName, gojenkins.GlobalPermissionIds{ @@ -129,33 +128,33 @@ func AddProjectMember(projectId, operator string, member *DevOpsProjectMembershi }, true) if err != nil { 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) if err != nil { 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)) if err != nil { 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) if err != nil { 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)) if err != nil { 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) if err != nil { 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) _, err = dbconn. @@ -187,43 +186,43 @@ func UpdateProjectMember(projectId, operator string, member *DevOpsProjectMember oldProjectRole, err := jenkinsClinet.GetProjectRole(GetProjectRoleName(projectId, oldMembership.Role)) if err != nil { 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) if err != nil { 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)) if err != nil { 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) if err != nil { 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)) if err != nil { 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) if err != nil { 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)) if err != nil { 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) if err != nil { 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). Set(DevOpsProjectMembershipRoleColumn, member.Role).