Skip to content

Commit

Permalink
refactor: move pkg/engine/models to pkg/models (#434)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SparkYuan
SparkYuan authored Aug 3, 2023
1 parent 54d90d6 commit b6869db
Show file tree
Hide file tree
Showing 46 changed files with 76 additions and 52 deletions.
2 changes: 1 addition & 1 deletion pkg/cmd/apply/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import (
"kusionstack.io/kusion/pkg/cmd/util"
"kusionstack.io/kusion/pkg/engine/backend"
_ "kusionstack.io/kusion/pkg/engine/backend/init"
"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/states"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
"kusionstack.io/kusion/pkg/util/pretty"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/apply/options_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import (

"kusionstack.io/kusion/pkg/cmd/spec"
"kusionstack.io/kusion/pkg/engine"
"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/runtime"
"kusionstack.io/kusion/pkg/engine/runtime/kubernetes"
"kusionstack.io/kusion/pkg/engine/states/local"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
)
Expand Down
9 changes: 7 additions & 2 deletions pkg/cmd/compile/options_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import (

"bou.ke/monkey"
"github.com/stretchr/testify/assert"

"kusionstack.io/kusion/pkg/cmd/spec"
"kusionstack.io/kusion/pkg/engine"
"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
)

Expand Down Expand Up @@ -125,7 +126,11 @@ func mockDetectProjectAndStack() {
}

func mockGenerateSpec() {
monkey.Patch(spec.GenerateSpecWithSpinner, func(o *generator.Options, project *projectstack.Project, stack *projectstack.Stack) (*models.Spec, error) {
monkey.Patch(spec.GenerateSpecWithSpinner, func(
o *generator.Options,
project *projectstack.Project,
stack *projectstack.Stack,
) (*models.Spec, error) {
return &models.Spec{Resources: []models.Resource{sa1, sa2, sa3}}, nil
})
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/destroy/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (

compilecmd "kusionstack.io/kusion/pkg/cmd/compile"
"kusionstack.io/kusion/pkg/engine/backend"
"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/states"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
jsonutil "kusionstack.io/kusion/pkg/util/json"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/destroy/options_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import (
"github.com/stretchr/testify/assert"

"kusionstack.io/kusion/pkg/engine"
"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/runtime"
"kusionstack.io/kusion/pkg/engine/runtime/kubernetes"
"kusionstack.io/kusion/pkg/engine/states"
"kusionstack.io/kusion/pkg/engine/states/local"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
)
Expand Down
3 changes: 2 additions & 1 deletion pkg/cmd/preview/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ import (
"github.com/pterm/pterm"

"github.com/pkg/errors"

compilecmd "kusionstack.io/kusion/pkg/cmd/compile"
"kusionstack.io/kusion/pkg/cmd/spec"
"kusionstack.io/kusion/pkg/cmd/util"
"kusionstack.io/kusion/pkg/engine/backend"
"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/states"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
"kusionstack.io/kusion/pkg/util/pretty"
Expand Down
8 changes: 6 additions & 2 deletions pkg/cmd/preview/options_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@ import (

"github.com/bytedance/mockey"
"github.com/stretchr/testify/require"

compilecmd "kusionstack.io/kusion/pkg/cmd/compile"
"kusionstack.io/kusion/pkg/cmd/spec"
"kusionstack.io/kusion/pkg/engine"
"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/runtime"
"kusionstack.io/kusion/pkg/engine/runtime/kubernetes"
"kusionstack.io/kusion/pkg/engine/states/local"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
)
Expand Down Expand Up @@ -184,7 +185,10 @@ func (f *fooRuntime) Watch(ctx context.Context, request *runtime.WatchRequest) *
}

func monkeyPatchOperationPreview() *mockey.Mocker {
return mockey.Mock((*operation.PreviewOperation).Preview).To(func(*operation.PreviewOperation, *operation.PreviewRequest) (rsp *operation.PreviewResponse, s status.Status) {
return mockey.Mock((*operation.PreviewOperation).Preview).To(func(
*operation.PreviewOperation,
*operation.PreviewRequest,
) (rsp *operation.PreviewResponse, s status.Status) {
return &operation.PreviewResponse{
Order: &opsmodels.ChangeOrder{
StepKeys: []string{sa1.ID, sa2.ID, sa3.ID},
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/spec/generator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (

"gopkg.in/yaml.v3"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/generator/kcl"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/util/pretty"
)
Expand Down
3 changes: 2 additions & 1 deletion pkg/cmd/spec/generator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import (
"testing"

"github.com/stretchr/testify/require"
"kusionstack.io/kusion/pkg/engine/models"

"kusionstack.io/kusion/pkg/models"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/kcl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

kcl "kcl-lang.io/kcl-go"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/models"
)

const MaxLogLength = 3751
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/apply.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"fmt"
"sync"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation/graph"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/operation/parser"
runtimeinit "kusionstack.io/kusion/pkg/engine/runtime/init"
"kusionstack.io/kusion/pkg/engine/states"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/status"
"kusionstack.io/kusion/third_party/terraform/dag"
"kusionstack.io/kusion/third_party/terraform/tfdiags"
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/apply_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import (
_ "github.com/go-sql-driver/mysql"
"github.com/stretchr/testify/assert"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation/graph"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/runtime"
runtimeinit "kusionstack.io/kusion/pkg/engine/runtime/init"
"kusionstack.io/kusion/pkg/engine/runtime/kubernetes"
"kusionstack.io/kusion/pkg/engine/states"
"kusionstack.io/kusion/pkg/engine/states/local"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/destory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (
"fmt"
"sync"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation/graph"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/operation/parser"
runtimeinit "kusionstack.io/kusion/pkg/engine/runtime/init"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/status"
"kusionstack.io/kusion/third_party/terraform/dag"
"kusionstack.io/kusion/third_party/terraform/tfdiags"
Expand Down
12 changes: 9 additions & 3 deletions pkg/engine/operation/destory_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import (
"bou.ke/monkey"
"github.com/stretchr/testify/assert"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation/graph"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/runtime"
"kusionstack.io/kusion/pkg/engine/runtime/kubernetes"
"kusionstack.io/kusion/pkg/engine/states"
"kusionstack.io/kusion/pkg/engine/states/local"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
)
Expand Down Expand Up @@ -76,7 +76,10 @@ func TestOperation_Destroy(t *testing.T) {
monkey.Patch((*graph.ResourceNode).Execute, func(rn *graph.ResourceNode, operation *opsmodels.Operation) status.Status {
return nil
})
monkey.PatchInstanceMethod(reflect.TypeOf(local.NewFileSystemState()), "GetLatestState", func(f *local.FileSystemState, query *states.StateQuery) (*states.State, error) {
monkey.PatchInstanceMethod(reflect.TypeOf(local.NewFileSystemState()), "GetLatestState", func(
f *local.FileSystemState,
query *states.StateQuery,
) (*states.State, error) {
return &states.State{Resources: []models.Resource{resourceState}}, nil
})
monkey.Patch(kubernetes.NewKubernetesRuntime, func() (runtime.Runtime, error) {
Expand All @@ -94,7 +97,10 @@ func TestOperation_Destroy(t *testing.T) {
monkey.Patch((*graph.ResourceNode).Execute, func(rn *graph.ResourceNode, operation *opsmodels.Operation) status.Status {
return status.NewErrorStatus(errors.New("mock error"))
})
monkey.PatchInstanceMethod(reflect.TypeOf(local.NewFileSystemState()), "GetLatestState", func(f *local.FileSystemState, query *states.StateQuery) (*states.State, error) {
monkey.PatchInstanceMethod(reflect.TypeOf(local.NewFileSystemState()), "GetLatestState", func(
f *local.FileSystemState,
query *states.StateQuery,
) (*states.State, error) {
return &states.State{Resources: []models.Resource{resourceState}}, nil
})
monkey.Patch(kubernetes.NewKubernetesRuntime, func() (runtime.Runtime, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/diff.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package operation
import (
"github.com/pkg/errors"

"kusionstack.io/kusion/pkg/engine/models"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/states"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/util"
"kusionstack.io/kusion/pkg/util/diff"
jsonutil "kusionstack.io/kusion/pkg/util/json"
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/graph/resource_node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"reflect"
"strings"

"kusionstack.io/kusion/pkg/engine/models"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/runtime"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/status"
"kusionstack.io/kusion/pkg/util"
"kusionstack.io/kusion/pkg/util/diff"
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/graph/resource_node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"bou.ke/monkey"
"github.com/stretchr/testify/assert"

"kusionstack.io/kusion/pkg/engine/models"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/runtime"
"kusionstack.io/kusion/pkg/engine/runtime/kubernetes"
"kusionstack.io/kusion/pkg/engine/states"
"kusionstack.io/kusion/pkg/engine/states/local"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/status"
"kusionstack.io/kusion/third_party/terraform/dag"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/models/change.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/AlecAivazis/survey/v2"
"github.com/pterm/pterm"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/util/diff"
"kusionstack.io/kusion/pkg/util/pretty"
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/models/change_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/stretchr/testify/assert"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/util/pretty"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/models/operation_context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

"github.com/jinzhu/copier"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/runtime"
"kusionstack.io/kusion/pkg/engine/states"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/util"
jsonutil "kusionstack.io/kusion/pkg/util/json"
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/parser/delete_resource_parser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package parser
import (
"fmt"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation/graph"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/status"
"kusionstack.io/kusion/pkg/util"
"kusionstack.io/kusion/pkg/util/json"
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/parser/delete_resource_parser_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"strings"
"testing"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation/graph"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/third_party/terraform/dag"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/parser/parser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"reflect"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation/graph"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/status"
"kusionstack.io/kusion/third_party/terraform/dag"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/parser/spec_parser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package parser
import (
"fmt"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation/graph"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/status"
"kusionstack.io/kusion/pkg/util"
"kusionstack.io/kusion/pkg/util/json"
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/parser/spec_parser_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"strings"
"testing"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation/graph"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/third_party/terraform/dag"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/preview.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (
"fmt"
"sync"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/engine/operation/graph"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
runtimeinit "kusionstack.io/kusion/pkg/engine/runtime/init"
"kusionstack.io/kusion/pkg/engine/states"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/status"
"kusionstack.io/kusion/third_party/terraform/dag"
"kusionstack.io/kusion/third_party/terraform/tfdiags"
Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/operation/preview_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (

"bou.ke/monkey"

"kusionstack.io/kusion/pkg/engine/models"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/runtime"
runtimeinit "kusionstack.io/kusion/pkg/engine/runtime/init"
"kusionstack.io/kusion/pkg/engine/states"
"kusionstack.io/kusion/pkg/engine/states/local"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
jsonutil "kusionstack.io/kusion/pkg/util/json"
Expand Down
Loading

0 comments on commit b6869db

Please sign in to comment.