Fix --only firestore:rules,firestore:indexes edge case (#6966)

aalej · web-flow · commit 8287ceca9b5e · 2024-04-11T23:04:27.000+08:00
* Fix --only firestore:rules,firestore:indexes edge case

* Added changelog entry
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1 +1,2 @@
+- Fixes bug where `firebase deploy --only firestore:rules,firestore:indexes` does not update rules and indexes. (#6966)
 - Add Firebase console link after creating or restoring a Firestore database (#6949)
diff --git a/src/deploy/firestore/prepare.ts b/src/deploy/firestore/prepare.ts
@@ -72,12 +72,21 @@ function prepareIndexes(
 export default async function (context: any, options: any): Promise<void> {
   if (options.only) {
     const targets = options.only.split(",");
+
+    // Used for edge case when deploying to a named database
+    // https://github.com/firebase/firebase-tools/pull/6129
     const excludeRules = targets.indexOf("firestore:indexes") >= 0;
     const excludeIndexes = targets.indexOf("firestore:rules") >= 0;
+
+    // Used for edge case when deploying --only firestore:rules,firestore:indexes
+    // https://github.com/firebase/firebase-tools/issues/6857
+    const includeRules = targets.indexOf("firestore:rules") >= 0;
+    const includeIndexes = targets.indexOf("firestore:indexes") >= 0;
+
     const onlyFirestore = targets.indexOf("firestore") >= 0;
 
-    context.firestoreIndexes = !excludeIndexes || onlyFirestore;
-    context.firestoreRules = !excludeRules || onlyFirestore;
+    context.firestoreIndexes = !excludeIndexes || includeIndexes || onlyFirestore;
+    context.firestoreRules = !excludeRules || includeRules || onlyFirestore;
   } else {
     context.firestoreIndexes = true;
     context.firestoreRules = true;

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	+- Fixes bug where `firebase deploy --only firestore:rules,firestore:indexes` does not update rules and indexes. (#6966)
`1`	`2`	`- Add Firebase console link after creating or restoring a Firestore database (#6949)`