From 52c6f5f4792594927c4131c519378ed210d76344 Mon Sep 17 00:00:00 2001 From: rick Date: Tue, 24 Nov 2020 13:54:35 +0800 Subject: [PATCH] Use camel case style according to review comments Signed-off-by: rick --- pkg/apis/devops/v1alpha3/pipeline_types.go | 12 +++++----- .../devops/jenkins/pipeline_internal.go | 24 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkg/apis/devops/v1alpha3/pipeline_types.go b/pkg/apis/devops/v1alpha3/pipeline_types.go index 198a3d23d..61478d2af 100644 --- a/pkg/apis/devops/v1alpha3/pipeline_types.go +++ b/pkg/apis/devops/v1alpha3/pipeline_types.go @@ -82,12 +82,12 @@ const ( ) const ( - SourceType_SVN = "svn" - SourceType_Git = "git" - SourceType_SingleSVN = "single_svn" - SourceType_Gitlab = "gitlab" - SourceType_Github = "github" - SourceType_Bitbucket = "bitbucket_server" + SourceTypeSVN = "svn" + SourceTypeGit = "git" + SourceTypeSingleSVN = "single_svn" + SourceTypeGitlab = "gitlab" + SourceTypeGithub = "github" + SourceTypeBitbucket = "bitbucket_server" ) type NoScmPipeline struct { diff --git a/pkg/simple/client/devops/jenkins/pipeline_internal.go b/pkg/simple/client/devops/jenkins/pipeline_internal.go index 30722324d..ebe500707 100644 --- a/pkg/simple/client/devops/jenkins/pipeline_internal.go +++ b/pkg/simple/client/devops/jenkins/pipeline_internal.go @@ -813,17 +813,17 @@ func createMultiBranchPipelineConfigXml(projectName string, pipeline *devopsv1al source := branchSource.CreateElement("source") switch pipeline.SourceType { - case "git": + case devopsv1alpha3.SourceTypeGit: appendGitSourceToEtree(source, pipeline.GitSource) - case "github": + case devopsv1alpha3.SourceTypeGithub: appendGithubSourceToEtree(source, pipeline.GitHubSource) - case "gitlab": + case devopsv1alpha3.SourceTypeGitlab: internal.AppendGitlabSourceToEtree(source, pipeline.GitlabSource) - case "svn": + case devopsv1alpha3.SourceTypeSVN: appendSvnSourceToEtree(source, pipeline.SvnSource) - case "single_svn": + case devopsv1alpha3.SourceTypeSingleSVN: appendSingleSvnSourceToEtree(source, pipeline.SingleSvnSource) - case "bitbucket_server": + case devopsv1alpha3.SourceTypeBitbucket: appendBitbucketServerSourceToEtree(source, pipeline.BitbucketServerSource) default: @@ -884,24 +884,24 @@ func parseMultiBranchPipelineConfigXml(config string) (*devopsv1alpha3.MultiBran switch source.SelectAttr("class").Value { case "org.jenkinsci.plugins.github_branch_source.GitHubSCMSource": pipeline.GitHubSource = getGithubSourcefromEtree(source) - pipeline.SourceType = devopsv1alpha3.SourceType_Github + pipeline.SourceType = devopsv1alpha3.SourceTypeGithub case "com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSource": pipeline.BitbucketServerSource = getBitbucketServerSourceFromEtree(source) - pipeline.SourceType = devopsv1alpha3.SourceType_Bitbucket + pipeline.SourceType = devopsv1alpha3.SourceTypeBitbucket case "io.jenkins.plugins.gitlabbranchsource.GitLabSCMSource": pipeline.GitlabSource = internal.GetGitlabSourceFromEtree(source) - pipeline.SourceType = devopsv1alpha3.SourceType_Gitlab + pipeline.SourceType = devopsv1alpha3.SourceTypeGitlab case "jenkins.plugins.git.GitSCMSource": - pipeline.SourceType = devopsv1alpha3.SourceType_Git + pipeline.SourceType = devopsv1alpha3.SourceTypeGit pipeline.GitSource = getGitSourcefromEtree(source) case "jenkins.scm.impl.SingleSCMSource": - pipeline.SourceType = devopsv1alpha3.SourceType_SingleSVN + pipeline.SourceType = devopsv1alpha3.SourceTypeSingleSVN pipeline.SingleSvnSource = getSingleSvnSourceFromEtree(source) case "jenkins.scm.impl.subversion.SubversionSCMSource": - pipeline.SourceType = devopsv1alpha3.SourceType_SVN + pipeline.SourceType = devopsv1alpha3.SourceTypeSVN pipeline.SvnSource = getSvnSourcefromEtree(source) } }