Merge linting fixes

v2/internal/controllers/samples_test.go

@@ -189,12 +189,58 @@ func findRefsAndCreateSecrets(tc *testcommon.KubePerTestContext, resources []cli
 }
 
 func getTestName(group string, version string) string {
-	caser := cases.Title(language.English)
-	return strings.Join(
-		[]string{
-			"Test",
-			caser.String(group),
-			version,
-			"CreationAndDeletion",
-		}, "_")
+	var result strings.Builder
+
+	// Common Prefix
+	result.WriteString("Test_")
+
+	// Titlecase for each part of the group
+	title := cases.Title(language.English)
+	for _, part := range strings.Split(group, ".") {
+		result.WriteString(title.String(part))
+	}
+	result.WriteString("_")
+
+	// Append the version
+	result.WriteString(version)
+
+	// Common Suffix
+	result.WriteString("_CreationAndDeletion")
+
+	return result.String()
+}
+
+func TestGetTestName(t *testing.T) {
+	t.Parallel()
+
+	cases := map[string]struct {
+		group    string
+		version  string
+		expected string
+	}{
+		"simple": {
+			group:    "group",
+			version:  "version",
+			expected: "Test_Group_version_CreationAndDeletion",
+		},
+		"Network": {
+			group:    "network",
+			version:  "v1api",
+			expected: "Test_Network_v1api_CreationAndDeletion",
+		},
+		"Frontdoor": {
+			group:    "network.frontdoor",
+			version:  "v1api",
+			expected: "Test_NetworkFrontdoor_v1api_CreationAndDeletion",
+		},
+	}
+
+	for name, c := range cases {
+		c := c
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+			g := NewGomegaWithT(t)
+			g.Expect(getTestName(c.group, c.version)).To(Equal(c.expected))
+		})
+	}
 }

v2/tools/generator/internal/astmodel/identifier_factory.go

@@ -12,6 +12,8 @@ import (
 	"unicode"
 
 	"github.com/Azure/azure-service-operator/v2/internal/set"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 )
 
 // \W is all non-word characters (https://golang.org/pkg/regexp/syntax/)
@@ -176,18 +178,13 @@ func (factory *identifierFactory) cleanPart(part string, visibility Visibility)
 	clean := filterRegex.ReplaceAllLiteralString(part, " ")
 	cleanWords := sliceIntoWords(clean)
 	caseCorrectedWords := make([]string, 0, len(cleanWords))
+	title := cases.Title(language.English, cases.NoLower)
 	for ix, word := range cleanWords {
 		var w string
 		if ix == 0 && visibility == NotExported {
 			w = strings.ToLower(word)
 		} else {
-			// Disable lint: the suggested "replacement" for this in /x/cases has fundamental
-			// differences in how it works (e.g. 'JSON' becomes 'Json'; we don’t want that).
-			// Furthermore, the cases (ha) that it "fixes" are not relevant to us
-			// (something about better handling of various punctuation characters;
-			// our words are punctuation-free).
-			//nolint:staticcheck
-			w = strings.Title(word)
+			w = title.String(word)
 		}
 
 		caseCorrectedWords = append(caseCorrectedWords, w)