feat: Add support for kafka event startingPositionTimestamp

serverless · Oct 27, 2022 · 43e3096 · 43e3096
1 parent d2b6926
commit 43e3096
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 1 deletion.
diff --git a/lib/plugins/aws/package/compile/events/kafka.js b/lib/plugins/aws/package/compile/events/kafka.js
@@ -84,7 +84,11 @@ class AwsCompileKafkaEvents {
         },
         startingPosition: {
           type: 'string',
-          enum: ['LATEST', 'TRIM_HORIZON'],
+          enum: ['LATEST', 'TRIM_HORIZON', 'AT_TIMESTAMP'],
+        },
+        startingPositionTimestamp: {
+          type: 'number',
+          minimum: 0,
         },
         topic: {
           type: 'string',
@@ -149,6 +153,14 @@ class AwsCompileKafkaEvents {
         hasKafkaEvent = true;
         const { topic, batchSize, maximumBatchingWindow, enabled, consumerGroupId } = event.kafka;
         const startingPosition = event.kafka.startingPosition || 'TRIM_HORIZON';
+        const startingPositionTimestamp = event.kafka.startingPositionTimestamp;
+
+        if (startingPosition === 'AT_TIMESTAMP' && !startingPositionTimestamp) {
+          throw new ServerlessError(
+            `You must specify startingPositionTimestamp for function: ${functionName} when startingPosition is AT_TIMESTAMP`,
+            'FUNCTION_KAFKA_STARTING_POSITION_TIMESTAMP_INVALID'
+          );
+        }
 
         const kafkaEventLogicalId = this.provider.naming.getKafkaEventLogicalId(
           functionName,
@@ -243,6 +255,10 @@ class AwsCompileKafkaEvents {
           };
         }
 
+        if (startingPositionTimestamp) {
+          kafkaResource.Properties.StartingPositionTimestamp = startingPositionTimestamp;
+        }
+
         cfTemplate.Resources[kafkaEventLogicalId] = kafkaResource;
       });
 

diff --git a/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js b/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
@@ -533,6 +533,65 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
       });
     });
 
+    describe('startingPositionAtTimestamp', () => {
+      it('should fail to compile EventSourceMapping resource properties for startingPosition AT_TIMESTAMP with no startingPositionAtTimestamp', async () => {
+        await expect(
+          await runServerless({
+            fixture: 'function',
+            configExt: {
+              functions: {
+                basic: {
+                  role: { 'Fn::ImportValue': 'MyImportedRole' },
+                  events: [
+                    {
+                      kafka: {
+                        topic,
+                        bootstrapServers: ['abc.xyz:9092'],
+                        accessConfigurations: { saslScram256Auth: saslScram256AuthArn },
+                        startingPosition: 'AT_TIMESTAMP',
+                      },
+                    },
+                  ],
+                },
+              },
+            },
+            command: 'package',
+          })
+        ).to.be.rejected.and.eventually.contain({
+          code: 'FUNCTION_KAFKA_STARTING_POSITION_TIMESTAMP_INVALID',
+        });
+      });
+    });
+
+    it('should correctly compile EventSourceMapping resource properties for startingPosition', async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            basic: {
+              role: { 'Fn::ImportValue': 'MyImportedRole' },
+              events: [
+                {
+                  kafka: {
+                    topic,
+                    bootstrapServers: ['abc.xyz:9092'],
+                    accessConfigurations: { saslScram256Auth: saslScram256AuthArn },
+                    startingPosition: 'AT_TIMESTAMP',
+                    startingPositionAtTimestamp: 123,
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+
+      const eventSourceMappingResource =
+        cfTemplate.Resources[awsNaming.getKafkaEventLogicalId('basic', 'TestingTopic')];
+      expect(eventSourceMappingResource.DependsOn).to.deep.equal(123);
+    });
+
     it('should not add dependsOn for imported role', async () => {
       const { awsNaming, cfTemplate } = await runServerless({
         fixture: 'function',