Merge pull request #21 from segmentio/allow-special-characters-in-tem…

…plate-variables

add json template function to allow escaping of environment variables

load_test.go

@@ -338,6 +338,30 @@ points:
  }
 }
 
+func TestTemplateFunc(t *testing.T) {
+ const configFile = "/tmp/conf-json-test.yml"
+ ioutil.WriteFile(configFile, []byte(`---
+hello: {{ .NAME | json }}
+`), 0644)
+ defer os.Remove(configFile)
+
+ var cfg struct {
+ Hello string `conf:"hello"`
+ }
+
+ _, _, err := defaultLoader([]string{"test", "-config-file", configFile}, []string{
+ "NAME=first: Luke, second: Leia",
+ }).Load(&cfg)
+
+ if err != nil {
+ t.Error(err)
+ }
+
+ if cfg.Hello != "first: Luke, second: Leia" {
+ t.Error("bad value:", cfg.Hello)
+ }
+}
+
 func TestCommand(t *testing.T) {
  t.Run("Success", func(t *testing.T) {
  ld := Loader{

source.go

@@ -3,8 +3,10 @@ package conf
 import (
  "bytes"
  "flag"
- "html/template"
  "strings"
+ "text/template"
+
+ "github.com/segmentio/objconv/json"
 )
 
 // Source is the interface that allow new types to be plugged into a loader to
@@ -120,6 +122,13 @@ func (f *fileSource) Load(dst Map) (err error) {
  buf := &bytes.Buffer{}
  buf.Grow(len(b))
 
+ tpl = tpl.Funcs(template.FuncMap{
+ "json": func(v interface{}) (string, error) {
+ b, err := json.Marshal(v)
+ return string(b), err
+ },
+ })
+
  if _, err = tpl.Parse(string(b)); err != nil {
  return
  }