fix: vars expansion

23doors · 23doors · commit e0432ece922d · 2022-02-21T21:07:36.000+01:00
diff --git a/pkg/config/vars.go b/pkg/config/vars.go
@@ -3,10 +3,13 @@ package config
 import (
 	"bytes"
 	"encoding/json"
+	"regexp"
 
 	plugin_util "github.com/outblocks/outblocks-plugin-go/util"
 )
 
+var quoteValues = regexp.MustCompile(`(\s*-\s+|\S:\s+)(\$\{var\.[^}]+})`)
+
 type YAMLEvaluator struct {
 	*plugin_util.BaseVarEvaluator
 }
@@ -21,7 +24,9 @@ func NewYAMLEvaluator(vars map[string]interface{}) *YAMLEvaluator {
 }
 
 func (e *YAMLEvaluator) Expand(input []byte) ([]byte, error) {
+	input = quoteValues.ReplaceAll(input, []byte(`$1"$2"`))
 	format, _, err := e.ExpandRaw(input)
+
 	return format, err
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,13 @@ package config`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"encoding/json"`
	`6`	`+ "regexp"`
`6`	`7`
`7`	`8`	`plugin_util "github.com/outblocks/outblocks-plugin-go/util"`
`8`	`9`	`)`
`9`	`10`
	`11`	+var quoteValues = regexp.MustCompile(`(\s*-\s+\|\S:\s+)(\$\{var\.[^}]+})`)
	`12`	`+`
`10`	`13`	`type YAMLEvaluator struct {`
`11`	`14`	`*plugin_util.BaseVarEvaluator`
`12`	`15`	`}`
`@@ -21,7 +24,9 @@ func NewYAMLEvaluator(vars map[string]interface{}) *YAMLEvaluator {`
`21`	`24`	`}`
`22`	`25`
`23`	`26`	`func (e *YAMLEvaluator) Expand(input []byte) ([]byte, error) {`
	`27`	+ input = quoteValues.ReplaceAll(input, []byte(`$1"$2"`))
`24`	`28`	`format, _, err := e.ExpandRaw(input)`
	`29`	`+`
`25`	`30`	`return format, err`
`26`	`31`	`}`
`27`	`32`