Skip to content

Commit 03decb1

Browse files
authored
Merge pull request #1234 from merico-dev/feat-github-action-languages
refactor: use more general ci config
2 parents c21608c + fdf0b38 commit 03decb1

22 files changed

Lines changed: 178 additions & 152 deletions

File tree

internal/pkg/plugin/githubactions/general/create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func Create(options map[string]interface{}) (map[string]interface{}, error) {
1212
// Initialize Operator with Operations
1313
operator := &plugininstaller.Operator{
1414
PreExecuteOperations: plugininstaller.PreExecuteOperations{
15-
ci.SetSCMDefault,
15+
ci.SetDefault(ciType),
1616
validate,
1717
},
1818
ExecuteOperations: plugininstaller.ExecuteOperations{

internal/pkg/plugin/githubactions/general/delete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ func Delete(options map[string]interface{}) (bool, error) {
1111
// Initialize Operator with Operations
1212
operator := &plugininstaller.Operator{
1313
PreExecuteOperations: plugininstaller.PreExecuteOperations{
14-
ci.SetSCMDefault,
14+
ci.SetDefault(ciType),
1515
validate,
1616
},
1717
ExecuteOperations: plugininstaller.ExecuteOperations{

internal/pkg/plugin/githubactions/general/githubactions.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@ package general
33
import (
44
"github.com/devstream-io/devstream/internal/pkg/configmanager"
55
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci"
6+
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci/cifile/server"
67
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci/step"
78
"github.com/devstream-io/devstream/pkg/util/log"
89
"github.com/devstream-io/devstream/pkg/util/scm"
910
)
1011

12+
var ciType = server.CIGithubType
13+
1114
func preConfigGithub(options configmanager.RawOptions) error {
1215
opts, err := ci.NewCIOptions(options)
1316
if err != nil {

internal/pkg/plugin/githubactions/general/read.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func Read(options map[string]interface{}) (map[string]interface{}, error) {
1212
// Initialize Operator with Operations
1313
operator := &plugininstaller.Operator{
1414
PreExecuteOperations: plugininstaller.PreExecuteOperations{
15-
ci.SetSCMDefault,
15+
ci.SetDefault(ciType),
1616
validate,
1717
},
1818
GetStatusOperation: cifile.GetCIFileStatus,

internal/pkg/plugin/gitlabci/generic/create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
func Create(options configmanager.RawOptions) (statemanager.ResourceStatus, error) {
1313
operator := &plugininstaller.Operator{
1414
PreExecuteOperations: plugininstaller.PreExecuteOperations{
15-
ci.SetSCMDefault,
15+
ci.SetDefault(ciType),
1616
validate,
1717
},
1818
ExecuteOperations: plugininstaller.ExecuteOperations{

internal/pkg/plugin/gitlabci/generic/delete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
func Delete(options configmanager.RawOptions) (bool, error) {
1111
operator := &plugininstaller.Operator{
1212
PreExecuteOperations: plugininstaller.PreExecuteOperations{
13-
ci.SetSCMDefault,
13+
ci.SetDefault(ciType),
1414
validate,
1515
},
1616
ExecuteOperations: plugininstaller.ExecuteOperations{

internal/pkg/plugin/gitlabci/generic/generic.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/devstream-io/devstream/internal/pkg/configmanager"
88
"github.com/devstream-io/devstream/internal/pkg/plugin/helminstaller"
99
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci"
10+
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci/cifile/server"
1011
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci/step"
1112
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/reposcaffolding"
1213
"github.com/devstream-io/devstream/pkg/util/log"
@@ -19,6 +20,8 @@ import (
1920
//go:embed tpl/helmValue.tpl.yaml
2021
var helmValueTpl string
2122

23+
var ciType = server.CIGitLabType
24+
2225
func preConfigGitlab(options configmanager.RawOptions) error {
2326
opts, err := ci.NewCIOptions(options)
2427
if err != nil {

internal/pkg/plugin/gitlabci/generic/read.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
func Read(options configmanager.RawOptions) (statemanager.ResourceStatus, error) {
1313
operator := &plugininstaller.Operator{
1414
PreExecuteOperations: plugininstaller.PreExecuteOperations{
15-
ci.SetSCMDefault,
15+
ci.SetDefault(ciType),
1616
validate,
1717
},
1818
GetStatusOperation: cifile.GetCIFileStatus,

internal/pkg/plugin/jenkinspipeline/create.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package jenkinspipeline
33
import (
44
"github.com/devstream-io/devstream/internal/pkg/configmanager"
55
"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
6+
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci"
67
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci/cifile"
78
"github.com/devstream-io/devstream/internal/pkg/statemanager"
89
"github.com/devstream-io/devstream/pkg/util/log"
@@ -12,8 +13,10 @@ func Create(options configmanager.RawOptions) (statemanager.ResourceStatus, erro
1213
// Initialize Operator with Operations
1314
operator := &plugininstaller.Operator{
1415
PreExecuteOperations: plugininstaller.PreExecuteOperations{
15-
setDefault,
16-
validate,
16+
ci.SetDefault(ciType),
17+
setJenkinsDefault,
18+
ci.Validate,
19+
validateJenkins,
1720
},
1821
ExecuteOperations: plugininstaller.ExecuteOperations{
1922
installPipeline,

internal/pkg/plugin/jenkinspipeline/delete.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,18 @@ package jenkinspipeline
33
import (
44
"github.com/devstream-io/devstream/internal/pkg/configmanager"
55
"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
6+
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci"
67
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci/cifile"
78
)
89

910
func Delete(options configmanager.RawOptions) (bool, error) {
1011
// Initialize Operator with Operations
1112
operator := &plugininstaller.Operator{
1213
PreExecuteOperations: plugininstaller.PreExecuteOperations{
13-
setDefault,
14-
validate,
14+
ci.SetDefault(ciType),
15+
setJenkinsDefault,
16+
ci.Validate,
17+
validateJenkins,
1518
},
1619
ExecuteOperations: plugininstaller.ExecuteOperations{
1720
// TODO(daniel-hutao): delete secret: docker-config

0 commit comments

Comments
 (0)