From f9e1634386462d0c55bddfc1048ed1b1a0494319 Mon Sep 17 00:00:00 2001
From: Rohith <gambol99@gmail.com>
Date: Wed, 13 Jul 2016 15:08:33 +0100
Subject: [PATCH] - fixing the enviroment variable expansion to permit
 underscores

---
 main.go                 | 2 +-
 vault_resources.go      | 2 +-
 vault_resources_test.go | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/main.go b/main.go
index c4b97d8..16ace89 100644
--- a/main.go
+++ b/main.go
@@ -26,7 +26,7 @@ import (
 
 const (
 	Prog    = "vault-sidekick"
-	Version = "v0.1.1"
+	Version = "v0.1.2"
 )
 
 func main() {
diff --git a/vault_resources.go b/vault_resources.go
index ce88bde..83f5b40 100644
--- a/vault_resources.go
+++ b/vault_resources.go
@@ -26,7 +26,7 @@ import (
 )
 
 var (
-	envRegex = regexp.MustCompile("%[[:alnum:]]+%")
+	envRegex = regexp.MustCompile("%[[:alnum:]_]+%")
 )
 
 // VaultResources is a collection of type resource
diff --git a/vault_resources_test.go b/vault_resources_test.go
index 6cd2f42..5a52c88 100644
--- a/vault_resources_test.go
+++ b/vault_resources_test.go
@@ -36,6 +36,7 @@ func TestSetResources(t *testing.T) {
 	assert.Nil(t, items.Set("pki:example-dot-com:common_name=blah.example.com,renew=true"))
 	assert.Nil(t, items.Set("secret:secrets/%ENV%/me:file=filename.test,fmt=yaml"))
 
+
 	assert.NotNil(t, items.Set("secret:"))
 	assert.NotNil(t, items.Set("secret:test:file=filename.test,fmt="))
 	assert.NotNil(t, items.Set("secret::file=filename.test,fmt=yaml"))
@@ -75,6 +76,13 @@ func TestSetEnvironmentResource(t *testing.T) {
 				"THING": "yes",
 			},
 		},
+		{
+			ResourceText: "secret:secrets/%KUBERNETES_NAMESPACE%/me:file=filename.test,fmt=yaml",
+			ExpectedPath: "secrets/dev/me",
+			Vars: map[string]string{
+				"KUBERNETES_NAMESPACE":   "dev",
+			},
+		},
 	}
 
 	for i, c := range tests {