fix: token lookup in services

Author: dnitsch

Makefile

@@ -2,7 +2,8 @@
 OWNER := dnitsch
 NAME := configmanager
 GIT_TAG := "0.0.0"
-VERSION := "v$(shell git describe --tags --abbrev=0)"
+VERSION := "v0.9.2"
+# VERSION := "$(shell git describe --tags --abbrev=0)"
 REVISION := $(shell git rev-parse --short HEAD)
 
 LDFLAGS := -ldflags="-s -w -X \"github.com/$(OWNER)/$(NAME)/cmd/configmanager.Version=$(VERSION)\" -X \"github.com/$(OWNER)/$(NAME)/cmd/configmanager.Revision=$(REVISION)\" -extldflags -static"

pkg/generator/generator.go

@@ -155,7 +155,7 @@ func (c *GenVars) retrieveSpecific(prefix, in string) (string, error) {
 		c.setToken(in)
 		return c.getTokenValue()
 	case AzKeyVaultPrefix:
-		azKv, err := NewKvStoreWithToken(c.ctx, in, c.config.tokenSeparator)
+		azKv, err := NewKvStoreWithToken(c.ctx, in, c.config.tokenSeparator, c.config.keySeparator)
 		if err != nil {
 			return "", err
 		}
@@ -259,11 +259,13 @@ func (c *GenVars) normalizeKey(k string) string {
 }
 
 func (c *GenVars) stripPrefix(in, prefix string) string {
-	return stripPrefix(in, prefix, c.config.tokenSeparator)
+	return stripPrefix(in, prefix, c.config.tokenSeparator, c.config.keySeparator)
 }
 
-func stripPrefix(in, prefix, tokenSeparator string) string {
-	return strings.Replace(in, fmt.Sprintf("%s%s", prefix, tokenSeparator), "", 1)
+func stripPrefix(in, prefix, tokenSeparator, keySeparator string) string {
+	t := in
+	b := regexp.MustCompile(`[|].*`).ReplaceAll([]byte(t), []byte(""))
+	return strings.Replace(string(b), fmt.Sprintf("%s%s", prefix, tokenSeparator), "", 1)
 }
 
 // FlushToFile saves contents to file provided

pkg/generator/keyvault.go

@@ -40,10 +40,10 @@ func NewKvStore(ctx context.Context) (*KvStore, error) {
 
 // NewKvStore returns a KvStore
 // requires `AZURE_SUBSCRIPTION_ID` environment variable to be present to successfuly work
-func NewKvStoreWithToken(ctx context.Context, token, tokenSeparator string) (*KvStore, error) {
+func NewKvStoreWithToken(ctx context.Context, token, tokenSeparator, keySeparator string) (*KvStore, error) {
 
 	//
-	conf := azSplitToken(stripPrefix(token, AzKeyVaultPrefix, tokenSeparator))
+	conf := azSplitToken(stripPrefix(token, AzKeyVaultPrefix, tokenSeparator, keySeparator))
 
 	cred, err := azidentity.NewDefaultAzureCredential(nil)
 	if err != nil {