Merge pull request #2161 from shaowenchen/fix_jenkin_basic

fix jenkins basic auth
This commit is contained in:
KubeSphere CI Bot
2020-06-09 11:21:39 +08:00
committed by GitHub
9 changed files with 45 additions and 21 deletions

View File

@@ -532,8 +532,8 @@ func AddPipelineToWebService(webservice *restful.WebService, devopsClient devops
Param(webservice.QueryParameter("pageSize", "the item count of one page.").
Required(true).
DataFormat("pageSize=%d")).
Returns(http.StatusOK, RespOK, []devops.OrgRepo{}).
Writes([]devops.OrgRepo{}))
Returns(http.StatusOK, RespOK, devops.OrgRepo{}).
Writes(devops.OrgRepo{}))
// match "/blue/rest/organizations/jenkins/scm/%s/servers/" create bitbucket server
webservice.Route(webservice.POST("/scms/{scm}/servers").

View File

@@ -269,11 +269,10 @@ func (r *resourceHandler) handleUpdateRouter(request *restful.Request, response
}
func (r *resourceHandler) handleVerifyGitCredential(request *restful.Request, response *restful.Response) {
var credential api.GitCredential
err := request.ReadEntity(&credential)
if err != nil {
api.HandleBadRequest(response, nil, err)
response.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
return
}
var namespace, secretName string
@@ -283,11 +282,10 @@ func (r *resourceHandler) handleVerifyGitCredential(request *restful.Request, re
}
err = r.gitVerifier.VerifyGitCredential(credential.RemoteUrl, namespace, secretName)
if err != nil {
api.HandleBadRequest(response, nil, err)
response.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
return
}
response.WriteHeader(http.StatusOK)
response.WriteAsJson(errors.None)
}
func (r *resourceHandler) handleVerifyRegistryCredential(request *restful.Request, response *restful.Response) {