Fixing firestore deploy on fresh projects (#9220)

* Fixing firestore deploy on fresh projects

* Update src/deploy/firestore/prepare.ts

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

---------

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

Author: joehan

CHANGELOG.md

@@ -5,3 +5,4 @@
 - Fixed a bug when `firebase init dataconnect` failed to create a React app when launched from VS Code extension (#9171).
 - Improved the clarity of the `firebase apptesting:execute` command when you have zero or multiple apps.
 - `firebase dataconnect:sql:migrate` now supports Cloud SQL instances with only private IPs. The command must be run in the same VPC of the instance to work. (##9200)
+- Fixed an issue where `firebase deploy --only firestore` would fail with 403 errors on projects that never had a database created.

src/deploy/firestore/deploy.ts

@@ -1,68 +1,12 @@
 import * as clc from "colorette";
 
 import { FirestoreApi } from "../../firestore/api";
-import * as types from "../../firestore/api-types";
 import { logger } from "../../logger";
 import * as utils from "../../utils";
 import { RulesDeploy, RulesetServiceType } from "../../rulesDeploy";
 import { IndexContext } from "./prepare";
-import { FirestoreConfig } from "../../firebaseConfig";
 import { sleep } from "../../utils";
 import { Options } from "../../options";
-import { FirebaseError } from "../../error";
-
-async function createDatabase(context: any, options: Options): Promise<void> {
-  let firestoreCfg: FirestoreConfig = options.config.data.firestore;
-  if (Array.isArray(firestoreCfg)) {
-    firestoreCfg = firestoreCfg[0];
-  }
-  if (!options.projectId) {
-    throw new FirebaseError("Project ID is required to create a Firestore database.");
-  }
-  if (!firestoreCfg) {
-    throw new FirebaseError("Firestore database configuration not found in firebase.json.");
-  }
-  if (!firestoreCfg.database) {
-    firestoreCfg.database = "(default)";
-  }
-
-  let edition: types.DatabaseEdition = types.DatabaseEdition.STANDARD;
-  if (firestoreCfg.edition) {
-    const upperEdition = firestoreCfg.edition.toUpperCase();
-    if (
-      upperEdition !== types.DatabaseEdition.STANDARD &&
-      upperEdition !== types.DatabaseEdition.ENTERPRISE
-    ) {
-      throw new FirebaseError(
-        `Invalid edition specified for database in firebase.json: ${firestoreCfg.edition}`,
-      );
-    }
-    edition = upperEdition as types.DatabaseEdition;
-  }
-
-  const api = new FirestoreApi();
-  try {
-    await api.getDatabase(options.projectId, firestoreCfg.database);
-  } catch (e: any) {
-    if (e.status === 404) {
-      // Database is not found. Let's create it.
-      utils.logLabeledBullet(
-        "firetore",
-        `Creating the new Firestore database ${firestoreCfg.database}...`,
-      );
-      const createDatabaseReq: types.CreateDatabaseReq = {
-        project: options.projectId,
-        databaseId: firestoreCfg.database,
-        locationId: firestoreCfg.location || "nam5", // Default to 'nam5' if location is not specified
-        type: types.DatabaseType.FIRESTORE_NATIVE,
-        databaseEdition: edition,
-        deleteProtectionState: types.DatabaseDeleteProtectionState.DISABLED,
-        pointInTimeRecoveryEnablement: types.PointInTimeRecoveryEnablement.DISABLED,
-      };
-      await api.createDatabase(createDatabaseReq);
-    }
-  }
-}
 
 /**
  * Deploys Firestore Rules.
@@ -129,7 +73,6 @@ async function deployIndexes(context: any, options: any): Promise<void> {
  * @param options The CLI options object.
  */
 export default async function (context: any, options: Options): Promise<void> {
-  await createDatabase(context, options);
   await deployRules(context);
   await deployIndexes(context, options);
 }

src/deploy/firestore/prepare.ts

@@ -9,6 +9,10 @@ import { logger } from "../../logger";
 import { DeployOptions } from "..";
 import { ensure } from "../../ensureApiEnabled";
 import { firestoreOrigin } from "../../api";
+import { FirebaseError } from "../../error";
+import * as types from "../../firestore/api-types";
+import { FirestoreConfig } from "../../firebaseConfig";
+import { FirestoreApi } from "../../firestore/api";
 
 export interface RulesContext {
   databaseId: string;
@@ -67,13 +71,66 @@ function prepareIndexes(
     indexesRawSpec,
   } as IndexContext);
 }
+async function createDatabase(context: any, options: Options): Promise<void> {
+  let firestoreCfg: FirestoreConfig = options.config.data.firestore;
+  if (Array.isArray(firestoreCfg)) {
+    firestoreCfg = firestoreCfg[0];
+  }
+  if (!options.projectId) {
+    throw new FirebaseError("Project ID is required to create a Firestore database.");
+  }
+  if (!firestoreCfg) {
+    throw new FirebaseError("Firestore database configuration not found in firebase.json.");
+  }
+  if (!firestoreCfg.database) {
+    firestoreCfg.database = "(default)";
+  }
+
+  let edition: types.DatabaseEdition = types.DatabaseEdition.STANDARD;
+  if (firestoreCfg.edition) {
+    const upperEdition = firestoreCfg.edition.toUpperCase();
+    if (
+      upperEdition !== types.DatabaseEdition.STANDARD &&
+      upperEdition !== types.DatabaseEdition.ENTERPRISE
+    ) {
+      throw new FirebaseError(
+        `Invalid edition specified for database in firebase.json: ${firestoreCfg.edition}`,
+      );
+    }
+    edition = upperEdition as types.DatabaseEdition;
+  }
+
+  const api = new FirestoreApi();
+  try {
+    await api.getDatabase(options.projectId, firestoreCfg.database);
+  } catch (e: any) {
+    if (e.status === 404) {
+      // Database is not found. Let's create it.
+      utils.logLabeledBullet(
+        "firestore",
+        `Creating the new Firestore database ${firestoreCfg.database}...`,
+      );
+      const createDatabaseReq: types.CreateDatabaseReq = {
+        project: options.projectId,
+        databaseId: firestoreCfg.database,
+        locationId: firestoreCfg.location || "nam5", // Default to 'nam5' if location is not specified
+        type: types.DatabaseType.FIRESTORE_NATIVE,
+        databaseEdition: edition,
+        deleteProtectionState: types.DatabaseDeleteProtectionState.DISABLED,
+        pointInTimeRecoveryEnablement: types.PointInTimeRecoveryEnablement.DISABLED,
+      };
+      await api.createDatabase(createDatabaseReq);
+    }
+  }
+}
 
 /**
  * Prepares Firestore deploys.
  * @param context The deploy context.
  * @param options The CLI options object.
  */
 export default async function (context: any, options: DeployOptions): Promise<void> {
+  await ensure(context.projectId, firestoreOrigin(), "firestore");
   await ensure(context.projectId, firestoreOrigin(), "firestore");
   if (options.only) {
     const targets = options.only.split(",");
@@ -111,6 +168,9 @@ export default async function (context: any, options: DeployOptions): Promise<vo
   const rulesDeploy: RulesDeploy = new RulesDeploy(options, RulesetServiceType.CLOUD_FIRESTORE);
   context.firestore.rulesDeploy = rulesDeploy;
 
+  // We need to create the DB first if it doesn't exist
+  // Otherwise, prepare rules will fail when it calls the :test endpoint
+  await createDatabase(context, options);
   for (const firestoreConfig of firestoreConfigs) {
     if (firestoreConfig.indexes) {
       prepareIndexes(context, options, firestoreConfig.database, firestoreConfig.indexes);

src/firestore/api.ts

@@ -15,6 +15,7 @@ import { FirebaseError } from "../error";
 import { Client } from "../apiv2";
 import { PrettyPrint } from "./pretty-print";
 import { optionalValueMatches } from "../functional";
+import { pollOperation } from "../operation-poller";
 
 export class FirestoreApi {
   apiClient = new Client({ urlPrefix: firestoreOrigin(), apiVersion: "v1" });
@@ -779,11 +780,16 @@ export class FirestoreApi {
       cmekConfig: req.cmekConfig,
     };
     const options = { queryParams: { databaseId: req.databaseId } };
-    const res = await this.apiClient.post<types.DatabaseReq, { response?: types.DatabaseResp }>(
-      url,
-      payload,
-      options,
-    );
+    const res = await this.apiClient.post<
+      types.DatabaseReq,
+      { name: string; response?: types.DatabaseResp }
+    >(url, payload, options);
+    await pollOperation({
+      apiOrigin: firestoreOrigin(),
+      apiVersion: "v1",
+      operationResourceName: res.body.name,
+      masterTimeout: 600000,
+    });
     const database = res.body.response;
     if (!database) {
       throw new FirebaseError("Not found");