Lift GCF 2nd gen naming restrictions (#5690)

Fixes #5695

Author: inlined

CHANGELOG.md

@@ -2,3 +2,4 @@
   - Propagates page token from ListDocumentsResponse to GetOrListDocumentsResponse in Firestore emulator.
 - Fixes an issue where Secret Manager secrets were tagged incorrectly (#5704).
 - Fix bug where Custom Event channels weren't automatically crated on function deploys (#5700)
+- Lift GCF 2nd gen naming restrictions (#5690)

src/deploy/functions/validate.ts

@@ -198,27 +198,15 @@ export function functionsDirectoryExists(sourceDir: string, projectDir: string):
  * @throws { FirebaseError } Function names must be valid.
  */
 export function functionIdsAreValid(functions: { id: string; platform: string }[]): void {
-  const v1FunctionName = /^[a-zA-Z][a-zA-Z0-9_-]{0,62}$/;
-  const invalidV1Ids = functions.filter((fn) => {
-    return fn.platform === "gcfv1" && !v1FunctionName.test(fn.id);
-  });
-  if (invalidV1Ids.length !== 0) {
+  // TODO: cannot end with a _ or -
+  const functionName = /^[a-zA-Z][a-zA-Z0-9_-]{0,62}$/;
+  const invalidIds = functions.filter((fn) => !functionName.test(fn.id));
+  if (invalidIds.length !== 0) {
     const msg =
-      `${invalidV1Ids.map((f) => f.id).join(", ")} function name(s) can only contain letters, ` +
+      `${invalidIds.map((f) => f.id).join(", ")} function name(s) can only contain letters, ` +
       `numbers, hyphens, and not exceed 62 characters in length`;
     throw new FirebaseError(msg);
   }
-
-  const v2FunctionName = /^[a-z][a-z0-9-]{0,62}$/;
-  const invalidV2Ids = functions.filter((fn) => {
-    return fn.platform === "gcfv2" && !v2FunctionName.test(fn.id);
-  });
-  if (invalidV2Ids.length !== 0) {
-    const msg =
-      `${invalidV2Ids.map((f) => f.id).join(", ")} v2 function name(s) can only contain lower ` +
-      `case letters, numbers, hyphens, and not exceed 62 characters in length`;
-    throw new FirebaseError(msg);
-  }
 }
 
 /**

src/test/deploy/functions/validate.spec.ts

@@ -82,10 +82,6 @@ describe("validate", () => {
           id: "my-function$%#",
           platform: "gcfv1",
         },
-        {
-          id: "my-function-2",
-          platform: "gcfv2",
-        },
       ];
 
       expect(() => {
@@ -103,18 +99,18 @@ describe("validate", () => {
       }).to.throw(FirebaseError);
     });
 
-    it("should throw error on capital letters in v2 function names", () => {
+    it("should not throw error on capital letters in v2 function names", () => {
       const functions = [{ id: "Hi", platform: "gcfv2" }];
       expect(() => {
         validate.functionIdsAreValid(functions);
-      }).to.throw(FirebaseError);
+      }).to.not.throw();
     });
 
-    it("should throw error on underscores in v2 function names", () => {
+    it("should not throw error on underscores in v2 function names", () => {
       const functions = [{ id: "o_O", platform: "gcfv2" }];
       expect(() => {
         validate.functionIdsAreValid(functions);
-      }).to.throw(FirebaseError);
+      }).to.not.throw();
     });
   });