diff --git a/pkg/apis/devops/v1alpha2/register.go b/pkg/apis/devops/v1alpha2/register.go index 665b67269fe1b9f429c0d9b1732c2b96a54f0331..4cb4c4cdfffb4b763708b2de8261e351afda9609 100644 --- a/pkg/apis/devops/v1alpha2/register.go +++ b/pkg/apis/devops/v1alpha2/register.go @@ -204,7 +204,6 @@ func addWebService(c *restful.Container) error { Metadata(restfulspec.KeyOpenAPITags, tags). Param(webservice.PathParameter("devops", "devops project's Id")). Param(webservice.PathParameter("credentials", "credential's Id")). - Param(webservice.QueryParameter("domain", "credential's domain")). Param(webservice.QueryParameter("content", "get additional content")). Returns(http.StatusOK, RespOK, devops.JenkinsCredential{}). Reads(devops.JenkinsCredential{})) @@ -214,8 +213,6 @@ func addWebService(c *restful.Container) error { Doc("Get project credential pipeline"). Metadata(restfulspec.KeyOpenAPITags, tags). Param(webservice.PathParameter("devops", "devops project's Id")). - Param(webservice.PathParameter("credentials", "credential's Id")). - Param(webservice.QueryParameter("domain", "credential's domain")). Returns(http.StatusOK, RespOK, []devops.JenkinsCredential{}). Reads([]devops.JenkinsCredential{})) @@ -754,7 +751,7 @@ func addWebService(c *restful.Container) error { webservice.Route(webservice.POST("/devops/notifycommit"). To(devopsapi.PostNotifyCommit). Metadata(restfulspec.KeyOpenAPITags, tags). - Doc("Get notify commit by HTTP POST method."). + Doc("Get notification commit by HTTP POST method."). Consumes("application/json"). Produces("text/plain; charset=utf-8"). Param(webservice.QueryParameter("url", "url of git scm"). diff --git a/pkg/models/devops/json.go b/pkg/models/devops/json.go index 0d351dc7c2c773f3ed371534b015042d5170be5e..2ef6eae9e110101a604236fc38fe462e01e8f60e 100644 --- a/pkg/models/devops/json.go +++ b/pkg/models/devops/json.go @@ -1025,9 +1025,9 @@ type ReqJson struct { // ToJenkinsfile response type ResJenkinsfile struct { - Status string `json:"status,omitempty" description:"status"` + Status string `json:"status,omitempty" description:"status e.g. ok"` Data struct { - Result string `json:"result,omitempty" description:"result"` + Result string `json:"result,omitempty" description:"result e.g. success"` Jenkinsfile string `json:"jenkinsfile,omitempty" description:"jenkinsfile"` Errors []struct { Location []string `json:"location,omitempty" description:"err location"` @@ -1041,9 +1041,9 @@ type ReqJenkinsfile struct { } type ResJson struct { - Status string `json:"status,omitempty" description:"status"` + Status string `json:"status,omitempty" description:"status e.g. ok"` Data struct { - Result string `json:"result,omitempty" description:"result"` + Result string `json:"result,omitempty" description:"result e.g. success"` JSON struct { Pipeline struct { Stages []interface{} `json:"stages,omitempty" description:"stages"` diff --git a/pkg/models/devops/membership.go b/pkg/models/devops/membership.go index 9e9234cd6a4f7521693d46db65cb99c51ad1878f..ba211c75f613fa48008c373fc8378b62a52524c9 100644 --- a/pkg/models/devops/membership.go +++ b/pkg/models/devops/membership.go @@ -24,7 +24,7 @@ type DevOpsProjectMembership struct { Username string `json:"username" description:"member's username,username can uniquely identify a user"` ProjectId string `json:"project_id" db:"project_id" description:"the devops projects which project membership belongs to"` Role string `json:"role" description:"devops project membership's role type. e.g. owner '"` - Status string `json:"status" description:"Desperated, status of project membership"` + Status string `json:"status" description:"Desperated, status of project membership. e.g. active "` GrantBy string `json:"grand_by,omitempty" description:"Username of the user who assigned the role"` } diff --git a/pkg/models/devops/project_handler.go b/pkg/models/devops/project_handler.go index 575afdaf5439a71aff85cf8cf08b94bf1f4bccb1..d2639d2567bfa964517a7fe10b379eee726dfe64 100644 --- a/pkg/models/devops/project_handler.go +++ b/pkg/models/devops/project_handler.go @@ -52,7 +52,7 @@ func UpdateProject(project *DevOpsProject) (*DevOpsProject, error) { query.Set(DevOpsProjectExtraColumn, project.Extra) } if !govalidator.IsNull(project.Name) { - query.Set(DevOpsProjectNameColumn, project.Extra) + query.Set(DevOpsProjectNameColumn, project.Name) } if len(query.UpdateStmt.Value) > 0 { _, err := query.