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-12 14:07:37 +08:00
parent 17f9b0879f
commit f0ab59f75b
1 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
pkg/models/devops/devops.go
View File

@@ -26,10 +26,9 @@ import (
"github.com/emicklei/go-restful"
"io"
"io/ioutil"
"k8s.io/klog"
"kubesphere.io/kubesphere/pkg/models"
log "k8s.io/klog"
"k8s.io/klog"
cs "kubesphere.io/kubesphere/pkg/simple/client"
"net/http"
"net/url"
@@ -53,7 +52,7 @@ func GetPipeline(projectName, pipelineName string, req *http.Request) ([]byte, e
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -191,7 +190,7 @@ func GetBranchPipelineRun(projectName, pipelineName, branchName, runId string, r
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -205,11 +204,11 @@ func GetPipelineRunNodesbyBranch(projectName, pipelineName, branchName, runId st
}
baseUrl := fmt.Sprintf(devops.Jenkins().Server+GetBranchPipeRunNodesUrl+req.URL.RawQuery, projectName, pipelineName, branchName, runId)
log.Info("Jenkins-url: " + baseUrl)
klog.V(4).Info("Jenkins-url: " + baseUrl)
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -226,7 +225,7 @@ func GetBranchStepLog(projectName, pipelineName, branchName, runId, nodeId, step
resBody, header, err := jenkinsClient(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, nil, err
}
@@ -243,7 +242,7 @@ func GetStepLog(projectName, pipelineName, runId, nodeId, stepId string, req *ht
resBody, header, err := jenkinsClient(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, nil, err
}
@@ -260,7 +259,7 @@ func GetSCMServers(scmId string, req *http.Request) ([]byte, error) {
req.Method = http.MethodGet
resBody, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
return resBody, err
@@ -274,19 +273,19 @@ func CreateSCMServers(scmId string, req *http.Request) ([]byte, error) {
requestBody, err := ioutil.ReadAll(req.Body)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
createReq := &CreateScmServerReq{}
err = json.Unmarshal(requestBody, createReq)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
req.Body = nil
byteServers, err := GetSCMServers(scmId, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -304,7 +303,7 @@ func CreateSCMServers(scmId string, req *http.Request) ([]byte, error) {
req.Method = http.MethodPost
resBody, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
return resBody, err
@@ -321,7 +320,7 @@ func Validate(scmId string, req *http.Request) ([]byte, error) {
req.Method = http.MethodPut
resBody, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -338,7 +337,7 @@ func GetSCMOrg(scmId string, req *http.Request) ([]byte, error) {
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -355,7 +354,7 @@ func GetOrgRepo(scmId, organizationId string, req *http.Request) ([]byte, error)
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -373,7 +372,7 @@ func StopBranchPipeline(projectName, pipelineName, branchName, runId string, req
req.Method = http.MethodPut
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -391,7 +390,7 @@ func StopPipeline(projectName, pipelineName, runId string, req *http.Request) ([
req.Method = http.MethodPut
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -408,7 +407,7 @@ func ReplayBranchPipeline(projectName, pipelineName, branchName, runId string, r
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -425,7 +424,7 @@ func ReplayPipeline(projectName, pipelineName, runId string, req *http.Request)
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -442,7 +441,7 @@ func GetBranchRunLog(projectName, pipelineName, branchName, runId string, req *h
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -459,7 +458,7 @@ func GetRunLog(projectName, pipelineName, runId string, req *http.Request) ([]by
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -476,7 +475,7 @@ func GetBranchArtifacts(projectName, pipelineName, branchName, runId string, req
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -493,7 +492,7 @@ func GetArtifacts(projectName, pipelineName, runId string, req *http.Request) ([
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -510,7 +509,7 @@ func GetPipeBranch(projectName, pipelineName string, req *http.Request) ([]byte,
res, err := sendJenkinsRequest(baseUrl+req.URL.RawQuery, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -527,13 +526,13 @@ func SubmitBranchInputStep(projectName, pipelineName, branchName, runId, nodeId,
newBody, err := getInputReqBody(req.Body)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
req.Body = newBody
resBody, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -550,13 +549,13 @@ func SubmitInputStep(projectName, pipelineName, runId, nodeId, stepId string, re
newBody, err := getInputReqBody(req.Body)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
req.Body = newBody
resBody, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -574,7 +573,7 @@ func getInputReqBody(reqBody io.ReadCloser) (newReqBody io.ReadCloser, err error
Body, err := ioutil.ReadAll(reqBody)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -612,7 +611,7 @@ func GetConsoleLog(projectName, pipelineName string, req *http.Request) ([]byte,
resBody, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -629,7 +628,7 @@ func ScanBranch(projectName, pipelineName string, req *http.Request) ([]byte, er
resBody, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -646,7 +645,7 @@ func RunBranchPipeline(projectName, pipelineName, branchName string, req *http.R
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -662,7 +661,7 @@ func RunPipeline(projectName, pipelineName string, req *http.Request) ([]byte, e
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -679,7 +678,7 @@ func GetCrumb(req *http.Request) ([]byte, error) {
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -696,7 +695,7 @@ func CheckScriptCompile(projectName, pipelineName string, req *http.Request) ([]
resBody, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -728,7 +727,7 @@ func CheckCron(projectName string, req *http.Request) (*CheckCronRes, error) {
newUrl, err := url.Parse(baseUrl)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
newUrl.RawQuery = newUrl.Query().Encode()
@@ -751,14 +750,14 @@ func CheckCron(projectName string, req *http.Request) (*CheckCronRes, error) {
}, err
}
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
defer resp.Body.Close()
doc, err := goquery.NewDocumentFromReader(resp.Body)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
doc.Find("div").Each(func(i int, selection *goquery.Selection) {
@@ -768,7 +767,7 @@ func CheckCron(projectName string, req *http.Request) (*CheckCronRes, error) {
if res.Result == "ok" {
res.LastTime, res.NextTime, err = parseCronJobTime(res.Message)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
}
@@ -784,7 +783,7 @@ func parseCronJobTime(msg string) (string, string, error) {
lastTime := strings.SplitN(lastTmp[1], " UTC", 2)
lastUinx, err := time.Parse(cronJobLayout, lastTime[0])
if err != nil {
log.Error(err)
klog.Error(err)
return "", "", err
}
last := lastUinx.Format(time.RFC3339)
@@ -793,7 +792,7 @@ func parseCronJobTime(msg string) (string, string, error) {
nextTime := strings.SplitN(nextTmp[2], " UTC", 2)
nextUinx, err := time.Parse(cronJobLayout, nextTime[0])
if err != nil {
log.Error(err)
klog.Error(err)
return "", "", err
}
next := nextUinx.Format(time.RFC3339)
@@ -811,7 +810,7 @@ func GetPipelineRun(projectName, pipelineName, runId string, req *http.Request)
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -828,7 +827,7 @@ func GetBranchPipeline(projectName, pipelineName, branchName string, req *http.R
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -845,7 +844,7 @@ func GetPipelineRunNodes(projectName, pipelineName, runId string, req *http.Requ
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -862,7 +861,7 @@ func GetBranchNodeSteps(projectName, pipelineName, branchName, runId, nodeId str
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -879,7 +878,7 @@ func GetNodeSteps(projectName, pipelineName, runId, nodeId string, req *http.Req
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -896,7 +895,7 @@ func ToJenkinsfile(req *http.Request) ([]byte, error) {
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -913,7 +912,7 @@ func ToJson(req *http.Request) ([]byte, error) {
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -931,7 +930,7 @@ func GetNotifyCommit(req *http.Request) ([]byte, error) {
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -948,7 +947,7 @@ func GithubWebhook(req *http.Request) ([]byte, error) {
res, err := sendJenkinsRequest(baseUrl, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -962,12 +961,12 @@ func GetBranchNodesDetail(projectName, pipelineName, branchName, runId string, r
respNodes, err := GetPipelineRunNodesbyBranch(projectName, pipelineName, branchName, runId, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
err = json.Unmarshal(respNodes, &nodesDetails)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -978,7 +977,7 @@ func GetBranchNodesDetail(projectName, pipelineName, branchName, runId string, r
var steps []NodeSteps
respSteps, err := GetBranchNodeSteps(projectName, pipelineName, branchName, runId, nodeId, req)
if err != nil {
log.Error(err)
klog.Error(err)
return
}
err = json.Unmarshal(respSteps, &steps)
@@ -1007,12 +1006,12 @@ func GetNodesDetail(projectName, pipelineName, runId string, req *http.Request)
respNodes, err := GetPipelineRunNodes(projectName, pipelineName, runId, req)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
err = json.Unmarshal(respNodes, &nodesDetails)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
@@ -1023,7 +1022,7 @@ func GetNodesDetail(projectName, pipelineName, runId string, req *http.Request)
var steps []NodeSteps
respSteps, err := GetNodeSteps(projectName, pipelineName, runId, nodeId, req)
if err != nil {
log.Error(err)
klog.Error(err)
return
}
err = json.Unmarshal(respSteps, &steps)
@@ -1054,7 +1053,7 @@ func sendJenkinsRequest(baseUrl string, req *http.Request) ([]byte, error) {
func jenkinsClient(baseUrl string, req *http.Request) ([]byte, http.Header, error) {
newReqUrl, err := url.Parse(baseUrl)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, nil, err
}
@@ -1071,7 +1070,7 @@ func jenkinsClient(baseUrl string, req *http.Request) ([]byte, http.Header, erro
resp, err := client.Do(newRequest)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, nil, err
}
@@ -1079,7 +1078,7 @@ func jenkinsClient(baseUrl string, req *http.Request) ([]byte, http.Header, erro
defer resp.Body.Close()
if resp.StatusCode >= http.StatusBadRequest {
log.Errorf("%+v", string(resBody))
klog.Errorf("%+v", string(resBody))
jkerr := new(JkError)
jkerr.Code = resp.StatusCode
jkerr.Message = string(resBody)
@@ -1100,7 +1099,7 @@ func getRespBody(resp *http.Response) ([]byte, error) {
}
resBody, err := ioutil.ReadAll(reader)
if err != nil {
log.Error(err)
klog.Error(err)
return nil, err
}
return resBody, err