Skip to content

Commit

Permalink
unfold kusionctl pkg (#232)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SparkYuan
SparkYuan committed Feb 6, 2023
1 parent df72471 commit 8192726
Show file tree
Hide file tree
Showing 93 changed files with 56 additions and 55 deletions.
2 changes: 1 addition & 1 deletion kusion.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

_ "kusionstack.io/kcl-plugin"

"kusionstack.io/kusion/pkg/kusionctl/cmd"
"kusionstack.io/kusion/pkg/cmd"
"kusionstack.io/kusion/pkg/util/pretty"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kusionctl/cmd/apply/apply.go → pkg/cmd/apply/apply.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/util/templates"

"kusionstack.io/kusion/pkg/kusionctl/cmd/util"
"kusionstack.io/kusion/pkg/cmd/util"
"kusionstack.io/kusion/pkg/util/i18n"
)

Expand Down
0 pkg/kusionctl/cmd/apply/apply_test.go → pkg/cmd/apply/apply_test.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/kusionctl/cmd/apply/options.go → pkg/cmd/apply/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import (
"github.com/AlecAivazis/survey/v2"
"github.com/pterm/pterm"

previewcmd "kusionstack.io/kusion/pkg/cmd/preview"
"kusionstack.io/kusion/pkg/cmd/spec"
"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"
previewcmd "kusionstack.io/kusion/pkg/kusionctl/cmd/preview"
"kusionstack.io/kusion/pkg/kusionctl/cmd/spec"
"kusionstack.io/kusion/pkg/kusionctl/generator"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
Expand Down
4 changes: 2 additions & 2 deletions pkg/kusionctl/cmd/apply/options_test.go → pkg/cmd/apply/options_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import (
"github.com/AlecAivazis/survey/v2"
"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/engine/operation"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/runtime"
"kusionstack.io/kusion/pkg/engine/states/local"
"kusionstack.io/kusion/pkg/kusionctl/cmd/spec"
"kusionstack.io/kusion/pkg/kusionctl/generator"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/kusionctl/cmd/check/check.go → pkg/cmd/check/check.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/util/templates"

"kusionstack.io/kusion/pkg/kusionctl/cmd/compile"
"kusionstack.io/kusion/pkg/kusionctl/cmd/util"
"kusionstack.io/kusion/pkg/cmd/compile"
"kusionstack.io/kusion/pkg/cmd/util"
"kusionstack.io/kusion/pkg/util/i18n"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kusionctl/cmd/check/check_test.go → pkg/cmd/check/check_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"bou.ke/monkey"
"github.com/stretchr/testify/assert"

"kusionstack.io/kusion/pkg/kusionctl/cmd/compile"
"kusionstack.io/kusion/pkg/cmd/compile"
)

func TestNewCmdCheck(t *testing.T) {
Expand Down
20 changes: 10 additions & 10 deletions pkg/kusionctl/cmd/cmd.go → pkg/cmd/cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ import (
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/kubectl/pkg/util/templates"

"kusionstack.io/kusion/pkg/kusionctl/cmd/apply"
"kusionstack.io/kusion/pkg/kusionctl/cmd/check"
"kusionstack.io/kusion/pkg/kusionctl/cmd/compile"
"kusionstack.io/kusion/pkg/kusionctl/cmd/deps"
"kusionstack.io/kusion/pkg/kusionctl/cmd/destroy"
"kusionstack.io/kusion/pkg/kusionctl/cmd/env"
cmdinit "kusionstack.io/kusion/pkg/kusionctl/cmd/init"
"kusionstack.io/kusion/pkg/kusionctl/cmd/ls"
"kusionstack.io/kusion/pkg/kusionctl/cmd/preview"
"kusionstack.io/kusion/pkg/kusionctl/cmd/version"
"kusionstack.io/kusion/pkg/cmd/apply"
"kusionstack.io/kusion/pkg/cmd/check"
"kusionstack.io/kusion/pkg/cmd/compile"
"kusionstack.io/kusion/pkg/cmd/deps"
"kusionstack.io/kusion/pkg/cmd/destroy"
"kusionstack.io/kusion/pkg/cmd/env"
cmdinit "kusionstack.io/kusion/pkg/cmd/init"
"kusionstack.io/kusion/pkg/cmd/ls"
"kusionstack.io/kusion/pkg/cmd/preview"
"kusionstack.io/kusion/pkg/cmd/version"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/util/gitutil"
"kusionstack.io/kusion/pkg/util/i18n"
Expand Down
0 pkg/kusionctl/cmd/cmd_test.go → pkg/cmd/cmd_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/kusionctl/cmd/compile/compile.go → pkg/cmd/compile/compile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/util/templates"

"kusionstack.io/kusion/pkg/kusionctl/cmd/util"
"kusionstack.io/kusion/pkg/cmd/util"
"kusionstack.io/kusion/pkg/util/i18n"
)

Expand Down
0 pkg/kusionctl/cmd/compile/compile_test.go → pkg/cmd/compile/compile_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/kusionctl/cmd/compile/options.go → pkg/cmd/compile/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

yamlv3 "gopkg.in/yaml.v3"

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

Expand Down
0 pkg/kusionctl/cmd/compile/options_test.go → pkg/cmd/compile/options_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/kusionctl/cmd/deps/deps.go → pkg/cmd/deps/deps.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/util/templates"

"kusionstack.io/kusion/pkg/kusionctl/cmd/util"
"kusionstack.io/kusion/pkg/cmd/util"
"kusionstack.io/kusion/pkg/util/i18n"
)

Expand Down
0 pkg/kusionctl/cmd/deps/deps_test.go → pkg/cmd/deps/deps_test.go
View file
File renamed without changes.
0 pkg/kusionctl/cmd/deps/options.go → pkg/cmd/deps/options.go
View file
File renamed without changes.
0 ...deps/testdata/appops/projectA/base/base.k → ...deps/testdata/appops/projectA/base/base.k
View file
File renamed without changes.
0 ...testdata/appops/projectA/dev/datafile.sql → ...testdata/appops/projectA/dev/datafile.sql
View file
File renamed without changes.
0 ...eps/testdata/appops/projectA/dev/kcl.yaml → ...eps/testdata/appops/projectA/dev/kcl.yaml
View file
File renamed without changes.
0 .../deps/testdata/appops/projectA/dev/main.k → .../deps/testdata/appops/projectA/dev/main.k
View file
File renamed without changes.
0 ...s/testdata/appops/projectA/dev/stack.yaml → ...s/testdata/appops/projectA/dev/stack.yaml
View file
File renamed without changes.
0 ...eps/testdata/appops/projectA/project.yaml → ...eps/testdata/appops/projectA/project.yaml
View file
File renamed without changes.
0 ...deps/testdata/appops/projectB/base/base.k → ...deps/testdata/appops/projectB/base/base.k
View file
File renamed without changes.
0 ...eps/testdata/appops/projectB/dev/kcl.yaml → ...eps/testdata/appops/projectB/dev/kcl.yaml
View file
File renamed without changes.
0 .../deps/testdata/appops/projectB/dev/main.k → .../deps/testdata/appops/projectB/dev/main.k
View file
File renamed without changes.
0 ...s/testdata/appops/projectB/dev/stack.yaml → ...s/testdata/appops/projectB/dev/stack.yaml
View file
File renamed without changes.
0 ...eps/testdata/appops/projectB/project.yaml → ...eps/testdata/appops/projectB/project.yaml
View file
File renamed without changes.
0 ...eps/testdata/appops/projectC/dev/kcl.yaml → ...eps/testdata/appops/projectC/dev/kcl.yaml
View file
File renamed without changes.
0 .../deps/testdata/appops/projectC/dev/main.k → .../deps/testdata/appops/projectC/dev/main.k
View file
File renamed without changes.
0 ...s/testdata/appops/projectC/dev/stack.yaml → ...s/testdata/appops/projectC/dev/stack.yaml
View file
File renamed without changes.
0 ...eps/testdata/appops/projectC/project.yaml → ...eps/testdata/appops/projectC/project.yaml
View file
File renamed without changes.
0 ...tdata/base/frontend/container/container.k → ...tdata/base/frontend/container/container.k
View file
File renamed without changes.
0 .../base/frontend/container/container_port.k → .../base/frontend/container/container_port.k
View file
File renamed without changes.
0 ...cmd/deps/testdata/base/frontend/job/job.k → ...cmd/deps/testdata/base/frontend/job/job.k
View file
File renamed without changes.
0 ...ps/testdata/base/frontend/server/server.k → ...ps/testdata/base/frontend/server/server.k
View file
File renamed without changes.
0 ...eps/testdata/base/render/job/job_render.k → ...eps/testdata/base/render/job/job_render.k
View file
File renamed without changes.
0 ...stdata/base/render/server/server_render.k → ...stdata/base/render/server/server_render.k
View file
File renamed without changes.
0 pkg/kusionctl/cmd/deps/testdata/kcl.mod → pkg/cmd/deps/testdata/kcl.mod
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/kusionctl/cmd/destroy/destroy.go → pkg/cmd/destroy/destroy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates"

"kusionstack.io/kusion/pkg/kusionctl/cmd/util"
"kusionstack.io/kusion/pkg/cmd/util"
)

var (
Expand Down
0 pkg/kusionctl/cmd/destroy/destroy_test.go → pkg/cmd/destroy/destroy_test.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/kusionctl/cmd/destroy/options.go → pkg/cmd/destroy/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
"github.com/AlecAivazis/survey/v2"
"github.com/pterm/pterm"

compilecmd "kusionstack.io/kusion/pkg/cmd/compile"
"kusionstack.io/kusion/pkg/cmd/spec"
"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"
compilecmd "kusionstack.io/kusion/pkg/kusionctl/cmd/compile"
"kusionstack.io/kusion/pkg/kusionctl/cmd/spec"
"kusionstack.io/kusion/pkg/kusionctl/generator"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
Expand Down
4 changes: 2 additions & 2 deletions pkg/kusionctl/cmd/destroy/options_test.go → pkg/cmd/destroy/options_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ import (
"github.com/AlecAivazis/survey/v2"
"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/engine/operation"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/runtime"
"kusionstack.io/kusion/pkg/engine/states/local"
"kusionstack.io/kusion/pkg/kusionctl/cmd/spec"
"kusionstack.io/kusion/pkg/kusionctl/generator"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
)
Expand Down
0 pkg/kusionctl/cmd/diff/diff.go → pkg/cmd/diff/diff.go
View file
File renamed without changes.
0 pkg/kusionctl/cmd/diff/diff_test.go → pkg/cmd/diff/diff_test.go
View file
File renamed without changes.
0 pkg/kusionctl/cmd/diff/options.go → pkg/cmd/diff/options.go
View file
File renamed without changes.
0 ...usionctl/cmd/diff/testdata/namespace.yaml → pkg/cmd/diff/testdata/namespace.yaml
View file
File renamed without changes.
0 ...kusionctl/cmd/diff/testdata/pod-full.yaml → pkg/cmd/diff/testdata/pod-full.yaml
View file
File renamed without changes.
0 pkg/kusionctl/cmd/diff/testdata/pod1.yaml → pkg/cmd/diff/testdata/pod1.yaml
View file
File renamed without changes.
0 pkg/kusionctl/cmd/diff/testdata/pod2.yaml → pkg/cmd/diff/testdata/pod2.yaml
View file
File renamed without changes.
0 pkg/kusionctl/cmd/diff/type.go → pkg/cmd/diff/type.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/kusionctl/cmd/env/env.go → pkg/cmd/env/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/util/templates"

"kusionstack.io/kusion/pkg/kusionctl/cmd/util"
"kusionstack.io/kusion/pkg/cmd/util"
"kusionstack.io/kusion/pkg/util/i18n"
)

Expand Down
0 pkg/kusionctl/cmd/env/env_test.go → pkg/cmd/env/env_test.go
View file
File renamed without changes.
0 pkg/kusionctl/cmd/env/options.go → pkg/cmd/env/options.go
View file
File renamed without changes.
0 pkg/kusionctl/cmd/env/types.go → pkg/cmd/env/types.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/kusionctl/cmd/init/init.go → pkg/cmd/init/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/util/templates"

"kusionstack.io/kusion/pkg/kusionctl/cmd/util"
"kusionstack.io/kusion/pkg/cmd/util"
"kusionstack.io/kusion/pkg/util/i18n"
)

Expand Down
0 pkg/kusionctl/cmd/init/init_test.go → pkg/cmd/init/init_test.go
View file
File renamed without changes.
0 pkg/kusionctl/cmd/init/options.go → pkg/cmd/init/options.go
View file
File renamed without changes.
0 pkg/kusionctl/cmd/init/options_test.go → pkg/cmd/init/options_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/kusionctl/cmd/ls/ls.go → pkg/cmd/ls/ls.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/util/templates"

"kusionstack.io/kusion/pkg/kusionctl/cmd/util"
"kusionstack.io/kusion/pkg/cmd/util"
"kusionstack.io/kusion/pkg/util/i18n"
)

Expand Down
0 pkg/kusionctl/cmd/ls/ls_test.go → pkg/cmd/ls/ls_test.go
View file
File renamed without changes.
0 pkg/kusionctl/cmd/ls/options.go → pkg/cmd/ls/options.go
View file
File renamed without changes.
0 pkg/kusionctl/cmd/ls/options_test.go → pkg/cmd/ls/options_test.go
View file
File renamed without changes.
0 pkg/kusionctl/cmd/ls/types.go → pkg/cmd/ls/types.go
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions pkg/kusionctl/cmd/ls/types_test.go → pkg/cmd/ls/types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import (
var (
workDir = project.Path
report = NewLsReport(workDir, []*projectstack.Project{project})
humanReport = `┌──────────────────────────────────────────────────────────────────┐
| Type | Name |
| Stack Name | dev |
| Stack Path | ../../../projectstack/testdata/appops/http-echo/dev |
└──────────────────────────────────────────────────────────────────┘`
humanReport = `┌───────────────────────────────────────────────────────────────┐
| Type | Name |
| Stack Name | dev |
| Stack Path | ../../projectstack/testdata/appops/http-echo/dev |
└───────────────────────────────────────────────────────────────┘`
treeReport = `└─┬http-echo
└──dev
`
Expand Down
1 change: 1 addition & 0 deletions pkg/kusionctl/cmd/ls/util.go → pkg/cmd/ls/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (

"github.com/AlecAivazis/survey/v2"
"github.com/pterm/pterm"

"kusionstack.io/kusion/pkg/util/pretty"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/kusionctl/cmd/ls/util_test.go → pkg/cmd/ls/util_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ var (
ProjectConfiguration: projectstack.ProjectConfiguration{
Name: "http-echo",
},
Path: "../../../projectstack/testdata/appops/http-echo",
Path: "../../projectstack/testdata/appops/http-echo",
Stacks: []*projectstack.Stack{stack},
}
stack = &projectstack.Stack{
StackConfiguration: projectstack.StackConfiguration{
Name: "dev",
},
Path: "../../../projectstack/testdata/appops/http-echo/dev",
Path: "../../projectstack/testdata/appops/http-echo/dev",
}
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/kusionctl/cmd/preview/options.go → pkg/cmd/preview/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import (

"github.com/pterm/pterm"

compilecmd "kusionstack.io/kusion/pkg/cmd/compile"
"kusionstack.io/kusion/pkg/cmd/spec"
"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"
compilecmd "kusionstack.io/kusion/pkg/kusionctl/cmd/compile"
"kusionstack.io/kusion/pkg/kusionctl/cmd/spec"
"kusionstack.io/kusion/pkg/kusionctl/generator"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
Expand Down
4 changes: 2 additions & 2 deletions pkg/kusionctl/cmd/preview/options_test.go → pkg/cmd/preview/options_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ 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/engine/operation"
opsmodels "kusionstack.io/kusion/pkg/engine/operation/models"
"kusionstack.io/kusion/pkg/engine/runtime"
"kusionstack.io/kusion/pkg/engine/states/local"
"kusionstack.io/kusion/pkg/kusionctl/cmd/spec"
"kusionstack.io/kusion/pkg/kusionctl/generator"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/status"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/kusionctl/cmd/preview/preview.go → pkg/cmd/preview/preview.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/util/templates"

"kusionstack.io/kusion/pkg/kusionctl/cmd/util"
"kusionstack.io/kusion/pkg/cmd/util"
"kusionstack.io/kusion/pkg/util/i18n"
)

Expand Down
0 pkg/kusionctl/cmd/preview/preview_test.go → pkg/cmd/preview/preview_test.go
View file
File renamed without changes.
0 pkg/kusionctl/cmd/spec/doc.go → pkg/cmd/spec/doc.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/kusionctl/cmd/spec/generator.go → pkg/cmd/spec/generator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/pterm/pterm"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/kusionctl/generator"
"kusionstack.io/kusion/pkg/kusionctl/generator/kcl"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/generator/kcl"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/util/pretty"
)
Expand Down
0 pkg/kusionctl/cmd/util/helpers.go → pkg/cmd/util/helpers.go
View file
File renamed without changes.
0 pkg/kusionctl/cmd/util/helpers_test.go → pkg/cmd/util/helpers_test.go
View file
File renamed without changes.
0 pkg/kusionctl/cmd/version/options.go → pkg/cmd/version/options.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/kusionctl/cmd/version/version.go → pkg/cmd/version/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/util/templates"

"kusionstack.io/kusion/pkg/kusionctl/cmd/util"
"kusionstack.io/kusion/pkg/cmd/util"
"kusionstack.io/kusion/pkg/util/i18n"
)

Expand Down
0 pkg/kusionctl/cmd/version/version_test.go → pkg/cmd/version/version_test.go
View file
File renamed without changes.
0 pkg/kusionctl/generator/doc.go → pkg/generator/doc.go
View file
File renamed without changes.
0 pkg/kusionctl/generator/generator.go → pkg/generator/generator.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/kusionctl/generator/kcl/kcl_generator.go → pkg/generator/kcl/kcl_generator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (

"kusionstack.io/kusion/pkg/engine"
"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/kusionctl/generator"
"kusionstack.io/kusion/pkg/kusionctl/generator/kcl/rest"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/generator/kcl/rest"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/resources/crd"
Expand Down
4 changes: 2 additions & 2 deletions ...onctl/generator/kcl/kcl_generator_test.go → pkg/generator/kcl/kcl_generator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"kusionstack.io/kclvm-go/pkg/spec/gpyrpc"

"kusionstack.io/kusion/pkg/engine/models"
"kusionstack.io/kusion/pkg/kusionctl/generator"
"kusionstack.io/kusion/pkg/kusionctl/generator/kcl/rest"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/generator/kcl/rest"
"kusionstack.io/kusion/pkg/projectstack"
)

Expand Down
0 pkg/kusionctl/generator/kcl/rest/model.go → pkg/generator/kcl/rest/model.go
View file
File renamed without changes.
0 pkg/kusionctl/generator/kcl/rest/rest.go → pkg/generator/kcl/rest/rest.go
View file
File renamed without changes.
0 ...kusionctl/generator/kcl/rest/rest_test.go → pkg/generator/kcl/rest/rest_test.go
View file
File renamed without changes.
0 ...onctl/generator/kcl/testdata/crd/foo.yaml → pkg/generator/kcl/testdata/crd/foo.yaml
View file
File renamed without changes.
0 ...kusionctl/generator/kcl/testdata/kcl.yaml → pkg/generator/kcl/testdata/kcl.yaml
View file
File renamed without changes.
0 pkg/kusionctl/generator/kcl/testdata/main.k → pkg/generator/kcl/testdata/main.k
View file
File renamed without changes.
0 ...tl/generator/kcl/testdata/main_topology.k → pkg/generator/kcl/testdata/main_topology.k
View file
File renamed without changes.
0 pkg/kusionctl/generator/kcl/type.go → pkg/generator/kcl/type.go
View file
File renamed without changes.
0 pkg/kusionctl/generator/kcl/type_test.go → pkg/generator/kcl/type_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/kusionctl/generator/kcl/util.go → pkg/generator/kcl/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"gopkg.in/yaml.v3"

"kusionstack.io/kusion/pkg/engine"
"kusionstack.io/kusion/pkg/kusionctl/generator"
"kusionstack.io/kusion/pkg/generator"
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/util/io"
kyaml "kusionstack.io/kusion/pkg/util/yaml"
Expand Down
0 pkg/kusionctl/generator/kcl/util_test.go → pkg/generator/kcl/util_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/gen-docs/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/spf13/cobra/doc"

"kusionstack.io/kusion/pkg/kusionctl/cmd"
"kusionstack.io/kusion/pkg/cmd"
"kusionstack.io/kusion/pkg/log"
uio "kusionstack.io/kusion/pkg/util/io"
)
Expand Down

0 comments on commit 8192726

Please sign in to comment.