refactor: pluginstaller scm related info

Signed-off-by: Meng JiaFeng <jiafeng.meng@merico.dev>
devstream-io · Oct 17, 2022 · 442dcad · 442dcad
1 parent 845e66d
commit 442dcad
Show file tree

Hide file tree

Showing 53 changed files with 1,324 additions and 704 deletions.
diff --git a/internal/pkg/plugin/gitlabci/gilabci.go b/internal/pkg/plugin/gitlabci/gilabci.go
@@ -2,14 +2,14 @@ package gitlabci
 
 import (
 	"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci"
-	"github.com/devstream-io/devstream/internal/pkg/plugininstaller/common"
+	"github.com/devstream-io/devstream/pkg/util/scm"
 )
 
 var DefaultCIOptions = &ci.Options{
 	CIConfig: &ci.CIConfig{
 		Type: "gitlab",
 	},
-	ProjectRepo: &common.Repo{
+	ProjectRepo: &scm.Repo{
 		RepoType: "gitlab",
 	},
 }
diff --git a/internal/pkg/plugin/gitlabci/golang/golang.go b/internal/pkg/plugin/gitlabci/golang/golang.go
@@ -4,6 +4,7 @@ import (
 	"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
 	"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci"
 	"github.com/devstream-io/devstream/pkg/util/scm/gitlab"
+	"github.com/devstream-io/devstream/pkg/util/types"
 )
 
 func setCIContent(options plugininstaller.RawOptions) (plugininstaller.RawOptions, error) {
@@ -26,5 +27,5 @@ func setCIContent(options plugininstaller.RawOptions) (plugininstaller.RawOption
 	}
 	ciConfig.SetContent(ciContent)
 	opts.CIConfig = ciConfig
-	return opts.Encode()
+	return types.EncodeStruct(opts)
 }
diff --git a/internal/pkg/plugin/jenkinspipeline/create.go b/internal/pkg/plugin/jenkinspipeline/create.go
@@ -17,7 +17,7 @@ func Create(options map[string]interface{}) (map[string]interface{}, error) {
 		ExecuteOperations: plugininstaller.ExecuteOperations{
 			jenkins.PreInstall,
 			jenkins.CreateOrUpdateJob,
-			jenkins.ConfigRepo,
+			jenkins.CreateRepoWebhook,
 			ci.PushCIFiles,
 		},
 		GetStateOperation: jenkins.GetStatus,

diff --git a/internal/pkg/plugin/reposcaffolding/create.go b/internal/pkg/plugin/reposcaffolding/create.go
@@ -11,7 +11,6 @@ func Create(options map[string]interface{}) (map[string]interface{}, error) {
 	operator := &plugininstaller.Operator{
 		PreExecuteOperations: plugininstaller.PreExecuteOperations{
 			reposcaffolding.Validate,
-			reposcaffolding.SetDefaultTemplateRepo,
 		},
 		ExecuteOperations: plugininstaller.ExecuteOperations{
 			reposcaffolding.InstallRepo,

diff --git a/internal/pkg/plugin/reposcaffolding/delete.go b/internal/pkg/plugin/reposcaffolding/delete.go
@@ -10,7 +10,6 @@ func Delete(options map[string]interface{}) (bool, error) {
 	operator := &plugininstaller.Operator{
 		PreExecuteOperations: plugininstaller.PreExecuteOperations{
 			reposcaffolding.Validate,
-			reposcaffolding.SetDefaultTemplateRepo,
 		},
 		ExecuteOperations: plugininstaller.ExecuteOperations{
 			reposcaffolding.DeleteRepo,

diff --git a/internal/pkg/plugin/reposcaffolding/read.go b/internal/pkg/plugin/reposcaffolding/read.go
@@ -10,7 +10,6 @@ func Read(options map[string]interface{}) (map[string]interface{}, error) {
 	operator := &plugininstaller.Operator{
 		PreExecuteOperations: plugininstaller.PreExecuteOperations{
 			reposcaffolding.Validate,
-			reposcaffolding.SetDefaultTemplateRepo,
 		},
 		GetStateOperation: reposcaffolding.GetDynamicState,
 	}

diff --git a/internal/pkg/plugin/reposcaffolding/update.go b/internal/pkg/plugin/reposcaffolding/update.go
@@ -10,7 +10,6 @@ func Update(options map[string]interface{}) (map[string]interface{}, error) {
 	operator := &plugininstaller.Operator{
 		PreExecuteOperations: plugininstaller.PreExecuteOperations{
 			reposcaffolding.Validate,
-			reposcaffolding.SetDefaultTemplateRepo,
 		},
 		ExecuteOperations: plugininstaller.ExecuteOperations{
 			reposcaffolding.DeleteRepo,

diff --git a/internal/pkg/plugininstaller/ci/option.go b/internal/pkg/plugininstaller/ci/option.go
@@ -4,13 +4,13 @@ import (
 	"github.com/mitchellh/mapstructure"
 
 	"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
-	"github.com/devstream-io/devstream/internal/pkg/plugininstaller/common"
+	"github.com/devstream-io/devstream/pkg/util/scm"
 	"github.com/devstream-io/devstream/pkg/util/types"
 )
 
 type Options struct {
-	CIConfig    *CIConfig    `mapstructure:"ci" validate:"required"`
-	ProjectRepo *common.Repo `mapstructure:"projectRepo" validate:"required"`
+	CIConfig    *CIConfig `mapstructure:"ci" validate:"required"`
+	ProjectRepo *scm.Repo `mapstructure:"projectRepo" validate:"required"`
 }
 
 func NewOptions(options plugininstaller.RawOptions) (*Options, error) {
@@ -22,7 +22,7 @@ func NewOptions(options plugininstaller.RawOptions) (*Options, error) {
 }
 
 // FillDefaultValue config options default values by input defaultOptions
-func (opts *Options) FillDefaultValue(defaultOptions *Options) {
+func (opts *Options) fillDefaultValue(defaultOptions *Options) {
 	if opts.CIConfig == nil {
 		opts.CIConfig = defaultOptions.CIConfig
 	} else {
@@ -34,11 +34,3 @@ func (opts *Options) FillDefaultValue(defaultOptions *Options) {
 		types.FillStructDefaultValue(opts.ProjectRepo, defaultOptions.ProjectRepo)
 	}
 }
-
-func (opts *Options) Encode() (map[string]interface{}, error) {
-	var options map[string]interface{}
-	if err := mapstructure.Decode(opts, &options); err != nil {
-		return nil, err
-	}
-	return options, nil
-}
diff --git a/internal/pkg/plugininstaller/ci/option_test.go b/internal/pkg/plugininstaller/ci/option_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
 	"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci/server"
-	"github.com/devstream-io/devstream/internal/pkg/plugininstaller/common"
+	"github.com/devstream-io/devstream/pkg/util/scm"
 )
 
 var _ = Describe("Options struct", func() {
@@ -20,7 +20,7 @@ var _ = Describe("Options struct", func() {
 			Type:           "github",
 			ConfigLocation: "http://www.test.com",
 		}
-		defaultRepo := &common.Repo{
+		defaultRepo := &scm.Repo{
 			Owner:    "test",
 			Repo:     "test_repo",
 			Branch:   "test_branch",
@@ -49,10 +49,10 @@ var _ = Describe("Options struct", func() {
 		})
 	})
 
-	Context("FillDefaultValue method", func() {
+	Context("fillDefaultValue method", func() {
 		When("ci config and repo are all empty", func() {
 			It("should set default value", func() {
-				opts.FillDefaultValue(defaultOpts)
+				opts.fillDefaultValue(defaultOpts)
 				Expect(opts.CIConfig).ShouldNot(BeNil())
 				Expect(opts.ProjectRepo).ShouldNot(BeNil())
 				Expect(opts.CIConfig.ConfigLocation).Should(Equal("http://www.test.com"))
@@ -64,12 +64,12 @@ var _ = Describe("Options struct", func() {
 				opts.CIConfig = &CIConfig{
 					ConfigLocation: "http://exist.com",
 				}
-				opts.ProjectRepo = &common.Repo{
+				opts.ProjectRepo = &scm.Repo{
 					Branch: "new_branch",
 				}
 			})
 			It("should update empty value", func() {
-				opts.FillDefaultValue(defaultOpts)
+				opts.fillDefaultValue(defaultOpts)
 				Expect(opts.CIConfig).ShouldNot(BeNil())
 				Expect(opts.ProjectRepo).ShouldNot(BeNil())
 				Expect(opts.CIConfig.ConfigLocation).Should(Equal("http://exist.com"))
@@ -79,11 +79,4 @@ var _ = Describe("Options struct", func() {
 			})
 		})
 	})
-
-	Context("Encode method", func() {
-		It("should return map", func() {
-			_, err := opts.Encode()
-			Expect(err).Error().ShouldNot(HaveOccurred())
-		})
-	})
 })
diff --git a/internal/pkg/plugininstaller/ci/validate.go b/internal/pkg/plugininstaller/ci/validate.go
@@ -2,6 +2,7 @@ package ci
 
 import (
 	"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
+	"github.com/devstream-io/devstream/pkg/util/types"
 	"github.com/devstream-io/devstream/pkg/util/validator"
 )
 
@@ -25,7 +26,7 @@ func SetDefaultConfig(defaultConfig *Options) plugininstaller.MutableOperation {
 		if err != nil {
 			return nil, err
 		}
-		opts.FillDefaultValue(defaultConfig)
-		return opts.Encode()
+		opts.fillDefaultValue(defaultConfig)
+		return types.EncodeStruct(opts)
 	}
 }
diff --git a/internal/pkg/plugininstaller/ci/validate_test.go b/internal/pkg/plugininstaller/ci/validate_test.go
@@ -5,7 +5,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci"
-	"github.com/devstream-io/devstream/internal/pkg/plugininstaller/common"
+	"github.com/devstream-io/devstream/pkg/util/scm"
 )
 
 var _ = Describe("Validate func", func() {
@@ -75,7 +75,7 @@ var _ = Describe("SetDefaultConfig func", func() {
 			Type:           "github",
 			ConfigLocation: "http://www.test.com",
 		}
-		defaultRepo := &common.Repo{
+		defaultRepo := &scm.Repo{
 			Owner:    "test",
 			Repo:     "test_repo",
 			Branch:   "test_branch",

diff --git a/internal/pkg/plugininstaller/common/repo.go b/internal/pkg/plugininstaller/common/repo.go