From 9786a52e0972b047dabbe7ae39b489347729e214 Mon Sep 17 00:00:00 2001
From: Rohith <gambol99@gmail.com>
Date: Wed, 13 Jul 2016 15:55:50 +0100
Subject: [PATCH] - switching to using the os.ExpandEnv methods rather than
 tokenizing the string - updated the readme to reflect the changes

---
 README.md               |  2 +-
 main.go                 |  2 +-
 vault_resources.go      | 15 +--------------
 vault_resources_test.go | 15 ++++++++-------
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 6d2d950..7ad2464 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ The sidekick supports the following resource types: mysql, postgres, pki, aws, s
 **Environment Variable Expansion**
 
 The resource paths can contain environment variables which the sidekick will resolve beforehand. A use case being, using a environment
-or domain within the resource e.g -cn=secret:secrets/myservice/%ENV%/config:fmt=yaml
+or domain within the resource e.g -cn=secret:secrets/myservice/${ENV}/config:fmt=yaml
 
 **Output Formatting**
 
diff --git a/main.go b/main.go
index 16ace89..4ead1b6 100644
--- a/main.go
+++ b/main.go
@@ -26,7 +26,7 @@ import (
 
 const (
 	Prog    = "vault-sidekick"
-	Version = "v0.1.2"
+	Version = "v0.2.0"
 )
 
 func main() {
diff --git a/vault_resources.go b/vault_resources.go
index 83f5b40..2980185 100644
--- a/vault_resources.go
+++ b/vault_resources.go
@@ -25,10 +25,6 @@ import (
 	"time"
 )
 
-var (
-	envRegex = regexp.MustCompile("%[[:alnum:]_]+%")
-)
-
 // VaultResources is a collection of type resource
 type VaultResources struct {
 	// an array of resource to retrieve
@@ -41,7 +37,7 @@ func (r *VaultResources) Set(value string) error {
 	rn := defaultVaultResource()
 
 	// step: split on the ':'
-	items := strings.Split(value, ":")
+	items := strings.Split(os.ExpandEnv(value), ":")
 	if len(items) < 2 {
 		return fmt.Errorf("invalid resource, must have at least two sections TYPE:PATH")
 	}
@@ -52,15 +48,6 @@ func (r *VaultResources) Set(value string) error {
 		return fmt.Errorf("invalid resource, neither type or path can be empty")
 	}
 
-	// step: look for any token in the resource
-	tokens := envRegex.FindAllStringSubmatch(items[1], -1)
-	if len(tokens) > 0 {
-		for _, x := range tokens {
-			// step: replace the token with the environment variable
-			items[1] = strings.Replace(items[1], x[0], os.Getenv(strings.Replace(x[0], "%", "", -1)), -1)
-		}
-	}
-
 	// step: extract the elements
 	rn.resource = items[0]
 	rn.path = items[1]
diff --git a/vault_resources_test.go b/vault_resources_test.go
index 5a52c88..285752e 100644
--- a/vault_resources_test.go
+++ b/vault_resources_test.go
@@ -21,6 +21,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"fmt"
 )
 
 func TestSetResources(t *testing.T) {
@@ -34,7 +35,7 @@ func TestSetResources(t *testing.T) {
 	assert.Nil(t, items.Set("pki:example-dot-com:common_name=blah.example.com"))
 	assert.Nil(t, items.Set("pki:example-dot-com:common_name=blah.example.com,file=/etc/certs/ssl/blah.example.com"))
 	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.Nil(t, items.Set("secret:secrets/${ENV}/me:file=filename.test,fmt=yaml"))
 
 
 	assert.NotNil(t, items.Set("secret:"))
@@ -51,25 +52,25 @@ func TestSetEnvironmentResource(t *testing.T) {
 		Vars         map[string]string
 	}{
 		{
-			ResourceText: "secret:secrets/%ENV/me:file=filename.test,fmt=yaml",
-			ExpectedPath: "secrets/%ENV/me",
+			ResourceText: "secret:secrets/${ENV}/me:file=filename.test,fmt=yaml",
+			ExpectedPath: "secrets//me",
 		},
 		{
-			ResourceText: "secret:secrets/%ENV%/me:file=filename.test,fmt=yaml",
+			ResourceText: "secret:secrets/${ENV}/me:file=filename.test,fmt=yaml",
 			ExpectedPath: "secrets/dev/me",
 			Vars: map[string]string{
 				"ENV": "dev",
 			},
 		},
 		{
-			ResourceText: "secret:secrets/%ENV%/me/%ENV%:file=filename.test,fmt=yaml",
+			ResourceText: "secret:secrets/${ENV}/me/${ENV}:file=filename.test,fmt=yaml",
 			ExpectedPath: "secrets/dev/me/dev",
 			Vars: map[string]string{
 				"ENV": "dev",
 			},
 		},
 		{
-			ResourceText: "secret:secrets/%ENV%/me/%THING%:file=filename.test,fmt=yaml",
+			ResourceText: "secret:secrets/${ENV}/me/${THING}:file=filename.test,fmt=yaml",
 			ExpectedPath: "secrets/dev/me/yes",
 			Vars: map[string]string{
 				"ENV":   "dev",
@@ -77,7 +78,7 @@ func TestSetEnvironmentResource(t *testing.T) {
 			},
 		},
 		{
-			ResourceText: "secret:secrets/%KUBERNETES_NAMESPACE%/me:file=filename.test,fmt=yaml",
+			ResourceText: "secret:secrets/${KUBERNETES_NAMESPACE}/me:file=filename.test,fmt=yaml,common_name=${KUBERNETES_NAMESPACE}.test",
 			ExpectedPath: "secrets/dev/me",
 			Vars: map[string]string{
 				"KUBERNETES_NAMESPACE":   "dev",