fix: issue with acronyms in name generator

Author: PhilippHeuer

pkg/util/naming.go

@@ -12,10 +12,15 @@ import (
 var replaceChars = []int32{'-', '_', ':', ' '}
 
 var acronyms = []string{
-	"id",
-	"api",
-	"vcs",
-	"git",
+	// General Tech & Web
+	"ID", "API", "GIT", "VCS", "UUID", "GUID", "REST", "SOAP",
+
+	// Business
+	"VAT", "SLA", "SLO", "IBAN", "BIC",
+
+	// TM Forum (TMF) & Telecom Specific
+	"TMF", "SID", "TAM", "eTOM", "IP", "VPN", "SIM", "IMEI", "IMSI", "CPE",
+	"FVO", "MVO", // first-value object and mutation-value object
 }
 
 func init() {
@@ -75,23 +80,32 @@ func ToSlug(input string) string {
 
 // UppercaseAcronyms replaces acronyms in the input string with their uppercase form
 func UppercaseAcronyms(input string) string {
-	for i, _ := range input {
-		// check if any acronym starts at this index
-		for _, acronym := range acronyms {
-			if strings.HasPrefix(strings.ToLower(input[i:]), strings.ToLower(acronym)) {
-				acronymEnd := i + len(acronym)
-				if acronymEnd < len(input) {
-					// uppercase acronym
-					input = input[:i] + strings.ToUpper(acronym) + input[acronymEnd:]
-
-					// uppercase following character, if lowercase
-					if acronymEnd < len(input) && unicode.IsLower(rune(input[acronymEnd])) {
-						input = input[:acronymEnd] + strings.ToUpper(string(input[acronymEnd])) + input[acronymEnd+1:]
-					}
+	for _, acronym := range acronyms {
+		upperAcro := strings.ToUpper(acronym)
+
+		search := input
+		var result strings.Builder
+		i := 0
+		for i < len(search) {
+			if strings.HasPrefix(strings.ToLower(search[i:]), strings.ToLower(acronym)) {
+				endIdx := i + len(acronym)
+
+				// Boundary Check:
+				// Is it the start of the string OR was the previous char NOT a lowercase letter?
+				// Is it the end of the string OR is the next char NOT a lowercase letter?
+				isStart := i == 0 || !unicode.IsLower(rune(search[i-1]))
+				isEnd := endIdx == len(search) || !unicode.IsLower(rune(search[endIdx]))
+
+				if isStart && isEnd {
+					result.WriteString(upperAcro)
+					i = endIdx
+					continue
 				}
 			}
+			result.WriteByte(search[i])
+			i++
 		}
+		input = result.String()
 	}
-
 	return input
 }