Gemini review

Author: shettyvarun268

src/deploy/functions/triggerRegionHelper.spec.ts

@@ -24,6 +24,7 @@ describe("TriggerRegionHelper", () => {
       firestoreStub = sinon
         .stub(firestore, "getDatabase")
         .throws("unexpected call to firestore.getDatabase");
+      firestoreService.clearCache();
     });
 
     afterEach(() => {
@@ -171,7 +172,6 @@ describe("TriggerRegionHelper", () => {
       };
 
       const logLabeledWarningStub = sinon.stub(utils, "logLabeledWarning");
-      firestoreService.clearCache();
 
       await triggerRegionHelper.ensureTriggerRegions(backend.of(wantFn));
 

src/deploy/functions/triggerRegionHelper.ts

@@ -19,19 +19,23 @@ export async function ensureTriggerRegions(want: backend.Backend): Promise<void>
   await Promise.all(regionLookups);
 
   // Warn if an event function defaults to or is assigned to us-central1 but its trigger is elsewhere,
-  // to avoid unnecessary cross-region network hops. We ignore nam5 since it covers us-central1.
+  // to avoid unnecessary cross-region network hops. We ignore nam5 and us since they cover us-central1.
   for (const ep of backend.allEndpoints(want)) {
+    if (!backend.isEventTriggered(ep)) {
+      continue;
+    }
+    const triggerRegion = ep.eventTrigger?.region;
     if (
       ep.region === "us-central1" &&
-      backend.isEventTriggered(ep) &&
-      ep.eventTrigger?.region &&
-      ep.eventTrigger.region !== "us-central1" &&
-      ep.eventTrigger.region !== "nam5"
+      triggerRegion &&
+      triggerRegion !== "us-central1" &&
+      triggerRegion !== "nam5" &&
+      triggerRegion !== "us"
     ) {
       utils.logLabeledWarning(
         "functions",
-        `Function ${ep.id} located in us-central1 uses a trigger located in ${ep.eventTrigger.region}. ` +
-          `To avoid unnecessary cross-region network hops, you should explicitly assign this function to ${ep.eventTrigger.region}.`,
+        `Function ${ep.id} located in us-central1 uses a trigger located in ${triggerRegion}. ` +
+          `To avoid unnecessary cross-region network hops, you should explicitly assign this function to ${triggerRegion}.`,
       );
     }
   }