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

Use camel case style according to review comments

Browse Source 
Signed-off-by: rick <rick@jenkins-zh.cn>
This commit is contained in:
rick
2020-11-24 13:54:35 +08:00
parent 573dab2208
commit 52c6f5f479
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/apis/devops/v1alpha3/pipeline_types.go
View File

@@ -82,12 +82,12 @@ const (
) )
const ( const (
SourceType_SVN = "svn" SourceTypeSVN = "svn"
SourceType_Git = "git" SourceTypeGit = "git"
SourceType_SingleSVN = "single_svn" SourceTypeSingleSVN = "single_svn"
SourceType_Gitlab = "gitlab" SourceTypeGitlab = "gitlab"
SourceType_Github = "github" SourceTypeGithub = "github"
SourceType_Bitbucket = "bitbucket_server" SourceTypeBitbucket = "bitbucket_server"
) )
type NoScmPipeline struct { type NoScmPipeline struct {

24
pkg/simple/client/devops/jenkins/pipeline_internal.go
View File

@@ -813,17 +813,17 @@ func createMultiBranchPipelineConfigXml(projectName string, pipeline *devopsv1al
source := branchSource.CreateElement("source") source := branchSource.CreateElement("source")
switch pipeline.SourceType { switch pipeline.SourceType {
case "git": case devopsv1alpha3.SourceTypeGit:
appendGitSourceToEtree(source, pipeline.GitSource) appendGitSourceToEtree(source, pipeline.GitSource)
case "github": case devopsv1alpha3.SourceTypeGithub:
appendGithubSourceToEtree(source, pipeline.GitHubSource) appendGithubSourceToEtree(source, pipeline.GitHubSource)
case "gitlab": case devopsv1alpha3.SourceTypeGitlab:
internal.AppendGitlabSourceToEtree(source, pipeline.GitlabSource) internal.AppendGitlabSourceToEtree(source, pipeline.GitlabSource)
case "svn": case devopsv1alpha3.SourceTypeSVN:
appendSvnSourceToEtree(source, pipeline.SvnSource) appendSvnSourceToEtree(source, pipeline.SvnSource)
case "single_svn": case devopsv1alpha3.SourceTypeSingleSVN:
appendSingleSvnSourceToEtree(source, pipeline.SingleSvnSource) appendSingleSvnSourceToEtree(source, pipeline.SingleSvnSource)
case "bitbucket_server": case devopsv1alpha3.SourceTypeBitbucket:
appendBitbucketServerSourceToEtree(source, pipeline.BitbucketServerSource) appendBitbucketServerSourceToEtree(source, pipeline.BitbucketServerSource)
default: default:
@@ -884,24 +884,24 @@ func parseMultiBranchPipelineConfigXml(config string) (*devopsv1alpha3.MultiBran
switch source.SelectAttr("class").Value { switch source.SelectAttr("class").Value {
case "org.jenkinsci.plugins.github_branch_source.GitHubSCMSource": case "org.jenkinsci.plugins.github_branch_source.GitHubSCMSource":
pipeline.GitHubSource = getGithubSourcefromEtree(source) pipeline.GitHubSource = getGithubSourcefromEtree(source)
pipeline.SourceType = devopsv1alpha3.SourceType_Github pipeline.SourceType = devopsv1alpha3.SourceTypeGithub
case "com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSource": case "com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSource":
pipeline.BitbucketServerSource = getBitbucketServerSourceFromEtree(source) pipeline.BitbucketServerSource = getBitbucketServerSourceFromEtree(source)
pipeline.SourceType = devopsv1alpha3.SourceType_Bitbucket pipeline.SourceType = devopsv1alpha3.SourceTypeBitbucket
case "io.jenkins.plugins.gitlabbranchsource.GitLabSCMSource": case "io.jenkins.plugins.gitlabbranchsource.GitLabSCMSource":
pipeline.GitlabSource = internal.GetGitlabSourceFromEtree(source) pipeline.GitlabSource = internal.GetGitlabSourceFromEtree(source)
pipeline.SourceType = devopsv1alpha3.SourceType_Gitlab pipeline.SourceType = devopsv1alpha3.SourceTypeGitlab
case "jenkins.plugins.git.GitSCMSource": case "jenkins.plugins.git.GitSCMSource":
pipeline.SourceType = devopsv1alpha3.SourceType_Git pipeline.SourceType = devopsv1alpha3.SourceTypeGit
pipeline.GitSource = getGitSourcefromEtree(source) pipeline.GitSource = getGitSourcefromEtree(source)
case "jenkins.scm.impl.SingleSCMSource": case "jenkins.scm.impl.SingleSCMSource":
pipeline.SourceType = devopsv1alpha3.SourceType_SingleSVN pipeline.SourceType = devopsv1alpha3.SourceTypeSingleSVN
pipeline.SingleSvnSource = getSingleSvnSourceFromEtree(source) pipeline.SingleSvnSource = getSingleSvnSourceFromEtree(source)
case "jenkins.scm.impl.subversion.SubversionSCMSource": case "jenkins.scm.impl.subversion.SubversionSCMSource":
pipeline.SourceType = devopsv1alpha3.SourceType_SVN pipeline.SourceType = devopsv1alpha3.SourceTypeSVN
pipeline.SvnSource = getSvnSourcefromEtree(source) pipeline.SvnSource = getSvnSourcefromEtree(source)
} }
} }