docs: update docs of config files

Signed-off-by: Bird <[email protected]>

Author: aFlyBird0

docs/best-practices/gitops.md

@@ -211,7 +211,7 @@ export DOCKERHUB_TOKEN="YOUR_DOCKERHUB_TOKEN_HERE"
 Run:
 
 ```bash
-./dtm init
+./dtm init -f config.yaml
 ```
 
 This downloads the required plugins, according to the config file, automatically.
@@ -233,7 +233,7 @@ You'll get some outputs similar to the following:
 Run:
 
 ```bash
-./dtm apply -y
+./dtm apply -f config.yaml -y
 ```
 
 You will see similar outputs as the following:
@@ -332,7 +332,7 @@ And accesses `localhost:8080` in your browser, you can see the deployed app retu
 Run:
 
 ```bash
-./dtm delete -y
+./dtm delete -f config.yaml -y
 ```
 
 And you will get similar outputs to the following:

docs/best-practices/gitops.zh.md

@@ -210,7 +210,7 @@ export DOCKERHUB_TOKEN="YOUR_DOCKERHUB_TOKEN_HERE"
 运行以下命令，以根据配置文件自动下载所需插件：
 
 ```bash
-./dtm init
+./dtm init -f config.yaml
 ```
 
 你会看到类似下面的输出：
@@ -230,7 +230,7 @@ export DOCKERHUB_TOKEN="YOUR_DOCKERHUB_TOKEN_HERE"
 运行：
 
 ```bash
-./dtm apply -y
+./dtm apply -f config.yaml -y
 ```
 
 你会看到类似下面的输出：
@@ -329,7 +329,7 @@ kubectl port-forward -n default svc/helloworld 8080:80
 运行：
 
 ```bash
-./dtm delete -y
+./dtm delete -f config.yaml -y
 ```
 
 你会看到如下的输出：

docs/commands/init.md

@@ -6,16 +6,18 @@ When running `dtm init`, it will download plugins from the AWS S3 bucket(through
 
 There are two ways to download plugins:
 
-1. from config file: download plugins according to the tool file in the config
+1. from config file: download plugins according to `tools` and `apps` in the config
 2. from command line: download plugins according to the command line arguments
 
 ## Downloading Plugins from Config File
 
-In this way, `dtm init` will download the required plugins according to the tool file in the config.
+In this way, `dtm init` will download the required plugins according to `tools` and `apps` in the config.
 
-**command:** `dtm init` or `dtm init -f <config file>`. The default config file path is `config.yaml`.
+**command:** `dtm init -f <config file/config dir>`.
 
-For config file, tool file, see the [config](../core-concepts/config.md) section of this documentation.
+You can put all the configuration in one file, or you can spread it out into multiple files in the same directory with `yaml` or `yaml` as a suffix.
+
+For config file, tools and apps, see the [config](../core-concepts/config.md) section of this documentation.
 
 ## Downloading Plugins from Command Line
 

docs/commands/init.zh.md

@@ -6,16 +6,18 @@
 
 `dtm` 提供了两种下载插件的方式：
 
-1. 根据配置文件：根据配置中的 tool file 下载插件
+1. 根据配置文件：根据配置中的 `tools` 和 `apps` 下载插件
 2. 根据命令行参数：根据命令行的参数下载插件
 
 ## 根据配置文件下载插件
 
-这种方式下，`dtm init` 将根据配置中的 tool file 下载需要的插件。
+这种方式下，`dtm init` 将根据配置中定义的 `tools` 和 `apps` 下载所需的插件。
 
-**命令：** `dtm init` 或 `dtm init -f <config file>`。默认的配置文件路径是 `config.yaml`。
+**命令：** `dtm init -f <config file/config dir>`。
 
-关于配置文件、tool file，详见[DevStream 配置](../core-concepts/config.zh.md)。
+你可以把所有的配置放在一个文件中，也可以把配置分散至同一个目录下的多个以 `yaml` 或 `yaml` 为后缀的文件中。
+
+关于配置文件、tools and apps，详见[DevStream 配置](../core-concepts/config.zh.md)。
 
 ## 根据命令行参数下载插件
 

docs/quickstart.md

@@ -74,7 +74,7 @@ Then we run the following commands to update our config file with those env vars
 Run:
 
 ```shell
-./dtm init
+./dtm init -f config.yaml
 ```
 
 !!! success "You should see some output similar to the following"
@@ -108,7 +108,7 @@ Run:
 Run:
 
 ```shell
-./dtm apply -y
+./dtm apply -f config.yaml -y
 ```
 
 !!! success "You should see similar output to the following"
@@ -156,7 +156,7 @@ The commits (made by DevStream when scaffolding the repo and creating workflows)
 Run:
 
 ```shell
-./dtm delete
+./dtm delete -f config.yaml
 ```
 
 Input `y` then press enter to continue, and you should see similar output:

docs/quickstart.zh.md

@@ -74,7 +74,7 @@ export DOCKERHUB_USERNAME="<YOUR_DOCKER_HUB_USER_NAME_HERE>"
 运行：
 
 ```shell
-./dtm init
+./dtm init -f config.yaml
 ```
 
 !!! success "你会看到类似下面的输出"
@@ -108,7 +108,7 @@ export DOCKERHUB_USERNAME="<YOUR_DOCKER_HUB_USER_NAME_HERE>"
 运行：
 
 ```shell
-./dtm apply -y
+./dtm apply -f config.yaml -y
 ```
 
 !!! success "你会看到类似下面的输出"
@@ -156,7 +156,7 @@ DevStream 在生成仓库脚手架和创建工作流时的代码提交，已经
 运行：
 
 ```shell
-./dtm delete
+./dtm delete -f config.yaml
 ```
 
 输入 `y` 然后回车，你会看到类似下面的输出：

pkg/util/file/yaml_test.go

@@ -270,10 +270,12 @@ var _ = Describe("ReadYamls func", func() {
 			const subDir = "subdir/subsubdir"
 			filePath = filepath.Join(tempDir, subDir, "test.yml")
 			err := os.MkdirAll(filepath.Dir(filePath), 0755)
+			Expect(err).Error().ShouldNot(HaveOccurred())
 			f, err := os.Create(filePath)
 			Expect(err).Error().ShouldNot(HaveOccurred())
 			defer f.Close()
 			_, err = f.WriteString(contents[len(contents)-1])
+			Expect(err).Error().ShouldNot(HaveOccurred())
 		})
 		It("should return all contents", func() {
 			filePath = tempDir