Skip to content

Commit

Permalink
feat: move internal.kusion.io to api.kusion.io (#1119)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SparkYuan
SparkYuan committed May 14, 2024
1 parent 6b08fab commit 5ca1c82
Show file tree
Hide file tree
Showing 48 changed files with 694 additions and 713 deletions.
0 pkg/apis/internal.kusion.io/v1/marshal.go → pkg/apis/api.kusion.io/v1/marshal.go
View file
File renamed without changes.
0 ...pis/internal.kusion.io/v1/marshal_test.go → pkg/apis/api.kusion.io/v1/marshal_test.go
View file
File renamed without changes.
464 changes: 464 additions & 0 deletions pkg/apis/api.kusion.io/v1/types.go
View file

Large diffs are not rendered by default.

0 pkg/apis/internal.kusion.io/v1/unmarshal.go → pkg/apis/api.kusion.io/v1/unmarshal.go
View file
File renamed without changes.
0 ...s/internal.kusion.io/v1/unmarshal_test.go → pkg/apis/api.kusion.io/v1/unmarshal_test.go
View file
File renamed without changes.
3 changes: 0 additions & 3 deletions pkg/apis/internal.kusion.io/group.go
View file

This file was deleted.

468 changes: 0 additions & 468 deletions pkg/apis/internal.kusion.io/v1/types.go
View file

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/backend/backend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package backend
import (
"fmt"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/backend/storages"
"kusionstack.io/kusion/pkg/config"
"kusionstack.io/kusion/pkg/engine/state"
Expand Down
2 changes: 1 addition & 1 deletion pkg/backend/backend_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/bytedance/mockey"
"github.com/stretchr/testify/assert"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/backend/storages"
"kusionstack.io/kusion/pkg/config"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/backend/storages/completion.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package storages
import (
"os"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/util/kfile"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/backend/storages/completion_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/bytedance/mockey"
"github.com/stretchr/testify/assert"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/util/kfile"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/backend/storages/local.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package storages

import (
v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/engine/state"
statestorages "kusionstack.io/kusion/pkg/engine/state/storages"
"kusionstack.io/kusion/pkg/workspace"
Expand Down
2 changes: 1 addition & 1 deletion pkg/backend/storages/local_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/bytedance/mockey"
"github.com/stretchr/testify/assert"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/engine/state"
statestorages "kusionstack.io/kusion/pkg/engine/state/storages"
"kusionstack.io/kusion/pkg/workspace"
Expand Down
2 changes: 1 addition & 1 deletion pkg/backend/storages/oss.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package storages
import (
"github.com/aliyun/aliyun-oss-go-sdk/oss"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/engine/state"
statestorages "kusionstack.io/kusion/pkg/engine/state/storages"
"kusionstack.io/kusion/pkg/workspace"
Expand Down
2 changes: 1 addition & 1 deletion pkg/backend/storages/oss_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/bytedance/mockey"
"github.com/stretchr/testify/assert"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/engine/state"
statestorages "kusionstack.io/kusion/pkg/engine/state/storages"
workspacestorages "kusionstack.io/kusion/pkg/workspace/storages"
Expand Down
2 changes: 1 addition & 1 deletion pkg/backend/storages/s3.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/engine/state"
statestorages "kusionstack.io/kusion/pkg/engine/state/storages"
"kusionstack.io/kusion/pkg/workspace"
Expand Down
2 changes: 1 addition & 1 deletion pkg/backend/storages/s3_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/bytedance/mockey"
"github.com/stretchr/testify/assert"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/engine/state"
statestorages "kusionstack.io/kusion/pkg/engine/state/storages"
workspacestorages "kusionstack.io/kusion/pkg/workspace/storages"
Expand Down
2 changes: 1 addition & 1 deletion pkg/backend/storages/validation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"fmt"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
)

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

"github.com/stretchr/testify/assert"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
)

func TestValidateOssConfig(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions pkg/cmd/apply/apply_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"github.com/stretchr/testify/assert"

apiv1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
internalv1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/status/v1"
"kusionstack.io/kusion/pkg/backend/storages"
"kusionstack.io/kusion/pkg/cmd/generate"
Expand Down Expand Up @@ -55,7 +54,7 @@ var (
)

func NewApplyOptions() *ApplyOptions {
storageBackend := storages.NewLocalStorage(&internalv1.BackendLocalConfig{
storageBackend := storages.NewLocalStorage(&apiv1.BackendLocalConfig{
Path: filepath.Join("", "state.yaml"),
})
return &ApplyOptions{
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/config/list/cmd_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/bytedance/mockey"
"github.com/stretchr/testify/assert"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/config"
)

Expand Down
3 changes: 1 addition & 2 deletions pkg/cmd/destroy/destroy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"github.com/stretchr/testify/assert"

apiv1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
internalv1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/status/v1"
"kusionstack.io/kusion/pkg/backend"
"kusionstack.io/kusion/pkg/backend/storages"
Expand Down Expand Up @@ -56,7 +55,7 @@ var (

func NewDeleteOptions() *DeleteOptions {
cwd, _ := os.Getwd()
storageBackend := storages.NewLocalStorage(&internalv1.BackendLocalConfig{
storageBackend := storages.NewLocalStorage(&apiv1.BackendLocalConfig{
Path: filepath.Join(cwd, "state.yaml"),
})
return &DeleteOptions{
Expand Down
3 changes: 1 addition & 2 deletions pkg/cmd/preview/preview_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/stretchr/testify/assert"

apiv1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
internalv1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/status/v1"
"kusionstack.io/kusion/pkg/backend/storages"
"kusionstack.io/kusion/pkg/cmd/generate"
Expand Down Expand Up @@ -59,7 +58,7 @@ var (
)

func NewPreviewOptions() *PreviewOptions {
storageBackend := storages.NewLocalStorage(&internalv1.BackendLocalConfig{
storageBackend := storages.NewLocalStorage(&apiv1.BackendLocalConfig{
Path: filepath.Join("", "state.yaml"),
})
return &PreviewOptions{
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/operator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"gopkg.in/yaml.v3"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/util/kfile"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/config/operator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/bytedance/mockey"
"github.com/stretchr/testify/assert"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/registry.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package config

import (
v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/util.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package config

import (
v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
)

// GetConfig returns the structured config stored in the config file. The validation of the config is not checked.
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/util_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/bytedance/mockey"
"github.com/stretchr/testify/assert"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
)

func mockNewOperator(config *v1.Config) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/validation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"strings"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/backend/storages"
)

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

"github.com/stretchr/testify/assert"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
)

func TestValidateSetCurrentBackend(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/domain/entity/backend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package entity
import (
"time"

v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/domain/constant"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/domain/request/backend_request.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package request

import v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
import v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"

// CreateBackendRequest represents the create request structure for
// backend.
Expand Down
5 changes: 2 additions & 3 deletions pkg/engine/api/builders/appconfig_builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@ import (
"kcl-lang.io/kpm/pkg/api"

v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
internalv1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
"kusionstack.io/kusion/pkg/modules"
"kusionstack.io/kusion/pkg/modules/generators"
)

type AppsConfigBuilder struct {
Apps map[string]internalv1.AppConfiguration
Apps map[string]v1.AppConfiguration
Workspace *v1.Workspace
}

Expand All @@ -37,7 +36,7 @@ func (acg *AppsConfigBuilder) Build(kclPackage *api.KclPackage, project *v1.Proj
}

var gfs []modules.NewGeneratorFunc
err := modules.ForeachOrdered(acg.Apps, func(appName string, app internalv1.AppConfiguration) error {
err := modules.ForeachOrdered(acg.Apps, func(appName string, app v1.AppConfiguration) error {
if kclPackage == nil {
return fmt.Errorf("kcl package is nil when generating app configuration for %s", appName)
}
Expand Down
17 changes: 8 additions & 9 deletions pkg/engine/api/builders/appconfig_builder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@ import (
"kcl-lang.io/kpm/pkg/api"

v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
internalv1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
"kusionstack.io/kusion/pkg/modules"
)

func TestBuild(t *testing.T) {
p, s := buildMockProjectAndStack()
appName, app := buildMockApp()
acg := &AppsConfigBuilder{
Apps: map[string]internalv1.AppConfiguration{
Apps: map[string]v1.AppConfiguration{
appName: *app,
},
Workspace: buildMockWorkspace(),
Expand All @@ -53,16 +52,16 @@ func TestBuild(t *testing.T) {
assert.NotNil(t, intent)
}

func buildMockApp() (string, *internalv1.AppConfiguration) {
return "app1", &internalv1.AppConfiguration{
Workload: &internalv1.Workload{
Header: internalv1.Header{
func buildMockApp() (string, *v1.AppConfiguration) {
return "app1", &v1.AppConfiguration{
Workload: &v1.Workload{
Header: v1.Header{
Type: "Service",
},
Service: &internalv1.Service{
Base: internalv1.Base{},
Service: &v1.Service{
Base: v1.Base{},
Type: "Deployment",
Ports: []internalv1.Port{
Ports: []v1.Port{
{
Port: 80,
Protocol: "TCP",
Expand Down
3 changes: 1 addition & 2 deletions pkg/engine/api/generate/generator/generator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
pkg "kcl-lang.io/kpm/pkg/package"

v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
internalv1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
"kusionstack.io/kusion/pkg/engine/api/builders"
"kusionstack.io/kusion/pkg/engine/api/generate/run"
"kusionstack.io/kusion/pkg/util/io"
Expand Down Expand Up @@ -68,7 +67,7 @@ func (g *DefaultGenerator) Generate(workDir string, params map[string]string) (*

// Note: we use the type of MapSlice in yaml.v2 to maintain the order of container
// environment variables, thus we unmarshal appConfigs with yaml.v2 rather than yaml.v3.
apps := map[string]internalv1.AppConfiguration{}
apps := map[string]v1.AppConfiguration{}
err = yaml.Unmarshal(rawAppConfiguration, apps)
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion pkg/infra/persistence/backend_model.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package persistence

import (
v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/domain/entity"

"gorm.io/gorm"
Expand Down
3 changes: 2 additions & 1 deletion pkg/infra/persistence/backend_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import (
"github.com/DATA-DOG/go-sqlmock"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
v1 "kusionstack.io/kusion/pkg/apis/internal.kusion.io/v1"

v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/domain/entity"
)

Expand Down
Loading

0 comments on commit 5ca1c82

Please sign in to comment.