fix: e2e example test cases.

Peefy · Peefy · commit 0c6b610524e0 · 2023-07-11T22:34:51.000+08:00
diff --git a/cheatsheet/cheatsheet.tex b/cheatsheet/cheatsheet.tex
@@ -562,7 +562,7 @@
 \offset
 
 \begin{lstlisting}
-# kcl -DbankCard=123 employee.k
+# kcl employee.k -D bankCard=123
 bankCard = option("bankCard")
 
 # kcl main.k -D list_key='[1,2,3]' -D dict_key='{"key":"value"}'
diff --git a/docs/reference/lang/codelab/simple.md b/docs/reference/lang/codelab/simple.md
@@ -419,7 +419,7 @@ service = "my-service"
 Run with KCL, we will see the generated data in yaml format as below:
 
 ```bash
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
@@ -468,7 +468,7 @@ Run with KCL, we will see the generated data in yaml format as below:
 KCL command:
 
 ```bash
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
diff --git a/docs/reference/lang/tour.md b/docs/reference/lang/tour.md
@@ -2888,7 +2888,7 @@ bankCard = option("bankCard")  # Get bankCard through the option function.
 Then we can use the module as below:
 
 ```bash
-kcl -DbankCard=123 employee.k
+kcl employee.k -D bankCard=123
 ```
 
 Currently, supported types of top-level argument are number, string, bool, list and dict.
diff --git a/examples/abstraction/app.k b/examples/abstraction/app.k
@@ -24,7 +24,7 @@ schema Container:
     args?: [str]
     env?: [Env]
     volumes?: [Volume]
-    resources: Resource
+    resources?: Resource
     ports: [ContainerPort]
 
 schema ContainerPort:
diff --git a/examples/codelab/Makefile b/examples/codelab/Makefile
@@ -0,0 +1,4 @@
+test:
+	make -C simple
+	make -C schema
+	make -C collaborative
diff --git a/examples/codelab/collaborative/makefile b/examples/codelab/collaborative/makefile
@@ -6,3 +6,8 @@ dev:
 
 prod:
 	cd appops/test_app/prod && kcl -Y ./kcl.yaml
+
+default:
+	make base
+	make dev
+	make prod
diff --git a/examples/codelab/simple/makefile b/examples/codelab/simple/makefile
@@ -1,5 +1,5 @@
 default:
-	kcl -D priority=1 -D env=pre-prod my_config.k
+	kcl my_config.k -D priority=1 -D env='pre-prod'
 
 test:
-	kcl -D priority=1 -D env=pre-prod my_config_test.k
+	kcl my_config_test.k -D priority=1 -D env='pre-prod' 
diff --git a/examples/kubernetes/Makefile b/examples/kubernetes/Makefile
@@ -0,0 +1,2 @@
+test:
+	make -C generate-manifests
diff --git a/examples/kubernetes/generate-manifests/Makefile b/examples/kubernetes/generate-manifests/Makefile
@@ -0,0 +1,2 @@
+default:
+	kcl main.k -Y kcl.yaml
diff --git a/examples/package-management/git/my_package/main.k b/examples/package-management/git/my_package/main.k
@@ -1,4 +1,4 @@
-import konfig.base.pkg.k8spkg.api.apps.v1 as apps
+import konfig.base.pkg.kusion_kubernetes.api.apps.v1 as apps
 
 apps.Deployment {
     metadata.name = "nginx-deployment"
diff --git a/examples/test.sh b/examples/test.sh
@@ -13,11 +13,12 @@ pwd=$(
     pwd
 )
 
-for path in "configuration" "validation" "abstraction" "definition" "mutation" "data-integration" "automation" "package-management"; do
+for path in "configuration" "validation" "abstraction" "definition" "mutation" "data-integration" "automation" "package-management" "kubernetes" "codelab"; do
     echo "\033[1mTesting $path ...\033[0m"
     if (cd $pwd/$path && make test); then
         echo "\033[32mTest SUCCESSED - $path\033[0m\n"
     else
         echo "\033[31mTest FAILED - $path\033[0m\n"
+        exit 1
     fi
 done
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/current/reference/lang/codelab/simple.md b/i18n/zh-CN/docusaurus-plugin-content-docs/current/reference/lang/codelab/simple.md
@@ -419,7 +419,7 @@ service = "my-service"
 使用 KCL 运行上述代码，将会看到以 yaml 格式生成的如下数据：
 
 ```bash
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 标准输出:
@@ -468,7 +468,7 @@ service = "my-service"
 KCL 命令:
 
 ```bash
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 标准输出：
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/current/reference/lang/tour.md b/i18n/zh-CN/docusaurus-plugin-content-docs/current/reference/lang/tour.md
@@ -2803,7 +2803,7 @@ bankCard = option("bankCard")  # Get bankCard through the option function.
 我们可以如下使用 module：
 
 ```bash
-kcl -DbankCard=123 employee.k
+kcl employee.k -D bankCard=123
 ```
 
 目前，支持顶级参数的类型有数字、字符串、布尔、列表和字典。
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.3/reference/lang/codelab/simple.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.3/reference/lang/codelab/simple.md
@@ -419,7 +419,7 @@ service = "my-service"
 Run with KCL, we will see the generated data in yaml format as below:
 
 ```
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
@@ -468,7 +468,7 @@ Run with KCL, we will see the generated data in yaml format as below:
 KCL command:
 
 ```
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.3/reference/lang/tour.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.3/reference/lang/tour.md
@@ -2785,7 +2785,7 @@ bankCard = option("bankCard")  # Get bankCard through the option function.
 我们可以如下使用 module：
 
 ```
-kcl -DbankCard=123 employee.k
+kcl employee.k -D bankCard=123
 ```
 
 目前，支持顶级参数的类型有数字、字符串、布尔、列表和字典。
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.4/reference/lang/codelab/simple.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.4/reference/lang/codelab/simple.md
@@ -419,7 +419,7 @@ service = "my-service"
 Run with KCL, we will see the generated data in yaml format as below:
 
 ```
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
@@ -468,7 +468,7 @@ Run with KCL, we will see the generated data in yaml format as below:
 KCL command:
 
 ```
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.4/reference/lang/tour.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.4/reference/lang/tour.md
@@ -2785,7 +2785,7 @@ bankCard = option("bankCard")  # Get bankCard through the option function.
 我们可以如下使用 module：
 
 ```
-kcl -DbankCard=123 employee.k
+kcl employee.k -D bankCard=123
 ```
 
 目前，支持顶级参数的类型有数字、字符串、布尔、列表和字典。
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.5/reference/lang/codelab/simple.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.5/reference/lang/codelab/simple.md
@@ -419,7 +419,7 @@ service = "my-service"
 Run with KCL, we will see the generated data in yaml format as below:
 
 ```
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
@@ -468,7 +468,7 @@ Run with KCL, we will see the generated data in yaml format as below:
 KCL command:
 
 ```
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.5/reference/lang/tour.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.5/reference/lang/tour.md
@@ -2803,7 +2803,7 @@ bankCard = option("bankCard")  # Get bankCard through the option function.
 我们可以如下使用 module：
 
 ```
-kcl -DbankCard=123 employee.k
+kcl employee.k -D bankCard=123
 ```
 
 目前，支持顶级参数的类型有数字、字符串、布尔、列表和字典。
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.6/reference/lang/codelab/simple.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.6/reference/lang/codelab/simple.md
@@ -419,7 +419,7 @@ service = "my-service"
 使用 KCL 运行上述代码，将会看到以 yaml 格式生成的如下数据：
 
 ```bash
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 标准输出:
@@ -468,7 +468,7 @@ service = "my-service"
 KCL 命令:
 
 ```bash
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 标准输出：
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.6/reference/lang/tour.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.4.6/reference/lang/tour.md
@@ -2803,7 +2803,7 @@ bankCard = option("bankCard")  # Get bankCard through the option function.
 我们可以如下使用 module：
 
 ```bash
-kcl -DbankCard=123 employee.k
+kcl employee.k -D bankCard=123
 ```
 
 目前，支持顶级参数的类型有数字、字符串、布尔、列表和字典。
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.5.0/reference/lang/codelab/simple.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.5.0/reference/lang/codelab/simple.md
@@ -419,7 +419,7 @@ service = "my-service"
 使用 KCL 运行上述代码，将会看到以 yaml 格式生成的如下数据：
 
 ```bash
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 标准输出:
@@ -468,7 +468,7 @@ service = "my-service"
 KCL 命令:
 
 ```bash
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 标准输出：
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.5.0/reference/lang/tour.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-0.5.0/reference/lang/tour.md
@@ -2803,7 +2803,7 @@ bankCard = option("bankCard")  # Get bankCard through the option function.
 我们可以如下使用 module：
 
 ```bash
-kcl -DbankCard=123 employee.k
+kcl employee.k -D bankCard=123
 ```
 
 目前，支持顶级参数的类型有数字、字符串、布尔、列表和字典。
diff --git a/versioned_docs/version-0.4.3/reference/lang/codelab/simple.md b/versioned_docs/version-0.4.3/reference/lang/codelab/simple.md
@@ -419,7 +419,7 @@ service = "my-service"
 Run with KCL, we will see the generated data in yaml format as below:
 
 ```
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
@@ -468,7 +468,7 @@ Run with KCL, we will see the generated data in yaml format as below:
 KCL command:
 
 ```
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
diff --git a/versioned_docs/version-0.4.3/reference/lang/tour.md b/versioned_docs/version-0.4.3/reference/lang/tour.md
@@ -2868,7 +2868,7 @@ bankCard = option("bankCard")  # Get bankCard through the option function.
 Then we can use the module as below:
 
 ```
-kcl -DbankCard=123 employee.k
+kcl employee.k -D bankCard=123
 ```
 
 Currently, supported types of top-level argument are number, string, bool, list and dict.
diff --git a/versioned_docs/version-0.4.4/reference/lang/codelab/simple.md b/versioned_docs/version-0.4.4/reference/lang/codelab/simple.md
@@ -419,7 +419,7 @@ service = "my-service"
 Run with KCL, we will see the generated data in yaml format as below:
 
 ```
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
@@ -468,7 +468,7 @@ Run with KCL, we will see the generated data in yaml format as below:
 KCL command:
 
 ```
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
diff --git a/versioned_docs/version-0.4.4/reference/lang/tour.md b/versioned_docs/version-0.4.4/reference/lang/tour.md
@@ -2868,7 +2868,7 @@ bankCard = option("bankCard")  # Get bankCard through the option function.
 Then we can use the module as below:
 
 ```
-kcl -DbankCard=123 employee.k
+kcl employee.k -D bankCard=123
 ```
 
 Currently, supported types of top-level argument are number, string, bool, list and dict.
diff --git a/versioned_docs/version-0.4.5/reference/lang/codelab/simple.md b/versioned_docs/version-0.4.5/reference/lang/codelab/simple.md
@@ -419,7 +419,7 @@ service = "my-service"
 Run with KCL, we will see the generated data in yaml format as below:
 
 ```
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
@@ -468,7 +468,7 @@ Run with KCL, we will see the generated data in yaml format as below:
 KCL command:
 
 ```
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
diff --git a/versioned_docs/version-0.4.5/reference/lang/tour.md b/versioned_docs/version-0.4.5/reference/lang/tour.md
@@ -2886,7 +2886,7 @@ bankCard = option("bankCard")  # Get bankCard through the option function.
 Then we can use the module as below:
 
 ```
-kcl -DbankCard=123 employee.k
+kcl employee.k -D bankCard=123
 ```
 
 Currently, supported types of top-level argument are number, string, bool, list and dict.
diff --git a/versioned_docs/version-0.4.6/reference/lang/codelab/simple.md b/versioned_docs/version-0.4.6/reference/lang/codelab/simple.md
@@ -419,7 +419,7 @@ service = "my-service"
 Run with KCL, we will see the generated data in yaml format as below:
 
 ```bash
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
@@ -468,7 +468,7 @@ Run with KCL, we will see the generated data in yaml format as below:
 KCL command:
 
 ```bash
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
diff --git a/versioned_docs/version-0.4.6/reference/lang/tour.md b/versioned_docs/version-0.4.6/reference/lang/tour.md
@@ -2888,7 +2888,7 @@ bankCard = option("bankCard")  # Get bankCard through the option function.
 Then we can use the module as below:
 
 ```bash
-kcl -DbankCard=123 employee.k
+kcl employee.k -D bankCard=123
 ```
 
 Currently, supported types of top-level argument are number, string, bool, list and dict.
diff --git a/versioned_docs/version-0.5.0/reference/lang/codelab/simple.md b/versioned_docs/version-0.5.0/reference/lang/codelab/simple.md
@@ -419,7 +419,7 @@ service = "my-service"
 Run with KCL, we will see the generated data in yaml format as below:
 
 ```bash
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
@@ -468,7 +468,7 @@ Run with KCL, we will see the generated data in yaml format as below:
 KCL command:
 
 ```bash
-kcl -D priority=2 -D env=pre-prod my_config.k
+kcl my_config.k -D priority=2 -D env=pre-prod
 ```
 
 Stdout:
diff --git a/versioned_docs/version-0.5.0/reference/lang/tour.md b/versioned_docs/version-0.5.0/reference/lang/tour.md
@@ -2888,7 +2888,7 @@ bankCard = option("bankCard")  # Get bankCard through the option function.
 Then we can use the module as below:
 
 ```bash
-kcl -DbankCard=123 employee.k
+kcl employee.k -D bankCard=123
 ```
 
 Currently, supported types of top-level argument are number, string, bool, list and dict.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+test:`
	`2`	`+ make -C generate-manifests`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+default:`
	`2`	`+ kcl main.k -Y kcl.yaml`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import konfig.base.pkg.k8spkg.api.apps.v1 as apps`
	`1`	`+import konfig.base.pkg.kusion_kubernetes.api.apps.v1 as apps`
`2`	`2`
`3`	`3`	`apps.Deployment {`
`4`	`4`	`metadata.name = "nginx-deployment"`