Merge pull request #87 from suzuki-shunsuke/fix/fix-infinite-phase-de…

…tection

feat: support to read JSON and YAML

examples/data.yaml

@@ -0,0 +1,3 @@
+---
+# read from read_file.yaml
+message: hello

examples/read_file.json

@@ -0,0 +1,3 @@
+{
+  "name": "foo"
+}

examples/read_file.yaml

@@ -15,3 +15,31 @@ phases:
           {{with GetTaskByName .Tasks "foo"}}{{.File.Text}}{{end}}
     dependency:
     - foo
+  - name: json
+    read_file:
+      format: json
+      path: read_file.json
+  - name: output json
+    command:
+      command: |
+        echo "$FOO"
+      env:
+      - key: FOO
+        value: |
+          {{with GetTaskByName .Tasks "json"}}{{.File.Data.name}}{{end}}
+    dependency:
+    - json
+  - name: yaml
+    read_file:
+      format: yaml
+      path: data.yaml
+  - name: output yaml
+    command:
+      command: |
+        echo "$FOO"
+      env:
+      - key: FOO
+        value: |
+          {{with GetTaskByName .Tasks "yaml"}}{{.File.Data.message}}{{end}}
+    dependency:
+    - yaml

pkg/controller/task.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"io"
 	"time"
@@ -10,6 +11,8 @@ import (
 	"github.com/suzuki-shunsuke/buildflow/pkg/constant"
 	"github.com/suzuki-shunsuke/buildflow/pkg/domain"
 	"github.com/suzuki-shunsuke/buildflow/pkg/execute"
+	"github.com/suzuki-shunsuke/go-convmap/convmap"
+	"gopkg.in/yaml.v2"
 )
 
 type Task struct {
@@ -50,9 +53,37 @@ func (task Task) run(ctx context.Context, wd string) (domain.Result, error) {
 		}, err
 	case constant.ReadFile:
 		fileResult, err := task.FileReader.Read(task.Config.ReadFile.Path.Text)
-		return domain.Result{
+		result := domain.Result{
 			File: fileResult,
-		}, err
+		}
+		if err != nil {
+			return result, err
+		}
+		switch task.Config.ReadFile.Format {
+		case "":
+			return result, err
+		case "json":
+			var d interface{}
+			if err := json.Unmarshal([]byte(fileResult.Text), &d); err != nil {
+				return result, err
+			}
+			result.File.Data = d
+			return result, nil
+		case "yaml":
+			var d interface{}
+			if err := yaml.Unmarshal([]byte(fileResult.Text), &d); err != nil {
+				return result, err
+			}
+			a, err := convmap.Convert(d)
+			if err != nil {
+				return result, err
+			}
+			result.File.Data = a
+			return result, nil
+		// case "toml":
+		default:
+			return result, errors.New("invalid file.format: " + task.Config.ReadFile.Format)
+		}
 	case constant.WriteFile:
 		// TODO append a new line
 		fileResult, err := task.FileWriter.Write(

pkg/domain/domain.go

@@ -61,6 +61,7 @@ type FileResult struct {
 	Size    int64
 	Mode    os.FileMode
 	IsDir   bool
+	Data    interface{}
 }
 
 func (fileResult FileResult) ToTemplate() map[string]interface{} {
@@ -71,6 +72,7 @@ func (fileResult FileResult) ToTemplate() map[string]interface{} {
 		"ModTime": fileResult.ModTime,
 		"Size":    fileResult.Size,
 		"IsDir":   fileResult.IsDir,
+		"Data":    fileResult.Data,
 	}
 }