fix indexes — Disabled field was missing from application queries

reviewer caught it: CreateDeploymentChain always filters on Disabled so
the composite indexes from the previous commit won't actually serve those
queries. swapped out the four bad entries for the three shapes that match:
  ProjectId | Disabled | Name | Id
  ProjectId | Disabled | Kind | Id
  ProjectId | Disabled | Name | Kind | Id

the standalone ProjectId | Id one is redundant with ProjectId | Disabled | Id
so dropped it too.

Co-authored-by: areebahmeddd <areebahmeddd@users.noreply.github.com>
Signed-off-by: srinivasr <sriniv4sreddy@gmail.com>

Author: srinivasr

pkg/app/ops/firestoreindexensurer/indexes.json

@@ -35,18 +35,7 @@
         "arrayConfig": ""
       },
       {
-        "fieldPath": "Id",
-        "order": "ASCENDING",
-        "arrayConfig": ""
-      }
-    ]
-  },
-  {
-    "collectionGroup": "Application",
-    "queryScope": "COLLECTION",
-    "fields": [
-      {
-        "fieldPath": "ProjectId",
+        "fieldPath": "Disabled",
         "order": "ASCENDING",
         "arrayConfig": ""
       },
@@ -71,6 +60,11 @@
         "order": "ASCENDING",
         "arrayConfig": ""
       },
+      {
+        "fieldPath": "Disabled",
+        "order": "ASCENDING",
+        "arrayConfig": ""
+      },
       {
         "fieldPath": "Kind",
         "order": "ASCENDING",
@@ -92,6 +86,11 @@
         "order": "ASCENDING",
         "arrayConfig": ""
       },
+      {
+        "fieldPath": "Disabled",
+        "order": "ASCENDING",
+        "arrayConfig": ""
+      },
       {
         "fieldPath": "Name",
         "order": "ASCENDING",

pkg/app/ops/firestoreindexensurer/indexes_test.go

@@ -59,18 +59,7 @@ func TestParseIndexes(t *testing.T) {
 					ArrayConfig: "",
 				},
 				{
-					FieldPath:   "Id",
-					Order:       "ASCENDING",
-					ArrayConfig: "",
-				},
-			},
-		},
-		{
-			CollectionGroup: "Application",
-			QueryScope:      "COLLECTION",
-			Fields: []field{
-				{
-					FieldPath:   "ProjectId",
+					FieldPath:   "Disabled",
 					Order:       "ASCENDING",
 					ArrayConfig: "",
 				},
@@ -95,6 +84,11 @@ func TestParseIndexes(t *testing.T) {
 					Order:       "ASCENDING",
 					ArrayConfig: "",
 				},
+				{
+					FieldPath:   "Disabled",
+					Order:       "ASCENDING",
+					ArrayConfig: "",
+				},
 				{
 					FieldPath:   "Kind",
 					Order:       "ASCENDING",
@@ -116,6 +110,11 @@ func TestParseIndexes(t *testing.T) {
 					Order:       "ASCENDING",
 					ArrayConfig: "",
 				},
+				{
+					FieldPath:   "Disabled",
+					Order:       "ASCENDING",
+					ArrayConfig: "",
+				},
 				{
 					FieldPath:   "Name",
 					Order:       "ASCENDING",