More fine tuning of trimming full names of fields involved with unknown assignments.

Author: Patrick J. McNerthney

crossplane/pythonic/function.py

@@ -236,10 +236,15 @@ def trimFullName(self, name):
                 ('request', 'extra_resources', None, 'items', 'resource'),
                 ('response', 'desired', 'resources', None, 'resource'),
         ):
-            if len(values) <= len(name):
-                for ix, value in enumerate(values):
-                    if value and value != name[ix] and not name[ix].startswith(f"{value}["):
-                       break
+            if len(values) < len(name):
+                ix = 0
+                for iv, value in enumerate(values):
+                    if value:
+                        if value != name[ix]:
+                            if not name[ix].startswith(f"{values[iv]}[") or iv+1 >= len(values) or values[iv+1]:
+                                break
+                            continue
+                    ix += 1
                 else:
                     ix = 0
                     for value in values:
@@ -251,7 +256,6 @@ def trimFullName(self, name):
                                 del name[ix]
                             else:
                                 name[ix] = name[ix][len(value):]
-                                ix += 1
                         else:
                             ix += 1
                     break

crossplane/pythonic/protobuf.py

@@ -147,10 +147,10 @@ def _fullName(self, key=None):
             else:
                 name = str(self._key)
             if key is not None:
-                if key.isidentifier():
-                    name += f".{key}"
+                if '.' in key:
+                    name += f"[{key}]"
                 else:
-                    name += f"['{key}']"
+                    name += f".{key}"
             return name
         if key is not None:
             return str(key)
@@ -294,10 +294,10 @@ def _fullName(self, key=None):
             else:
                 name = str(self._key)
             if key is not None:
-                if key.isidentifier():
-                    name += f".{key}"
+                if '.' in key:
+                    name += f"[{key}]"
                 else:
-                    name += f"['{key}']"
+                    name += f".{key}"
             return name
         if key is not None:
             return str(key)
@@ -638,10 +638,10 @@ def _fullName(self, key=None):
                     if isinstance(key, int):
                         name += f"[{key}]"
                     else:
-                        if key.isidentifier():
-                            name += f".{key}"
+                        if '.' in key:
+                            name += f"[{key}]"
                         else:
-                            name += f"['{key}']"
+                            name += f".{key}"
             return name
         if key is not None:
             return str(key)