Consolidate interface and refactor AILogic checks

Author: wandamora

src/deploy/functions/prepare.ts

@@ -66,17 +66,17 @@ import * as prompt from "../../prompt";
 export const EVENTARC_SOURCE_ENV = "EVENTARC_CLOUD_EVENT_SOURCE";
 export const DEFAULT_FUNCTION_REGION = "us-central1";
 
-interface EventTriggerResolutionTarget {
+/**
+ * A subset of the backend.Endpoint interface for the purposes of resolving regions.
+ */
+interface TriggerResolutionTarget {
   project: string;
-  eventTrigger: {
+  eventTrigger?: {
     eventType: string;
     eventFilters?: Record<string, string | build.Expression<string>>;
     region?: string | build.Expression<string>;
   };
-}
-
-interface BlockingTriggerResolutionTarget {
-  blockingTrigger: {
+  blockingTrigger?: {
     eventType: string;
     options?: Record<string, unknown>;
   };
@@ -415,22 +415,26 @@ export async function resolveDefaultRegionsForBuild(
   }
 }
 
-function resolveRegionForBlockingTrigger(endpoint: BlockingTriggerResolutionTarget): string {
+function resolveRegionForBlockingTrigger(endpoint: TriggerResolutionTarget): string {
+  if (!endpoint.blockingTrigger) {
+    return DEFAULT_FUNCTION_REGION;
+  }
   const eventType = endpoint.blockingTrigger.eventType;
   if ((events.AUTH_BLOCKING_EVENTS as readonly string[]).includes(eventType)) {
     return "us-east1";
   }
 
-  if (isGlobalAILogicEndpoint(endpoint as backend.Endpoint)) {
+  if (isGlobalAILogicEndpoint(endpoint)) {
     return "us-east1";
   }
 
   return DEFAULT_FUNCTION_REGION;
 }
 
-async function resolveRegionForEventTrigger(
-  endpoint: EventTriggerResolutionTarget,
-): Promise<string> {
+async function resolveRegionForEventTrigger(endpoint: TriggerResolutionTarget): Promise<string> {
+  if (!endpoint.eventTrigger) {
+    return DEFAULT_FUNCTION_REGION;
+  }
   const eventTrigger = endpoint.eventTrigger;
   const eventType = eventTrigger.eventType;
 

src/deploy/functions/services/ailogic.ts

@@ -15,7 +15,15 @@ export const AI_LOGIC_EVENTS = [
   AI_LOGIC_AFTER_GENERATE_CONTENT,
 ] as const;
 
-export type AILogicEndpoint = backend.Endpoint & {
+export interface AILogicTriggerTarget {
+  blockingTrigger?: {
+    eventType: string;
+    options?: Record<string, unknown>;
+  };
+  project?: string;
+}
+
+export type AILogicTrigger = {
   blockingTrigger: {
     eventType: (typeof AI_LOGIC_EVENTS)[number];
     options?: {
@@ -24,16 +32,26 @@ export type AILogicEndpoint = backend.Endpoint & {
   };
 };
 
-export function isAILogicEvent(endpoint: backend.Endpoint): endpoint is AILogicEndpoint {
-  if (!backend.isBlockingTriggered(endpoint)) {
+export type AILogicEndpoint = backend.Endpoint & AILogicTrigger;
+
+/**
+ * Type guard to check if a trigger target is an AI Logic event trigger.
+ */
+export function isAILogicEvent<T extends AILogicTriggerTarget>(
+  endpoint: T,
+): endpoint is T & AILogicTrigger {
+  if (!endpoint.blockingTrigger) {
     return false;
   }
   return AI_LOGIC_EVENTS.includes(
     endpoint.blockingTrigger.eventType as (typeof AI_LOGIC_EVENTS)[number],
   );
 }
 
-export function isGlobalAILogicEndpoint(endpoint: backend.Endpoint): boolean {
+/**
+ * Check if an AI Logic trigger target is global (i.e. not a regional webhook).
+ */
+export function isGlobalAILogicEndpoint(endpoint: AILogicTriggerTarget): boolean {
   if (!isAILogicEvent(endpoint)) {
     return false;
   }