adding fix for leafref resolving in to typed values; adding fix for deleting prefixes from key names as well

Author: hansthienpondt

pkg/utils/converter.go

@@ -480,11 +480,8 @@ func convertStringToTv(schemaType *sdcpb.SchemaLeafType, v string, ts uint64) (*
 			Timestamp: ts,
 			Value:     &sdcpb.TypedValue_IdentityrefVal{IdentityrefVal: &sdcpb.IdentityRef{Value: name, Prefix: prefix, Module: module}},
 		}, nil
-	case "leafref": // TODO: query leafref type
-		return &sdcpb.TypedValue{
-			Timestamp: ts,
-			Value:     &sdcpb.TypedValue_StringVal{StringVal: v},
-		}, nil
+	case "leafref":
+		return convertStringToTv(schemaType.LeafrefTargetType, v, ts)
 	case "union":
 		for _, ut := range schemaType.GetUnionTypes() {
 			tv, err := convertStringToTv(ut, v, ts)

pkg/utils/path.go

@@ -358,12 +358,29 @@ func ToXPath(p *sdcpb.Path, noKeys bool) string {
 }
 
 func StripPathElemPrefixPath(p *sdcpb.Path) {
-	for _, pe := range p.Elem {
-		before, name, found := strings.Cut(pe.Name, ":")
-		if !found {
-			name = before
+	for _, pe := range p.GetElem() {
+		if i := strings.Index(pe.Name, ":"); i > 0 {
+			pe.Name = pe.Name[i+1:]
+		}
+		// process keys
+		for k, v := range pe.Key {
+			// delete prefix from key name
+			if i := strings.Index(k, ":"); i > 0 {
+				delete(pe.Key, k)
+				k = k[i+1:]
+			}
+			// delete prefix from key value
+			if strings.Contains(v, ":") {
+				kelems := strings.Split(v, "/")
+				for idx, kelem := range kelems {
+					if i := strings.Index(kelem, ":"); i > 0 {
+						kelems[idx] = kelem[i+1:]
+					}
+				}
+				v = strings.Join(kelems, "/")
+			}
+			pe.Key[k] = v
 		}
-		pe.Name = name
 	}
 }