From 9cb4935b92f1b035c299925708665e8e0443c80b Mon Sep 17 00:00:00 2001 From: shaowenchen Date: Fri, 31 Jul 2020 18:00:15 +0800 Subject: [PATCH] add more details info for jenkins api Signed-off-by: shaowenchen --- pkg/simple/client/devops/jenkins/pipeline.go | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkg/simple/client/devops/jenkins/pipeline.go b/pkg/simple/client/devops/jenkins/pipeline.go index c18922bb9..dca2bac03 100644 --- a/pkg/simple/client/devops/jenkins/pipeline.go +++ b/pkg/simple/client/devops/jenkins/pipeline.go @@ -69,6 +69,7 @@ func (p *Pipeline) GetPipeline() (*devops.Pipeline, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var pipeline devops.Pipeline @@ -127,6 +128,7 @@ func (p *Pipeline) GetPipelineRun() (*devops.PipelineRun, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var pipelineRun devops.PipelineRun @@ -142,6 +144,7 @@ func (p *Pipeline) ListPipelineRuns() (*devops.PipelineRunList, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var pipelineRunList devops.PipelineRunList @@ -187,6 +190,7 @@ func (p *Pipeline) StopPipeline() (*devops.StopPipeline, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var stopPipeline devops.StopPipeline @@ -203,6 +207,7 @@ func (p *Pipeline) ReplayPipeline() (*devops.ReplayPipeline, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var replayPipeline devops.ReplayPipeline @@ -219,6 +224,7 @@ func (p *Pipeline) RunPipeline() (*devops.RunPipeline, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var runPipeline devops.RunPipeline @@ -235,6 +241,7 @@ func (p *Pipeline) GetArtifacts() ([]devops.Artifacts, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var artifacts []devops.Artifacts @@ -285,6 +292,7 @@ func (p *Pipeline) GetPipelineRunNodes() ([]devops.PipelineRunNodes, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var pipelineRunNodes []devops.PipelineRunNodes @@ -310,6 +318,7 @@ func (p *Pipeline) GetBranchPipeline() (*devops.BranchPipeline, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var branchPipeline devops.BranchPipeline err = json.Unmarshal(res, &branchPipeline) @@ -325,6 +334,7 @@ func (p *Pipeline) GetBranchPipelineRun() (*devops.PipelineRun, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var branchPipelineRun devops.PipelineRun err = json.Unmarshal(res, &branchPipelineRun) @@ -340,6 +350,7 @@ func (p *Pipeline) StopBranchPipeline() (*devops.StopPipeline, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var branchStopPipeline devops.StopPipeline err = json.Unmarshal(res, &branchStopPipeline) @@ -355,6 +366,7 @@ func (p *Pipeline) ReplayBranchPipeline() (*devops.ReplayPipeline, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var branchReplayPipeline devops.ReplayPipeline err = json.Unmarshal(res, &branchReplayPipeline) @@ -370,6 +382,7 @@ func (p *Pipeline) RunBranchPipeline() (*devops.RunPipeline, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var branchRunPipeline devops.RunPipeline err = json.Unmarshal(res, &branchRunPipeline) @@ -385,6 +398,7 @@ func (p *Pipeline) GetBranchArtifacts() ([]devops.Artifacts, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var artifacts []devops.Artifacts @@ -419,6 +433,7 @@ func (p *Pipeline) GetBranchNodeSteps() ([]devops.NodeSteps, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var branchNodeSteps []devops.NodeSteps err = json.Unmarshal(res, &branchNodeSteps) @@ -434,6 +449,7 @@ func (p *Pipeline) GetBranchPipelineRunNodes() ([]devops.BranchPipelineRunNodes, res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var branchPipelineRunNodes []devops.BranchPipelineRunNodes err = json.Unmarshal(res, &branchPipelineRunNodes) @@ -458,6 +474,7 @@ func (p *Pipeline) GetPipelineBranch() (*devops.PipelineBranch, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var pipelineBranch devops.PipelineBranch err = json.Unmarshal(res, &pipelineBranch) @@ -491,6 +508,7 @@ func (p *Pipeline) GetCrumb() (*devops.Crumb, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var crumb devops.Crumb err = json.Unmarshal(res, &crumb) @@ -506,6 +524,7 @@ func (p *Pipeline) GetSCMServers() ([]devops.SCMServer, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var SCMServer []devops.SCMServer err = json.Unmarshal(res, &SCMServer) @@ -521,6 +540,7 @@ func (p *Pipeline) GetSCMOrg() ([]devops.SCMOrg, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var SCMOrg []devops.SCMOrg err = json.Unmarshal(res, &SCMOrg) @@ -536,6 +556,7 @@ func (p *Pipeline) GetOrgRepo() (devops.OrgRepo, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return devops.OrgRepo{}, err } var OrgRepo devops.OrgRepo err = json.Unmarshal(res, &OrgRepo) @@ -551,6 +572,7 @@ func (p *Pipeline) CreateSCMServers() (*devops.SCMServer, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var SCMServer devops.SCMServer err = json.Unmarshal(res, &SCMServer) @@ -584,6 +606,7 @@ func (p *Pipeline) Validate() (*devops.Validates, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var validates devops.Validates @@ -600,6 +623,7 @@ func (p *Pipeline) CheckScriptCompile() (*devops.CheckScript, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } // Jenkins will return different struct according to different results. @@ -702,6 +726,7 @@ func (p *Pipeline) ToJenkinsfile() (*devops.ResJenkinsfile, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var jenkinsfile devops.ResJenkinsfile @@ -718,6 +743,7 @@ func (p *Pipeline) ToJson() (*devops.ResJson, error) { res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) + return nil, err } var toJson devops.ResJson