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

Merge pull request #798 from runzexia/fix-job-trigger-typo

Browse Source 
fix typo & regenerate swagger
This commit is contained in:
KubeSphere CI Bot
2019-09-26 19:01:56 +08:00
committed by GitHub
parent 24b0a97396 2f87ad7e2c
commit 49285bedd8
3 changed files with 22032 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22031
api/ks-openapi-spec/swagger.json
View File

File diff suppressed because one or more lines are too long

2
pkg/models/devops/project_pipeline.go
View File

@@ -83,7 +83,7 @@ type MultiBranchPipeline struct {
SingleSvnSource *SingleSvnSource `json:"single_svn_source,omitempty" description:"single branch svn scm define"` SingleSvnSource *SingleSvnSource `json:"single_svn_source,omitempty" description:"single branch svn scm define"`
BitbucketServerSource *BitbucketServerSource `json:"bitbucket_server_source,omitempty" description:"bitbucket server scm defile"` BitbucketServerSource *BitbucketServerSource `json:"bitbucket_server_source,omitempty" description:"bitbucket server scm defile"`
ScriptPath string `json:"script_path" mapstructure:"script_path" description:"script path in scm"` ScriptPath string `json:"script_path" mapstructure:"script_path" description:"script path in scm"`
MultiBranchJobTrigger *MultiBranchJobTrigger `json:"multibranch_job_triggeromitempty" mapstructure:"multibranch_job_trigger" description:"Pipeline tasks that need to be triggered when branch creation/deletion"` MultiBranchJobTrigger *MultiBranchJobTrigger `json:"multibranch_job_trigger,omitempty" mapstructure:"multibranch_job_trigger" description:"Pipeline tasks that need to be triggered when branch creation/deletion"`
} }
type GitSource struct { type GitSource struct {

2
tools/cmd/doc-gen/main.go
View File

@@ -107,7 +107,7 @@ func generateSwaggerJson() {
}, },
}) })
data, _ := json.Marshal(swagger) data, _ := json.MarshalIndent(swagger, "", " ")
err := ioutil.WriteFile(output, data, 420) err := ioutil.WriteFile(output, data, 420)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)