Skip to content

Commit f3ecd89

Browse files
steinlibersteinliber
committed
refactor: move plugininstaller to plugin/installer
Signed-off-by: Meng JiaFeng <jiafeng.meng@merico.dev>
1 parent 27b4023 commit f3ecd89

175 files changed

Lines changed: 377 additions & 378 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎internal/pkg/backend/s3/s3.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package s3
33
import (
44
"context"
55

6-
"github.com/devstream-io/devstream/internal/pkg/aws/s3"
6+
"github.com/devstream-io/devstream/pkg/util/cloud/aws/s3"
77
"github.com/devstream-io/devstream/pkg/util/log"
88
)
99

‎internal/pkg/develop/plugin/template/create.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ var createGoContentTpl = `package [[ .Name | format ]]
66
77
import (
88
"github.com/devstream-io/devstream/internal/pkg/configmanager"
9-
"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
9+
"github.com/devstream-io/devstream/internal/pkg/plugin/installer"
1010
"github.com/devstream-io/devstream/internal/pkg/statemanager"
1111
"github.com/devstream-io/devstream/pkg/util/log"
1212
)
1313
1414
func Create(options configmanager.RawOptions) (statemanager.ResourceStatus, error) {
1515
// Initialize Operator with Operations
16-
operator := &plugininstaller.Operator{
17-
PreExecuteOperations: plugininstaller.PreExecuteOperations{
16+
operator := &installer.Operator{
17+
PreExecuteOperations: installer.PreExecuteOperations{
1818
// TODO(dtm): Add your PreExecuteOperations here.
1919
},
20-
ExecuteOperations: plugininstaller.ExecuteOperations{
20+
ExecuteOperations: installer.ExecuteOperations{
2121
// TODO(dtm): Add your ExecuteOperations here.
2222
},
23-
TerminateOperations: plugininstaller.TerminateOperations{
23+
TerminateOperations: installer.TerminateOperations{
2424
// TODO(dtm): Add your TerminateOperations here.
2525
},
2626
GetStatusOperation: func(options configmanager.RawOptions) (statemanager.ResourceStatus, error) {

‎internal/pkg/develop/plugin/template/delete.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ var deleteGoContentTpl = `package [[ .Name | format ]]
66
77
import (
88
"github.com/devstream-io/devstream/internal/pkg/configmanager"
9-
"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
9+
"github.com/devstream-io/devstream/internal/pkg/plugin/installer"
1010
)
1111
1212
func Delete(options configmanager.RawOptions) (bool, error) {
1313
// Initialize Operator with Operations
14-
operator := &plugininstaller.Operator{
15-
PreExecuteOperations: plugininstaller.PreExecuteOperations{
14+
operator := &installer.Operator{
15+
PreExecuteOperations: installer.PreExecuteOperations{
1616
// TODO(dtm): Add your PreExecuteOperations here.
1717
},
18-
ExecuteOperations: plugininstaller.ExecuteOperations{
18+
ExecuteOperations: installer.ExecuteOperations{
1919
// TODO(dtm): Add your ExecuteOperations here.
2020
},
2121
}

‎internal/pkg/develop/plugin/template/read.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ var readGoContentTpl = `package [[ .Name | format ]]
66
77
import (
88
"github.com/devstream-io/devstream/internal/pkg/configmanager"
9-
"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
9+
"github.com/devstream-io/devstream/internal/pkg/plugin/installer"
1010
"github.com/devstream-io/devstream/internal/pkg/statemanager"
1111
"github.com/devstream-io/devstream/pkg/util/log"
1212
)
1313
1414
func Read(options configmanager.RawOptions) (statemanager.ResourceStatus, error) {
1515
// Initialize Operator with Operations
16-
operator := &plugininstaller.Operator{
17-
PreExecuteOperations: plugininstaller.PreExecuteOperations{
16+
operator := &installer.Operator{
17+
PreExecuteOperations: installer.PreExecuteOperations{
1818
// TODO(dtm): Add your PreExecuteOperations here.
1919
},
2020
GetStatusOperation: func(options configmanager.RawOptions) (statemanager.ResourceStatus, error) {

‎internal/pkg/develop/plugin/template/update.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ var updateGoContentTpl = `package [[ .Name | format ]]
66
77
import (
88
"github.com/devstream-io/devstream/internal/pkg/configmanager"
9-
"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
9+
"github.com/devstream-io/devstream/internal/pkg/plugin/installer"
1010
"github.com/devstream-io/devstream/internal/pkg/statemanager"
1111
"github.com/devstream-io/devstream/pkg/util/log"
1212
)
1313
1414
func Update(options configmanager.RawOptions) (statemanager.ResourceStatus, error) {
1515
// Initialize Operator with Operations
16-
operator := &plugininstaller.Operator{
17-
PreExecuteOperations: plugininstaller.PreExecuteOperations{
16+
operator := &installer.Operator{
17+
PreExecuteOperations: installer.PreExecuteOperations{
1818
// TODO(dtm): Add your PreExecuteOperations here.
1919
},
20-
ExecuteOperations: plugininstaller.ExecuteOperations{
20+
ExecuteOperations: installer.ExecuteOperations{
2121
// TODO(dtm): Add your ExecuteOperations here.
2222
},
23-
TerminateOperations: plugininstaller.TerminateOperations{
23+
TerminateOperations: installer.TerminateOperations{
2424
// TODO(dtm): Add your TerminateOperations here.
2525
},
2626
GetStatusOperation: func(options configmanager.RawOptions) (statemanager.ResourceStatus, error) {

‎internal/pkg/plugin/argocdapp/create.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package argocdapp
22

33
import (
44
"github.com/devstream-io/devstream/internal/pkg/configmanager"
5-
"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
6-
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/kubectl"
5+
"github.com/devstream-io/devstream/internal/pkg/plugin/installer"
6+
"github.com/devstream-io/devstream/internal/pkg/plugin/installer/kubectl"
77
"github.com/devstream-io/devstream/internal/pkg/statemanager"
88
kubectlUtil "github.com/devstream-io/devstream/pkg/util/kubectl"
99
"github.com/devstream-io/devstream/pkg/util/log"
@@ -12,11 +12,11 @@ import (
1212
// Create creates an ArgoCD app YAML and applys it.
1313
func Create(options configmanager.RawOptions) (statemanager.ResourceStatus, error) {
1414
// Initialize Operator with Operations
15-
operator := &plugininstaller.Operator{
16-
PreExecuteOperations: plugininstaller.PreExecuteOperations{
15+
operator := &installer.Operator{
16+
PreExecuteOperations: installer.PreExecuteOperations{
1717
validate,
1818
},
19-
ExecuteOperations: plugininstaller.ExecuteOperations{
19+
ExecuteOperations: installer.ExecuteOperations{
2020
kubectl.ProcessByContent(kubectlUtil.Create, templateFileLoc),
2121
},
2222
GetStatusOperation: getStaticStatus,

‎internal/pkg/plugin/argocdapp/delete.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ package argocdapp
22

33
import (
44
"github.com/devstream-io/devstream/internal/pkg/configmanager"
5-
"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
6-
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/kubectl"
5+
"github.com/devstream-io/devstream/internal/pkg/plugin/installer"
6+
"github.com/devstream-io/devstream/internal/pkg/plugin/installer/kubectl"
77
kubectlUtil "github.com/devstream-io/devstream/pkg/util/kubectl"
88
)
99

1010
func Delete(options configmanager.RawOptions) (bool, error) {
1111
// Initialize Operator with Operations
12-
operator := &plugininstaller.Operator{
13-
PreExecuteOperations: plugininstaller.PreExecuteOperations{
12+
operator := &installer.Operator{
13+
PreExecuteOperations: installer.PreExecuteOperations{
1414
validate,
1515
},
16-
ExecuteOperations: plugininstaller.ExecuteOperations{
16+
ExecuteOperations: installer.ExecuteOperations{
1717
kubectl.ProcessByContent(kubectlUtil.Delete, templateFileLoc),
1818
},
1919
}

‎internal/pkg/plugin/argocdapp/read.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ package argocdapp
22

33
import (
44
"github.com/devstream-io/devstream/internal/pkg/configmanager"
5-
"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
5+
"github.com/devstream-io/devstream/internal/pkg/plugin/installer"
66
"github.com/devstream-io/devstream/internal/pkg/statemanager"
77
)
88

99
func Read(options configmanager.RawOptions) (statemanager.ResourceStatus, error) {
1010
// Initialize Operator with Operations
11-
operator := &plugininstaller.Operator{
12-
PreExecuteOperations: plugininstaller.PreExecuteOperations{
11+
operator := &installer.Operator{
12+
PreExecuteOperations: installer.PreExecuteOperations{
1313
validate,
1414
},
1515
GetStatusOperation: getDynamicStatus,

‎internal/pkg/plugin/cigeneric/create.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ package cigeneric
22

33
import (
44
"github.com/devstream-io/devstream/internal/pkg/configmanager"
5-
"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
6-
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci/cifile"
5+
"github.com/devstream-io/devstream/internal/pkg/plugin/installer"
6+
"github.com/devstream-io/devstream/internal/pkg/plugin/installer/ci/cifile"
77
"github.com/devstream-io/devstream/internal/pkg/statemanager"
88
"github.com/devstream-io/devstream/pkg/util/log"
99
)
1010

1111
func Create(options configmanager.RawOptions) (statemanager.ResourceStatus, error) {
1212
// Initialize Operator with Operations
13-
operator := &plugininstaller.Operator{
14-
PreExecuteOperations: plugininstaller.PreExecuteOperations{
13+
operator := &installer.Operator{
14+
PreExecuteOperations: installer.PreExecuteOperations{
1515
cifile.Validate,
1616
},
17-
ExecuteOperations: plugininstaller.ExecuteOperations{
17+
ExecuteOperations: installer.ExecuteOperations{
1818
cifile.PushCIFiles,
1919
},
2020
GetStatusOperation: cifile.GetCIFileStatus,

‎internal/pkg/plugin/cigeneric/delete.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ package cigeneric
22

33
import (
44
"github.com/devstream-io/devstream/internal/pkg/configmanager"
5-
"github.com/devstream-io/devstream/internal/pkg/plugininstaller"
6-
"github.com/devstream-io/devstream/internal/pkg/plugininstaller/ci/cifile"
5+
"github.com/devstream-io/devstream/internal/pkg/plugin/installer"
6+
"github.com/devstream-io/devstream/internal/pkg/plugin/installer/ci/cifile"
77
)
88

99
func Delete(options configmanager.RawOptions) (bool, error) {
1010
// Initialize Operator with Operations
11-
operator := &plugininstaller.Operator{
12-
PreExecuteOperations: plugininstaller.PreExecuteOperations{
11+
operator := &installer.Operator{
12+
PreExecuteOperations: installer.PreExecuteOperations{
1313
cifile.Validate,
1414
},
15-
ExecuteOperations: plugininstaller.ExecuteOperations{
15+
ExecuteOperations: installer.ExecuteOperations{
1616
cifile.DeleteCIFiles,
1717
},
1818
}

0 commit comments

Comments
 (0)