Merge branch 'master' into inlined.env-import

Author: inlined

CHANGELOG.md

@@ -1,2 +1,5 @@
+- Fixed an issue with deploying indexes to Firestore Enterprise edition databases where explicit `__name__` fields could be incorrectly handled.
+- The `experimental:mcp` command has been renamed to `mcp`. The old name is now an alias.
 - `firebase_update_environment` MCP tool supports accepting Gemini in Firebase Terms of Service.
 - 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.

scripts/mcp-tests/gemini-smoke-test.ts

@@ -15,7 +15,7 @@ await client.connect(
   new StdioClientTransport({
     command: "../../lib/bin/firebase.js",
     args: [
-      "experimental:mcp",
+      "mcp",
       "--only",
       "firestore,dataconnect,messaging,remoteconfig,crashlytics,auth,storage,apphosting",
     ],

scripts/publish.sh

@@ -2,21 +2,28 @@
 set -e
 
 printusage() {
-  echo "publish.sh <version>"
+  echo "publish.sh <version> [branch]"
   echo "REPOSITORY_ORG and REPOSITORY_NAME should be set in the environment."
   echo "e.g. REPOSITORY_ORG=user, REPOSITORY_NAME=repo"
   echo ""
   echo "Arguments:"
-  echo "  version: 'patch', 'minor', 'major', or 'artifactsOnly'"
+  echo "  version: 'patch', 'minor', 'major', 'artifactsOnly', or 'preview'"
+  echo "  branch: required if version is 'preview'"
 }
 
 VERSION=$1
+BRANCH=$2
 if [[ $VERSION == "" ]]; then
   printusage
   exit 1
 elif [[ $VERSION == "artifactsOnly" ]]; then
   echo "Skipping npm package publish since VERSION is artifactsOnly."
   exit 0
+elif [[ $VERSION == "preview" ]]; then
+  if [[ $BRANCH == "" ]]; then
+    printusage
+    exit 1
+  fi
 elif [[ ! ($VERSION == "patch" || $VERSION == "minor" || $VERSION == "major") ]]; then
   printusage
   exit 1
@@ -61,6 +68,11 @@ echo "Moved to temporary directory."
 echo "Cloning repository..."
 git clone "[email protected]:${REPOSITORY_ORG}/${REPOSITORY_NAME}.git"
 cd "${REPOSITORY_NAME}"
+if [[ $VERSION == "preview" ]]; then
+  echo "Checking out branch $BRANCH..."
+  git checkout "$BRANCH"
+  echo "Checked out branch $BRANCH."
+fi
 echo "Cloned repository."
 
 echo "Making sure there is a changelog..."
@@ -78,10 +90,18 @@ echo "Running tests..."
 npm test
 echo "Ran tests."
 
-echo "Making a $VERSION version..."
-npm version $VERSION
-NEW_VERSION=$(jq -r ".version" package.json)
-echo "Made a $VERSION version."
+if [[ $VERSION == "preview" ]]; then
+  echo "Making a preview version..."
+  sanitized_branch=$(echo "$BRANCH" | sed 's/[^a-zA-Z0-9]/-/g')
+  npm version prerelease --preid=${sanitized_branch}
+  NEW_VERSION=$(jq -r ".version" package.json)
+  echo "Made a preview version."
+else
+  echo "Making a $VERSION version..."
+  npm version $VERSION
+  NEW_VERSION=$(jq -r ".version" package.json)
+  echo "Made a $VERSION version."
+fi
 
 echo "Making the release notes..."
 RELEASE_NOTES_FILE=$(mktemp)
@@ -95,20 +115,22 @@ echo "Publishing to npm..."
 npx [email protected] --before-script ./scripts/clean-shrinkwrap.sh
 echo "Published to npm."
 
-echo "Updating package-lock.json for Docker image..."
-npm --prefix ./scripts/publish/firebase-docker-image install
-echo "Updated package-lock.json for Docker image."
+if [[ $VERSION != "preview" ]]; then
+  echo "Updating package-lock.json for Docker image..."
+  npm --prefix ./scripts/publish/firebase-docker-image install
+  echo "Updated package-lock.json for Docker image."
 
-echo "Cleaning up release notes..."
-rm CHANGELOG.md
-touch CHANGELOG.md
-git commit -m "[firebase-release] Removed change log and reset repo after ${NEW_VERSION} release" CHANGELOG.md scripts/publish/firebase-docker-image/package-lock.json
-echo "Cleaned up release notes."
+  echo "Cleaning up release notes..."
+  rm CHANGELOG.md
+  touch CHANGELOG.md
+  git commit -m "[firebase-release] Removed change log and reset repo after ${NEW_VERSION} release" CHANGELOG.md scripts/publish/firebase-docker-image/package-lock.json
+  echo "Cleaned up release notes."
 
-echo "Pushing to GitHub..."
-git push origin master --tags
-echo "Pushed to GitHub."
+  echo "Pushing to GitHub..."
+  git push origin master --tags
+  echo "Pushed to GitHub."
 
-echo "Publishing release notes..."
-hub release create --file "${RELEASE_NOTES_FILE}" "v${NEW_VERSION}"
-echo "Published release notes."
+  echo "Publishing release notes..."
+  hub release create --file "${RELEASE_NOTES_FILE}" "v${NEW_VERSION}"
+  echo "Published release notes."
+fi

scripts/publish/cloudbuild.yaml

@@ -98,7 +98,15 @@ steps:
   # Publish the package.
   - name: "gcr.io/$PROJECT_ID/package-builder"
     dir: "${_REPOSITORY_NAME}"
-    args: ["bash", "./scripts/publish.sh", "${_VERSION}"]
+    entrypoint: bash
+    args:
+      - -c
+      - |
+        if [ "${_VERSION}" == "preview" ]; then
+          ./scripts/publish.sh "${_VERSION}" "${_BRANCH}"
+        else
+          ./scripts/publish.sh "${_VERSION}"
+        fi
     env:
       - "REPOSITORY_ORG=${_REPOSITORY_ORG}"
       - "REPOSITORY_NAME=${_REPOSITORY_NAME}"
@@ -110,25 +118,51 @@ steps:
   # Set up the hub credentials for firepit-builder.
   - name: "gcr.io/$PROJECT_ID/firepit-builder"
     entrypoint: "bash"
-    args: ["-c", "mkdir -vp ~/.config && cp -v hub ~/.config/hub"]
+    args:
+      - "-c"
+      - |
+        if [ "${_VERSION}" != "preview" ]; then
+          mkdir -vp ~/.config && cp -v hub ~/.config/hub
+        else
+          echo "Skipping hub credentials for firepit-builder for preview."
+        fi
 
   # Publish the firepit builds.
   - name: "gcr.io/$PROJECT_ID/firepit-builder"
-    entrypoint: "node"
-    args: ["/usr/src/app/pipeline.js", "--package=firebase-tools@latest", "--publish"]
+    entrypoint: "bash"
+    args:
+      - "-c"
+      - |
+        if [ "${_VERSION}" != "preview" ]; then
+          node /usr/src/app/pipeline.js --package=firebase-tools@latest --publish
+        else
+          echo "Skipping firepit build for preview version."
+        fi
 
   # Grab the latest version, store in workspace
   - id: "Read New Version Number from npm"
     name: "node"
     entrypoint: "sh"
-    args: ["-c", "npm view firebase-tools version > /workspace/version_number.txt"]
+    args:
+      - "-c"
+      - |
+        if [ "${_VERSION}" != "preview" ]; then
+          npm view firebase-tools version > /workspace/version_number.txt
+        else
+          echo "Skipping version lookup for preview version."
+        fi
 
   # Publish the Firebase docker image
   - name: "gcr.io/cloud-builders/docker"
-    entrypoint: "sh"
+    entrypoint: "bash"
     args:
       - "-c"
-      - "docker build -t us-docker.pkg.dev/${_ARTIFACT_REGISTRY_PROJECT}/us/firebase:$(cat /workspace/version_number.txt) -t us-docker.pkg.dev/${_ARTIFACT_REGISTRY_PROJECT}/us/firebase:latest -f ./firebase-docker-image/Dockerfile ./firebase-docker-image"
+      - |
+        if [ "${_VERSION}" != "preview" ]; then
+          docker build -t us-docker.pkg.dev/${_ARTIFACT_REGISTRY_PROJECT}/us/firebase:$(cat /workspace/version_number.txt) -t us-docker.pkg.dev/${_ARTIFACT_REGISTRY_PROJECT}/us/firebase:latest -f ./firebase-docker-image/Dockerfile ./firebase-docker-image
+        else
+          echo "Skipping docker build for preview version."
+        fi
 
 images:
   - "us-docker.pkg.dev/${_ARTIFACT_REGISTRY_PROJECT}/us/firebase"
@@ -142,6 +176,7 @@ options:
 
 substitutions:
   _VERSION: ""
+  _BRANCH: ""
   _KEY_RING: "cloud-build-ring"
   _KEY_NAME: "publish"
   _REPOSITORY_ORG: "firebase"

scripts/publish/run.sh

@@ -2,21 +2,33 @@
 set -e
 
 printusage() {
-  echo "run.sh <version>"
+  echo "run.sh <version> [branch]"
   echo ""
   echo "Arguments:"
-  echo "  version: 'patch', 'minor', 'major', or 'artifactsOnly'"
+  echo "  version: 'patch', 'minor', 'major', 'artifactsOnly', or 'preview'"
+  echo "  branch: required if version is 'preview'"
 }
 
 VERSION=$1
+BRANCH=$2
 if [[ $VERSION == "" ]]; then
   printusage
   exit 1
+elif [[ $VERSION == "preview" ]]; then
+  if [[ $BRANCH == "" ]]; then
+    printusage
+    exit 1
+  fi
 elif [[ ! ($VERSION == "patch" || $VERSION == "minor" || $VERSION == "major" || $VERSION == "artifactsOnly") ]]; then
   printusage
   exit 1
 fi
 
+SUBSTITUTIONS="_VERSION=$VERSION"
+if [[ $VERSION == "preview" ]]; then
+  SUBSTITUTIONS="$SUBSTITUTIONS,_BRANCH=$BRANCH"
+fi
+
 THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 cd "$THIS_DIR"
@@ -25,5 +37,5 @@ gcloud --project fir-tools-builds \
   builds \
   submit \
   --machine-type=e2-highcpu-8 \
-  --substitutions=_VERSION=$VERSION \
+  --substitutions=$SUBSTITUTIONS \
   .

src/apphosting/secrets/dialogs.spec.ts

@@ -92,7 +92,7 @@ describe("dialogs", () => {
       ]);
     });
 
-    it("uses 'service accounts' header if any backend uses more than one service accont", async () => {
+    it("uses 'service accounts' header if any backend uses more than one service account", async () => {
       const table = dialogs.tableForBackends(await dialogs.toMetadata("number", [legacy, modernA]));
       const legacyAccounts = await secrets.serviceAccountsForBackend("number", legacy);
       expect(table[0]).to.deep.equal(["location", "backend", "service accounts"]);

src/bin/firebase.ts

@@ -2,7 +2,6 @@
 
 // Check for older versions of Node no longer supported by the CLI.
 import * as semver from "semver";
-import { isEnabled } from "../experiments";
 const pkg = require("../../package.json");
 const nodeVersion = process.version;
 if (!semver.satisfies(nodeVersion, pkg.engines.node)) {
@@ -13,7 +12,7 @@ if (!semver.satisfies(nodeVersion, pkg.engines.node)) {
 }
 
 // we short-circuit the normal process for MCP
-if (isEnabled("mcp") && process.argv[2] === "experimental:mcp") {
+if (process.argv[2] === "mcp" || process.argv[2] === "experimental:mcp") {
   const { mcp } = require("./mcp");
   mcp();
 } else {

src/bin/mcp.ts

@@ -14,7 +14,7 @@ This is a running process of the Firebase MCP server. This command should only b
   "mcpServers": {
     "firebase": {
       "command": "firebase",
-      "args": ["experimental:mcp", "--dir", "/path/to/firebase/project"]
+      "args": ["mcp", "--dir", "/path/to/firebase/project"]
     }
   }
 }

src/commands/apptesting-execute.ts

@@ -11,7 +11,7 @@ import { FirebaseError } from "../error";
 import { marked } from "marked";
 import { needProjectId } from "../projectUtils";
 import { consoleUrl } from "../utils";
-import { AppPlatform, listFirebaseApps } from "../management/apps";
+import { AppPlatform, listFirebaseApps, checkForApps } from "../management/apps";
 
 export const command = new Command("apptesting:execute <target>")
   .description("Run automated tests written in natural language driven by AI")
@@ -32,13 +32,28 @@ export const command = new Command("apptesting:execute <target>")
   .before(requireConfig)
   .action(async (target: string, options: any) => {
     const projectId = needProjectId(options);
-    const appList = await listFirebaseApps(projectId, AppPlatform.WEB);
-    let app = appList.find((a) => a.appId === options.app);
-    if (!app && appList.length === 1) {
-      app = appList[0];
-      logger.info(`No app specified, defaulting to ${app.appId}`);
-    } else if (!app) {
-      throw new FirebaseError("Invalid app id");
+    const apps = await listFirebaseApps(projectId, AppPlatform.WEB);
+    // Fail out early if there's no apps.
+    checkForApps(apps, AppPlatform.WEB);
+
+    let app = apps.find((a) => a.appId === options.app);
+    if (!app) {
+      if (options.app) {
+        // An app ID was provided, but it's invalid.
+        throw new FirebaseError(
+          `App with ID '${options.app}' was not found in project ${projectId}. You can list available apps with 'firebase apps:list'.`,
+        );
+      }
+      // if there's only one app, we don't need to prompt interactively
+      if (apps.length === 1) {
+        // If there's only one, use it.
+        app = apps[0];
+      } else {
+        // If there's > 1, fail
+        throw new FirebaseError(
+          `Project ${projectId} has multiple apps, must specify a web app id with '--app', you can list available apps with 'firebase apps:list'.`,
+        );
+      }
     }
 
     const testDir = options.config.src.apptesting?.testDir || "tests";

src/commands/database-instances-create.ts

@@ -25,7 +25,7 @@ export const command = new Command("database:instances:create <instanceName>")
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   .action(async (instanceName: string, options: any) => {
     const projectId = needProjectId(options);
-    const defaultDatabaseInstance = await getDefaultDatabaseInstance({ project: projectId });
+    const defaultDatabaseInstance = await getDefaultDatabaseInstance(projectId);
     if (defaultDatabaseInstance === "") {
       throw new FirebaseError(MISSING_DEFAULT_INSTANCE_ERROR_MESSAGE);
     }