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

Fix fields missing when convert Jenkinsfile to JSON

Browse Source 
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
This commit is contained in:
rick
2021-03-25 17:49:28 +08:00
parent 46e064870e
commit a545effee9
6 changed files with 19 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/simple/client/devops/jenkins/jenkins.go
View File

@@ -872,7 +872,7 @@ func (j *Jenkins) ToJenkinsfile(httpParameters *devops.HttpParameters) (*devops.
return res, err
}
func (j *Jenkins) ToJson(httpParameters *devops.HttpParameters) (*devops.ResJson, error) {
func (j *Jenkins) ToJson(httpParameters *devops.HttpParameters) (map[string]interface{}, error) {
PipelineOjb := &Pipeline{
HttpParameters: httpParameters,
Jenkins: j,

19
pkg/simple/client/devops/jenkins/pipeline.go
View File

@@ -856,19 +856,10 @@ func (p *Pipeline) ToJenkinsfile() (*devops.ResJenkinsfile, error) {
return &jenkinsfile, err
}
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
func (p *Pipeline) ToJson() (result map[string]interface{}, err error) {
var data []byte
if data, err = p.Jenkins.SendPureRequest(p.Path, p.HttpParameters); err == nil {
err = json.Unmarshal(data, &result)
}
var toJson devops.ResJson
err = json.Unmarshal(res, &toJson)
if err != nil {
klog.Error(err)
return nil, err
}
return &toJson, err
return
}