Fix issue where projectId and displayName are not getting parsed (#8635)

* Fix issue where projectId and displayName are not getting parsed

* Use options

---------

Co-authored-by: Joe Hanley <[email protected]>

Author: aalej

CHANGELOG.md

@@ -1,2 +1,3 @@
+- Fixed issue where `projects:create` didn't correctly parse the `projectId` and `displayName` input. (#8634)
 - Improved GetDatabase API call caching for Firestore function deployments. (#8681)
 - Increased timeout for linking CloudSQL instances to Data Connect.

src/commands/projects-create.ts

@@ -34,7 +34,7 @@ export const command = new Command("projects:create [projectId]")
       }
       if (!options.nonInteractive) {
         // Inserts projectId and displayName
-        options = { ...options, ...(await promptProjectCreation()) };
+        options = { ...options, ...(await promptProjectCreation(options)) };
       }
       if (!options.projectId) {
         throw new FirebaseError("Project ID cannot be empty");

src/init/features/project.ts

@@ -14,6 +14,7 @@ import { FirebaseProjectMetadata } from "../../types/project";
 import { logger } from "../../logger";
 import * as utils from "../../utils";
 import * as prompt from "../../prompt";
+import { Options } from "../../options";
 
 const OPTION_NO_PROJECT = "Don't set up a default project";
 const OPTION_USE_PROJECT = "Use an existing project";
@@ -41,12 +42,12 @@ function toInitProjectInfo(projectMetaData: FirebaseProjectMetadata): InitProjec
   };
 }
 
-async function promptAndCreateNewProject(): Promise<FirebaseProjectMetadata> {
+async function promptAndCreateNewProject(options: Options): Promise<FirebaseProjectMetadata> {
   utils.logBullet(
     "If you want to create a project in a Google Cloud organization or folder, please use " +
       `"firebase projects:create" instead, and return to this command when you've created the project.`,
   );
-  const { projectId, displayName } = await promptProjectCreation();
+  const { projectId, displayName } = await promptProjectCreation(options);
   // N.B. This shouldn't be possible because of the validator on the input field, but it
   // is being left around in case there's something I don't know.
   if (!projectId) {
@@ -82,7 +83,7 @@ async function projectChoicePrompt(options: any): Promise<FirebaseProjectMetadat
     case OPTION_USE_PROJECT:
       return getOrPromptProject(options);
     case OPTION_NEW_PROJECT:
-      return promptAndCreateNewProject();
+      return promptAndCreateNewProject(options);
     case OPTION_ADD_FIREBASE:
       return promptAndAddFirebaseToCloudProject();
     default:

src/management/projects.ts

@@ -10,6 +10,7 @@ import { logger } from "../logger";
 import * as utils from "../utils";
 import { FirebaseProjectMetadata, CloudProjectInfo, ProjectPage } from "../types/project";
 import { bestEffortEnsure } from "../ensureApiEnabled";
+import { Options } from "../options";
 
 const TIMEOUT_MILLIS = 30000;
 const MAXIMUM_PROMPT_LIST = 100;
@@ -29,35 +30,41 @@ export interface ProjectParentResource {
 /**
  * Prompt user to create a new project
  */
-export async function promptProjectCreation(): Promise<{ projectId: string; displayName: string }> {
-  const projectId = await prompt.input({
-    message:
-      "Please specify a unique project id " +
-      `(${clc.yellow("warning")}: cannot be modified afterward) [6-30 characters]:\n`,
-    validate: (projectId: string) => {
-      if (projectId.length < 6) {
-        return "Project ID must be at least 6 characters long";
-      } else if (projectId.length > 30) {
-        return "Project ID cannot be longer than 30 characters";
-      } else {
-        return true;
-      }
-    },
-  });
-
-  const displayName = await prompt.input({
-    default: projectId,
-    message: "What would you like to call your project? (defaults to your project ID)",
-    validate: (displayName: string) => {
-      if (displayName.length < 4) {
-        return "Project name must be at least 4 characters long";
-      } else if (displayName.length > 30) {
-        return "Project name cannot be longer than 30 characters";
-      } else {
-        return true;
-      }
-    },
-  });
+export async function promptProjectCreation(
+  options: Options,
+): Promise<{ projectId: string; displayName: string }> {
+  const projectId =
+    options.projectId ??
+    (await prompt.input({
+      message:
+        "Please specify a unique project id " +
+        `(${clc.yellow("warning")}: cannot be modified afterward) [6-30 characters]:\n`,
+      validate: (projectId: string) => {
+        if (projectId.length < 6) {
+          return "Project ID must be at least 6 characters long";
+        } else if (projectId.length > 30) {
+          return "Project ID cannot be longer than 30 characters";
+        } else {
+          return true;
+        }
+      },
+    }));
+
+  const displayName =
+    (options.displayName as string) ??
+    (await prompt.input({
+      default: projectId,
+      message: "What would you like to call your project? (defaults to your project ID)",
+      validate: (displayName: string) => {
+        if (displayName.length < 4) {
+          return "Project name must be at least 4 characters long";
+        } else if (displayName.length > 30) {
+          return "Project name cannot be longer than 30 characters";
+        } else {
+          return true;
+        }
+      },
+    }));
 
   return { projectId, displayName };
 }
@@ -137,7 +144,9 @@ function logNewFirebaseProjectInfo(projectInfo: FirebaseProjectMetadata): void {
 /**
  * Get the user's desired project, prompting if necessary.
  */
-export async function getOrPromptProject(options: any): Promise<FirebaseProjectMetadata> {
+export async function getOrPromptProject(
+  options: Partial<Options>,
+): Promise<FirebaseProjectMetadata> {
   if (options.project) {
     return await getFirebaseProject(options.project);
   }