support merge of values into same namespace

Oleg Sucharevich · Oleg Sucharevich · commit e737d7657c00 · 2019-08-21T19:36:26.000+03:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.0
+0.8.0
diff --git a/cmd/render.go b/cmd/render.go
@@ -25,7 +25,7 @@ var renderCmd = &cobra.Command{
 	Use: "render",
 	Run: func(cmd *cobra.Command, args []string) {
 		templateReaders := make(map[string]io.Reader)
-		valueReaders := make(map[string]io.Reader)
+		valueReaders := make(map[string][]io.Reader)
 		log := logger.New(nil)
 		if len(renderCmdOptions.templates) == 0 {
 			dieOnError(fmt.Errorf("No tempalte given"), log)
@@ -51,7 +51,11 @@ var renderCmd = &cobra.Command{
 				} else {
 					valueReader = file
 				}
-				valueReaders[renderCmdOptions.rootContext] = valueReader
+				if _, ok := valueReaders[renderCmdOptions.rootContext]; !ok {
+					valueReaders[renderCmdOptions.rootContext] = []io.Reader{valueReader}
+				} else {
+					valueReaders[renderCmdOptions.rootContext] = append(valueReaders[renderCmdOptions.rootContext], valueReader)
+				}
 			} else {
 				file, err = os.Open(values[1])
 				dieOnError(err, log)
@@ -61,7 +65,11 @@ var renderCmd = &cobra.Command{
 				} else {
 					valueReader = file
 				}
-				valueReaders[values[0]] = valueReader
+				if _, ok := valueReaders[values[0]]; !ok {
+					valueReaders[values[0]] = []io.Reader{valueReader}
+				} else {
+					valueReaders[values[0]] = append(valueReaders[values[0]], valueReader)
+				}
 			}
 			defer file.Close()
 		}
@@ -84,6 +92,6 @@ func init() {
 	renderCmd.Flags().StringArrayVar(&renderCmdOptions.templates, "template", []string{}, "Path to template file")
 	renderCmd.Flags().StringArrayVar(&renderCmdOptions.values, "value", []string{}, "Path to value file")
 	renderCmd.Flags().StringVar(&renderCmdOptions.rootContext, "root-namespace", "Values", "Name of the root namespace (default: Values)")
-	renderCmd.Flags().StringVar(&renderCmdOptions.leftDelim, "left-delim", "<<", "Left delimiter (default: <<)")
-	renderCmd.Flags().StringVar(&renderCmdOptions.rightDelim, "right-delim", ">>", "Right delimiter (default: >>)")
+	renderCmd.Flags().StringVar(&renderCmdOptions.leftDelim, "left-delim", "{{", "Left delimiter (default: <<)")
+	renderCmd.Flags().StringVar(&renderCmdOptions.rightDelim, "right-delim", "}}", "Right delimiter (default: >>)")
 }
diff --git a/examples/multiple-files/README.md b/examples/multiple-files/README.md
@@ -0,0 +1 @@
+Run: `pikolo render --template examples/with-namespace/template --value Context=examples/with-namespace/values.yaml`
diff --git a/examples/multiple-files/run.sh b/examples/multiple-files/run.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+pikolo render \
+    --template examples/multiple-files/templates/t1 \
+    --template examples/multiple-files/templates/t2 \
+    --value examples/multiple-files/values/values.yaml \
+    --value examples/multiple-files/values/values_2.json
diff --git a/examples/multiple-files/templates/t1 b/examples/multiple-files/templates/t1
@@ -0,0 +1,3 @@
+steps:
+  step_1:
+    image: {{ .Values.image }}
diff --git a/examples/multiple-files/templates/t2 b/examples/multiple-files/templates/t2
@@ -0,0 +1,3 @@
+steps:
+  step_1:
+    image: {{ .Values.key }}
diff --git a/examples/multiple-files/values/values.yaml b/examples/multiple-files/values/values.yaml
@@ -0,0 +1 @@
+image: alpine:3.8
diff --git a/examples/multiple-files/values/values_2.json b/examples/multiple-files/values/values_2.json
@@ -0,0 +1,3 @@
+{
+    "key": "value"
+}
diff --git a/go.mod b/go.mod
@@ -18,6 +18,7 @@ require (
 	github.com/hairyhenderson/toml v0.3.0 // indirect
 	github.com/hashicorp/consul/api v1.1.0 // indirect
 	github.com/hashicorp/vault/api v1.0.4 // indirect
+	github.com/imdario/mergo v0.3.7
 	github.com/inconshreveable/log15 v0.0.0-20180818164646-67afb5ed74ec
 	github.com/joho/godotenv v1.3.0 // indirect
 	github.com/mattn/go-colorable v0.1.2 // indirect
diff --git a/go.sum b/go.sum
@@ -108,6 +108,8 @@ github.com/hashicorp/vault/sdk v0.1.13 h1:mOEPeOhT7jl0J4AMl1E705+BcmeRs1VmKNb9F0
 github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
+github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/log15 v0.0.0-20180818164646-67afb5ed74ec h1:CGkYB1Q7DSsH/ku+to+foV4agt2F2miquaLUgF6L178=
 github.com/inconshreveable/log15 v0.0.0-20180818164646-67afb5ed74ec/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
diff --git a/pkg/renderer/renderer.go b/pkg/renderer/renderer.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/ghodss/yaml"
 	"github.com/hairyhenderson/gomplate"
+	"github.com/imdario/mergo"
 )
 
 type (
@@ -18,7 +19,7 @@ type (
 
 	Options struct {
 		TemplateReaders map[string]io.Reader
-		ValueReaders    map[string]io.Reader
+		ValueReaders    map[string][]io.Reader
 		RootNamespace   string
 		LeftDelim       string
 		RightDelim      string
@@ -29,7 +30,7 @@ type (
 
 	renderer struct {
 		templateReaders map[string]io.Reader
-		valueReaders    map[string]io.Reader
+		valueReaders    map[string][]io.Reader
 		leftDelim       string
 		rightDelim      string
 		name            string
@@ -59,15 +60,19 @@ func (r *renderer) Render() (*bytes.Buffer, error) {
 		content = append(content, string(res))
 	}
 
-	for name, reader := range r.valueReaders {
+	for name, readers := range r.valueReaders {
 		vals := Values{}
-		res, err := ioutil.ReadAll(reader)
-		if err != nil {
-			return nil, err
-		}
-		err = yaml.Unmarshal([]byte(string(res)), &vals)
-		if err != nil {
-			return nil, err
+		for _, reader := range readers {
+			v := Values{}
+			res, err := ioutil.ReadAll(reader)
+			if err != nil {
+				return nil, err
+			}
+			err = yaml.Unmarshal([]byte(string(res)), &v)
+			if err != nil {
+				return nil, err
+			}
+			mergo.Merge(&vals, v)
 		}
 		root[name] = vals
 
diff --git a/pkg/renderer/renderer_test.go b/pkg/renderer/renderer_test.go
@@ -14,7 +14,7 @@ func Test_renderer_Render(t *testing.T) {
 	tests := []struct {
 		name            string
 		templateReaders map[string]io.Reader
-		valueReaders    map[string]io.Reader
+		valueReaders    map[string][]io.Reader
 		wantErr         bool
 		result          *bytes.Buffer
 	}{
@@ -27,8 +27,8 @@ func Test_renderer_Render(t *testing.T) {
 			templateReaders: map[string]io.Reader{
 				"key": strings.NewReader("{{ .Values.key }}\n"),
 			},
-			valueReaders: map[string]io.Reader{
-				"Values": strings.NewReader("key: value"),
+			valueReaders: map[string][]io.Reader{
+				"Values": []io.Reader{strings.NewReader("key: value")},
 			},
 			name:    "Render",
 			wantErr: false,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Run: `pikolo render --template examples/with-namespace/template --value Context=examples/with-namespace/values.yaml`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+steps:`
	`2`	`+ step_1:`
	`3`	`+ image: {{ .Values.image }}`