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

Merge pull request #2161 from shaowenchen/fix_jenkin_basic

Browse Source 
fix jenkins basic auth
This commit is contained in:
KubeSphere CI Bot
2020-06-09 11:21:39 +08:00
committed by GitHub
parent dfed2a5afe e723038abc
commit 5993bdd654
9 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ type DevopsOperator interface {
GetSCMServers(scmId string, req *http.Request) ([]devops.SCMServer, error)
GetSCMOrg(scmId string, req *http.Request) ([]devops.SCMOrg, error)
GetOrgRepo(scmId, organizationId string, req *http.Request) ([]devops.OrgRepo, error)
GetOrgRepo(scmId, organizationId string, req *http.Request) (devops.OrgRepo, error)
CreateSCMServers(scmId string, req *http.Request) (*devops.SCMServer, error)
Validate(scmId string, req *http.Request) (*devops.Validates, error)
@@ -672,12 +672,12 @@ func (d devopsOperator) GetSCMOrg(scmId string, req *http.Request) ([]devops.SCM
return res, err
}
func (d devopsOperator) GetOrgRepo(scmId, organizationId string, req *http.Request) ([]devops.OrgRepo, error) {
func (d devopsOperator) GetOrgRepo(scmId, organizationId string, req *http.Request) (devops.OrgRepo, error) {
res, err := d.devopsClient.GetOrgRepo(scmId, organizationId, convertToHttpParameters(req))
if err != nil {
klog.Error(err)
return nil, err
return devops.OrgRepo{}, err
}
return res, err