Skip to content

Commit 2358cc1

Browse files
colerogerstaeold
andauthored
Fix retry in event triggers (#1463)
* fix retry in event triggers * changelog * fix tests * Use nullish coalescing instea of logical or. --------- Co-authored-by: Daniel Lee <[email protected]> Co-authored-by: Daniel Lee <[email protected]>
1 parent 95ae33f commit 2358cc1

File tree

9 files changed

+9
-7
lines changed

9 files changed

+9
-7
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
- Fix retry in event triggered functions. (#1463)
12
- Expose retry configuration in v2 RTDB trigger (#1588)

src/v2/providers/alerts/alerts.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ export function getEndpointAnnotation(
250250
eventFilters: {
251251
alerttype: alertType,
252252
},
253-
retry: !!opts.retry,
253+
retry: opts.retry ?? false,
254254
},
255255
};
256256
if (appId) {

src/v2/providers/eventarc.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ export function onCustomEventPublished<T = any>(
217217
eventTrigger: {
218218
eventType: opts.eventType,
219219
eventFilters: {},
220-
retry: false,
220+
retry: opts.retry ?? false,
221221
channel,
222222
},
223223
};

src/v2/providers/firestore.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ export function makeEndpoint(
685685
eventType,
686686
eventFilters,
687687
eventFilterPathPatterns,
688-
retry: !!opts.retry,
688+
retry: opts.retry ?? false,
689689
},
690690
};
691691
}

src/v2/providers/pubsub.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ export function onMessagePublished<T = any>(
345345
eventTrigger: {
346346
eventType: "google.cloud.pubsub.topic.v1.messagePublished",
347347
eventFilters: { topic },
348-
retry: false,
348+
retry: opts.retry ?? false,
349349
},
350350
};
351351
copyIfPresent(endpoint.eventTrigger, opts, "retry", "retry");

src/v2/providers/remoteConfig.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export function onConfigUpdated(
149149
eventTrigger: {
150150
eventType,
151151
eventFilters: {},
152-
retry: !!optsOrHandler.retry,
152+
retry: optsOrHandler.retry ?? false,
153153
},
154154
};
155155
func.__endpoint = ep;

src/v2/providers/storage.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ export function onOperation(
624624
eventTrigger: {
625625
eventType,
626626
eventFilters: { bucket },
627-
retry: false,
627+
retry: opts.retry ?? false,
628628
},
629629
};
630630
copyIfPresent(endpoint.eventTrigger, opts, "retry", "retry");

src/v2/providers/tasks.ts

+1
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ export function onTaskDispatched<Args = any>(
282282
convertInvoker
283283
);
284284
convertIfPresent(func.__endpoint.taskQueueTrigger, opts, "invoker", "invoker", convertInvoker);
285+
copyIfPresent(func.__endpoint.taskQueueTrigger, opts, "retry", "retry");
285286

286287
func.__requiredAPIs = [
287288
{

src/v2/providers/testLab.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ export function onTestMatrixCompleted(
207207
eventTrigger: {
208208
eventType,
209209
eventFilters: {},
210-
retry: !!optsOrHandler.retry,
210+
retry: optsOrHandler.retry ?? false,
211211
},
212212
};
213213
func.__endpoint = ep;

0 commit comments

Comments
 (0)