update rpnamespace and service regexes

eng/tools/typespec-validation/src/rules/folder-structure.ts

@@ -1,4 +1,4 @@
 import debug from "debug";
 import { readFile } from "fs/promises";
 import { globby } from "globby";
 import path from "path";
@@ -122,9 +122,6 @@
         success = false;
       }
 
-      // TODO: Decide if v2 should validate folder names and structure to ensure specs align, or allow a more loose structure to ease
-      // migration from v1 to v2.
-
       const specType = folder.includes("data-plane") ? "data-plane" : "resource-manager";
       if (specType === "data-plane") {
         if (folderStruct.length !== 4) {
@@ -139,21 +136,21 @@
           success = false;
         }
 
+        const rpNamespaceRegex = /^[A-Za-z0-9\.]+$/;
         const rpNamespaceFolder = folderStruct[folderStruct.length - 2];
 
-        // Verify service folder is capitalized after each '.'
-        if (/(^|\. *)([a-z])/g.test(rpNamespaceFolder)) {
+        if (!rpNamespaceRegex.test(rpNamespaceFolder)) {
           success = false;
-          errorOutput += `Invalid RP namespace folder '${rpNamespaceFolder}'. RP namespace folders must be capitalized after each '.'`;
+          errorOutput += `RPNamespace folder '${rpNamespaceFolder}' does not match regex ${rpNamespaceRegex}`;
         }
       }
 
+      const serviceRegex = /^[A-Za-z0-9]+$/;
       const serviceFolder = folderStruct[folderStruct.length - 1];
 
-      // Verify service folder is capitalized after each '.'
-      if (/(^|\. *)([a-z])/g.test(serviceFolder)) {
+      if (!serviceRegex.test(serviceFolder)) {
         success = false;
-        errorOutput += `Invalid service folder '${serviceFolder}'. Service folders must be capitalized after each '.'`;
+        errorOutput += `Service folder '${serviceFolder}' does not match regex ${serviceRegex}`;
       }
     }
 

eng/tools/typespec-validation/test/folder-structure.test.ts

@@ -1,4 +1,4 @@
 import { mockAll, mockFolder } from "./mocks.js";
 mockAll();
 
 import { contosoTspConfig } from "@azure-tools/specs-shared/test/examples";
@@ -95,7 +95,7 @@
 
     const result = await new FolderStructureRule().execute("/gitroot/specification/foo/data-plane");
     assert(result.errorOutput);
-    assert(result.errorOutput.includes("must be capitalized"));
+    assert(result.errorOutput.includes("does not match regex"));
   });
 
   it("should fail if second level folder is resource-manager", async function () {
@@ -108,7 +108,7 @@
       "/gitroot/specification/foo/resource-manager",
     );
     assert(result.errorOutput);
-    assert(result.errorOutput.includes("must be capitalized"));
+    assert(result.errorOutput.includes("does not match regex"));
   });
 
   it("should fail if Shared does not follow Management ", async function () {