merge in new tags, updated tfsdk generation script

scripts/generateTfsdkTags.py

@@ -7,6 +7,30 @@
 modelFiles = glob.glob('model_*.go')
 jsonRegex = re.compile('`json:\"([0-9A-Za-z]*)[\",]')
 
+def removeUnderscoresFromGroup(group) -> str:
+    return re.sub(r'_', '', group)
+
+def buildAttributeValue(attribute) -> str:
+    underscoreAttribute = ""
+    match = re.findall(r'[0-9A-Z]', attribute)
+    if match != None:
+        underscoreAttribute = re.sub(r'([A-Z])', r'_\g<0>', attribute).lower()
+        fourUpperChars = re.findall(r'[A-Z]{4,4}', attribute)
+        threeUpperChars = re.findall(r'[A-Z]{3,3}', attribute)
+        twoUpperChars = re.findall(r'[A-Z]{2,2}', attribute)
+        if len(fourUpperChars) > 0:
+            underscoreAttribute = re.sub(r'_[a-z]_[a-z]_[a-z]_[a-z]', lambda m: "_" + removeUnderscoresFromGroup(m.group()) + "_", underscoreAttribute).lower()
+        elif len(threeUpperChars) > 0:
+            underscoreAttribute = re.sub(r'_[a-z]_[a-z]_[a-z]', lambda m: "_" + removeUnderscoresFromGroup(m.group()) + "_", underscoreAttribute).lower()
+        elif len(twoUpperChars) > 0 :
+            underscoreAttribute = re.sub(r'_[a-z]_[a-z]', lambda m: "_" + removeUnderscoresFromGroup(m.group()), underscoreAttribute).lower()
+        underscoreAttribute =  underscoreAttribute.replace("__", "_")
+    else:
+        underscoreAttribute = attribute
+    if underscoreAttribute.endswith("_"):
+        underscoreAttribute = underscoreAttribute[:-1]
+    return underscoreAttribute
+
 for modelFile in modelFiles:
     updatedLines = []
     with open(modelFile, 'r') as model:
@@ -16,23 +40,12 @@
             # Ensure we don't add tfsdk tags to a line that already has one
             if match != None and "tfsdk:" not in line:
                 # Get the attribute name from the json tag
-                attribute = match.group(1)
-                # Create a tfsdk tag for the attribute
-                underscoreAttribute = ""
-                i = 0
-                lastCharUpper = False
-                while i < len(attribute):
-                    if i > 0 and attribute[i].isupper() != attribute[i - 1].isupper():
-                        underscoreAttribute += "_"
-                        underscoreAttribute += attribute[i].lower()
-                        i += 1
-                    if i < len(attribute):
-                        underscoreAttribute += attribute[i].lower()
-                        i += 1
+                attribute = str(match.group(1))
+                finalAttribute = buildAttributeValue(attribute)
                 # Add the tfsdk tag to the line
-                line = line.replace("\"`", "\" tfsdk:\"{}\"`".format(underscoreAttribute))
+                line = line.replace("\"`", "\" tfsdk:\"{}\"`".format(finalAttribute))
             updatedLines.append(line)
     # Rewrite the file
     with open(modelFile, 'w') as model:
         for line in updatedLines:
-            model.write(line)
+            model.write(line)