Merge pull request kelseyhightower#160 from kelseyhightower/add-exist…

…-function template: add exists function
ianwoolf · Oct 26, 2014 · 0649a6c · 0649a6c
2 parents 7b29dbb + 80afff1
commit 0649a6c
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 7 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/kelseyhightower/memkv/store.go b/Godeps/_workspace/src/github.com/kelseyhightower/memkv/store.go
diff --git a/docs/templates.md b/docs/templates.md
@@ -18,6 +18,16 @@ Alias for the path.Base function.
 {{end}}
 ```
 
+### exists
+
+Checks if the key exists. Return false if key is not found.
+
+```
+{{if exists "/key"}}
+    value: {{getv "/key"}}
+{{end}}
+```
+
 ### get
 
 Returns the KVPair where key matches its argument. Returns an error if key is not found.

diff --git a/integration/confdir/conf.d/exists.toml b/integration/confdir/conf.d/exists.toml
@@ -0,0 +1,7 @@
+[template]
+mode = "0644"
+src = "exists-test.conf.tmpl"
+dest = "/tmp/confd-exists-test.conf"
+keys = [
+  "/key",
+]
diff --git a/integration/confdir/templates/exists-test.conf.tmpl b/integration/confdir/templates/exists-test.conf.tmpl
@@ -0,0 +1,8 @@
+{{if exists "/key"}}
+    value: {{getv "/key"}}
+{{end}}
+
+{{if exists "/doesnotexist"}}
+    This line will not be printed
+    value: {{getv "/key"}}
+{{end}}
diff --git a/integration/etcd/test.sh b/integration/etcd/test.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+curl -L -X PUT http://127.0.0.1:4001/v2/keys/key -d value=foobar
 curl -L -X PUT http://127.0.0.1:4001/v2/keys/database/host -d value=127.0.0.1
 curl -L -X PUT http://127.0.0.1:4001/v2/keys/database/password -d value=p@sSw0rd
 curl -L -X PUT http://127.0.0.1:4001/v2/keys/database/port -d value=3306