fix: metadata extract and token

Author: dnitsch

pkg/generator/config.go

@@ -76,13 +76,13 @@ func (c *GenVarsConfig) KeySeparator() string {
 //
 // Further processing down the line will remove other elements of the token.
 func ParseMetadata[T comparable](token string, typ T) string {
-	metadataStr, startIndex, found := extractMetadataStr(token)
+	metadataStr, metaLessToken, found := extractMetadataStr(token)
 	if !found {
 		return token
 	}
-	if startIndex > 0 {
-		token = token[0:startIndex]
-	}
+
+	token = metaLessToken
+
 	// crude json like builder from key/val tags
 	// since we are only ever dealing with a string input
 	// extracted from the token there is little chance panic would occur here
@@ -94,6 +94,7 @@ func ParseMetadata[T comparable](token string, typ T) string {
 			metaMap = append(metaMap, fmt.Sprintf(`"%s":"%s"`, mapKeyVal[0], mapKeyVal[1]))
 		}
 	}
+
 	// empty map will be parsed as `{}` still resulting in a valid json
 	// and successful unmarshalling but default value pointer struct
 	b := []byte(fmt.Sprintf(`{%s}`, strings.Join(metaMap, ",")))
@@ -111,18 +112,26 @@ const endMetaStr string = `]`
 
 // extractMetadataStr returns anything between the start and end
 // metadata markers in the token string itself
-func extractMetadataStr(str string) (metaString string, startIndex int, found bool) {
+func extractMetadataStr(token string) (metaString string, tokenWithoutMeta string, found bool) {
 
-	startIndex = strings.Index(str, startMetaStr)
+	startIndex := strings.Index(token, startMetaStr)
 	// token has no startMetaStr
 	if startIndex == -1 {
-		return metaString, startIndex, false
+		return metaString, token, false
 	}
-	newS := str[startIndex+len(startMetaStr):]
+	newS := token[startIndex+len(startMetaStr):]
+
 	endIndex := strings.Index(newS, endMetaStr)
+	// token has no meta end
 	if endIndex == -1 {
-		return metaString, -1, false
+		return metaString, token, false
 	}
+	// metastring extracted
 	metaString = newS[:endIndex]
-	return metaString, startIndex, true
+
+	// complete [key=value] has been found
+	// Remove from the token
+	metaLessToken := strings.Replace(token, startMetaStr+metaString+endMetaStr, "", -1)
+
+	return metaString, metaLessToken, true
 }

pkg/generator/config_test.go

@@ -60,6 +60,12 @@ func Test_MarshalMetadata_with_label_struct_succeeds(t *testing.T) {
 			"",
 			"FOO://basjh/dskjuds/123]asdas=bar]",
 		},
+		"metadata is in the middle of path lookup": {
+			generator.NewConfig(),
+			`FOO://basjh/dskjuds/123[label=bar]|lookup`,
+			"bar",
+			"FOO://basjh/dskjuds/123|lookup",
+		},
 	}
 	for name, tt := range ttests {
 		t.Run(name, func(t *testing.T) {

pkg/generator/generator.go

@@ -148,7 +148,12 @@ func (c *GenVars) RawMap() ParsedMap {
 func (c *GenVars) AddRawMap(key, val string) {
 	c.rawMap.mu.Lock()
 	defer c.rawMap.mu.Unlock()
-	c.rawMap.tokenMap[key] = c.keySeparatorLookup(key, val)
+	// strip the metadata from token
+	strippedToken := ParseMetadata(key, &struct{}{})
+	// still use the metadata in the key
+	// there could be different versions / labels for the same token and hence different values
+	// However the JSONpath look up
+	c.rawMap.tokenMap[key] = c.keySeparatorLookup(strippedToken, val)
 }
 
 // Generate generates a k/v map of the tokens with their corresponding secret/paramstore values