document the base template function

jhmartin · Jul 9, 2014 · ee08724 · ee08724
1 parent 5fed4ea
commit ee08724
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/docs/templates.md b/docs/templates.md
@@ -7,6 +7,17 @@ Templates are written in Go's [`text/template`](http://golang.org/pkg/text/templ
 
 ## Template Functions
 
+### base
+
+Alias for the path.Base function.
+
+```
+{{with get "/key"}}
+    key: {{base .Key}}
+    value: {{.Value}}
+{{end}}
+```
+
 ### get
 
 Returns the KVPair where key matches its argument.

diff --git a/integration/confdir/conf.d/basic.toml b/integration/confdir/conf.d/basic.toml
@@ -1,3 +1,4 @@
+[template]
 mode = "0644"
 src = "basic.conf.tmpl"
 dest = "/tmp/confd-basic-test.conf"

diff --git a/integration/confdir/conf.d/iteration.toml b/integration/confdir/conf.d/iteration.toml
@@ -1,3 +1,4 @@
+[template]
 mode = "0644"
 src = "iteration.conf.tmpl"
 dest = "/tmp/confd-iteration-test.conf"

diff --git a/integration/confdir/templates/iteration.conf.tmpl b/integration/confdir/templates/iteration.conf.tmpl
@@ -1,6 +1,6 @@
 upstream app {
-{{range getvs "/upstream/*"}}  
-  server {{.}};
+{{range gets "/upstream/*"}}  
+  server {{.Value}};
 {{end}}
 }
 

diff --git a/integration/etcd/test.sh b/integration/etcd/test.sh
@@ -15,4 +15,4 @@ curl -L -X PUT http://127.0.0.1:4001/v2/keys/prefix/upstream/app2 -d value=10.0.
 
 
 # Run confd
-./confd -verbose -onetime -confdir ./integration/confdir -backend etcd -node 127.0.0.1:4001
+./confd -verbose -debug -onetime -confdir ./integration/confdir -backend etcd -node 127.0.0.1:4001
diff --git a/resource/template/resource.go b/resource/template/resource.go
@@ -114,6 +114,7 @@ func (t *TemplateResource) createStageFile() error {
 
 	// Add template functions
 	tplFuncMap := make(template.FuncMap)
+	tplFuncMap["base"] = path.Base
 	tplFuncMap["get"] = t.store.Get
 	tplFuncMap["gets"] = t.store.GetAll
 	tplFuncMap["getv"] = t.store.GetValue
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,4 @@ curl -L -X PUT http://127.0.0.1:4001/v2/keys/prefix/upstream/app2 -d value=10.0.


		# Run confd
		./confd -verbose -onetime -confdir ./integration/confdir -backend etcd -node 127.0.0.1:4001
		./confd -verbose -debug -onetime -confdir ./integration/confdir -backend etcd -node 127.0.0.1:4001