From f7ecb9fa572c37dd9188dde8a818ad8b1ca6232e Mon Sep 17 00:00:00 2001
From: Daniele Iasella <daniele.iasella@abcam.com>
Date: Thu, 3 Nov 2022 22:30:23 +0100
Subject: [PATCH] fix: checks on kafka startingpositiontimestamp param

---
 lib/plugins/aws/package/compile/events/kafka.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/kafka.js b/lib/plugins/aws/package/compile/events/kafka.js
index b5ad3519c451..b34cfde716db 100644
--- a/lib/plugins/aws/package/compile/events/kafka.js
+++ b/lib/plugins/aws/package/compile/events/kafka.js
@@ -154,7 +154,10 @@ class AwsCompileKafkaEvents {
         const startingPosition = event.kafka.startingPosition || 'TRIM_HORIZON';
         const startingPositionTimestamp = event.kafka.startingPositionTimestamp;
 
-        if (startingPosition === 'AT_TIMESTAMP' && !startingPositionTimestamp) {
+        if (
+          startingPosition === 'AT_TIMESTAMP' &&
+          !(startingPositionTimestamp !== undefined && startingPositionTimestamp !== null)
+        ) {
           throw new ServerlessError(
             `You must specify startingPositionTimestamp for function: ${functionName} when startingPosition is AT_TIMESTAMP.`,
             'FUNCTION_KAFKA_STARTING_POSITION_TIMESTAMP_INVALID'
@@ -254,7 +257,7 @@ class AwsCompileKafkaEvents {
           };
         }
 
-        if (startingPositionTimestamp !== undefined) {
+        if (startingPositionTimestamp !== undefined && startingPositionTimestamp !== null) {
           kafkaResource.Properties.StartingPositionTimestamp = startingPositionTimestamp;
         }