refactor: use workspace types with v1 pkg (#713)

KusionStack · Dec 21, 2023 · d9db45a · d9db45a
1 parent e101055
commit d9db45a
Show file tree

Hide file tree

Showing 24 changed files with 307 additions and 494 deletions.
diff --git a/pkg/apis/workspace/types.go b/pkg/apis/workspace/types.go
diff --git a/pkg/cmd/build/builders/appconfig_builder.go b/pkg/cmd/build/builders/appconfig_builder.go
@@ -1,18 +1,18 @@
 package builders
 
 import (
+	"kusionstack.io/kusion/pkg/apis/core/v1"
 	"kusionstack.io/kusion/pkg/apis/intent"
 	"kusionstack.io/kusion/pkg/apis/project"
 	"kusionstack.io/kusion/pkg/apis/stack"
-	"kusionstack.io/kusion/pkg/apis/workspace"
 	"kusionstack.io/kusion/pkg/modules"
 	"kusionstack.io/kusion/pkg/modules/generators"
 	"kusionstack.io/kusion/pkg/modules/inputs"
 )
 
 type AppsConfigBuilder struct {
 	Apps      map[string]inputs.AppConfiguration
-	Workspace *workspace.Workspace
+	Workspace *v1.Workspace
 }
 
 func (acg *AppsConfigBuilder) Build(

diff --git a/pkg/cmd/build/builders/appconfig_builder_test.go b/pkg/cmd/build/builders/appconfig_builder_test.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"kusionstack.io/kusion/pkg/apis/core/v1"
 	"kusionstack.io/kusion/pkg/apis/project"
 	"kusionstack.io/kusion/pkg/apis/stack"
-	"kusionstack.io/kusion/pkg/apis/workspace"
 	appmodel "kusionstack.io/kusion/pkg/modules/inputs"
 	"kusionstack.io/kusion/pkg/modules/inputs/workload"
 	"kusionstack.io/kusion/pkg/modules/inputs/workload/network"
@@ -50,38 +50,38 @@ func buildMockApp() (string, *appmodel.AppConfiguration) {
 	}
 }
 
-func buildMockWorkspace() *workspace.Workspace {
-	return &workspace.Workspace{
+func buildMockWorkspace() *v1.Workspace {
+	return &v1.Workspace{
 		Name: "test",
-		Modules: workspace.ModuleConfigs{
+		Modules: v1.ModuleConfigs{
 			"database": {
-				Default: workspace.GenericConfig{
+				Default: v1.GenericConfig{
 					"type":         "aws",
 					"version":      "5.7",
 					"instanceType": "db.t3.micro",
 				},
-				ModulePatcherConfigs: workspace.ModulePatcherConfigs{
+				ModulePatcherConfigs: v1.ModulePatcherConfigs{
 					"smallClass": {
-						GenericConfig: workspace.GenericConfig{
+						GenericConfig: v1.GenericConfig{
 							"instanceType": "db.t3.small",
 						},
 						ProjectSelector: []string{"foo", "bar"},
 					},
 				},
 			},
 			"port": {
-				Default: workspace.GenericConfig{
+				Default: v1.GenericConfig{
 					"type": "aws",
 				},
 			},
 		},
-		Runtimes: &workspace.RuntimeConfigs{
-			Kubernetes: &workspace.KubernetesConfig{
+		Runtimes: &v1.RuntimeConfigs{
+			Kubernetes: &v1.KubernetesConfig{
 				KubeConfig: "/etc/kubeconfig.yaml",
 			},
 		},
-		Backends: &workspace.BackendConfigs{
-			Local: &workspace.LocalFileConfig{},
+		Backends: &v1.BackendConfigs{
+			Local: &v1.LocalFileConfig{},
 		},
 	}
 }

diff --git a/pkg/cmd/build/util_test.go b/pkg/cmd/build/util_test.go
@@ -10,10 +10,10 @@ import (
 	"github.com/stretchr/testify/require"
 	kclgo "kcl-lang.io/kcl-go"
 
+	"kusionstack.io/kusion/pkg/apis/core/v1"
 	"kusionstack.io/kusion/pkg/apis/intent"
 	"kusionstack.io/kusion/pkg/apis/project"
 	"kusionstack.io/kusion/pkg/apis/stack"
-	workspaceapi "kusionstack.io/kusion/pkg/apis/workspace"
 	"kusionstack.io/kusion/pkg/cmd/build/builders"
 	"kusionstack.io/kusion/pkg/cmd/build/builders/kcl"
 	appconfigmodel "kusionstack.io/kusion/pkg/modules/inputs"
@@ -121,37 +121,37 @@ resources:
 		},
 	}
 
-	ws = &workspaceapi.Workspace{
+	ws = &v1.Workspace{
 		Name: "default",
-		Modules: workspaceapi.ModuleConfigs{
+		Modules: v1.ModuleConfigs{
 			"database": {
-				Default: workspaceapi.GenericConfig{
+				Default: v1.GenericConfig{
 					"type":         "aws",
 					"version":      "5.7",
 					"instanceType": "db.t3.micro",
 				},
-				ModulePatcherConfigs: workspaceapi.ModulePatcherConfigs{
+				ModulePatcherConfigs: v1.ModulePatcherConfigs{
 					"smallClass": {
-						GenericConfig: workspaceapi.GenericConfig{
+						GenericConfig: v1.GenericConfig{
 							"instanceType": "db.t3.small",
 						},
 						ProjectSelector: []string{"foo", "bar"},
 					},
 				},
 			},
 			"port": {
-				Default: workspaceapi.GenericConfig{
+				Default: v1.GenericConfig{
 					"type": "aws",
 				},
 			},
 		},
-		Runtimes: &workspaceapi.RuntimeConfigs{
-			Kubernetes: &workspaceapi.KubernetesConfig{
+		Runtimes: &v1.RuntimeConfigs{
+			Kubernetes: &v1.KubernetesConfig{
 				KubeConfig: "/etc/kubeconfig.yaml",
 			},
 		},
-		Backends: &workspaceapi.BackendConfigs{
-			Local: &workspaceapi.LocalFileConfig{},
+		Backends: &v1.BackendConfigs{
+			Local: &v1.LocalFileConfig{},
 		},
 	}
 )