Added MaximumBatchingWindowInSeconds aws#1778

Updated awsclient.py to accept argument on create and update of lambda
event source.

Author: kmbotts

chalice/awsclient.py

@@ -1660,13 +1660,16 @@ def _remove_lambda_permission_if_needed(self, source_arn, function_arn,
                 )
 
     def create_lambda_event_source(self, event_source_arn, function_name,
-                                   batch_size, starting_position=None):
-        # type: (str, str, int, Optional[str]) -> None
+                                   batch_size, starting_position=None,
+                                   maximum_batching_window_in_seconds=0):
+        # type: (str, str, int, Optional[str], Optional[int]) -> None
         lambda_client = self._client('lambda')
+        batch_window = maximum_batching_window_in_seconds
         kwargs = {
             'EventSourceArn': event_source_arn,
             'FunctionName': function_name,
             'BatchSize': batch_size,
+            'MaximumBatchingWindowInSeconds': batch_window
         }
         if starting_position is not None:
             kwargs['StartingPosition'] = starting_position
@@ -1675,12 +1678,18 @@ def create_lambda_event_source(self, event_source_arn, function_name,
             max_attempts=self.LAMBDA_CREATE_ATTEMPTS
         )['UUID']
 
-    def update_lambda_event_source(self, event_uuid, batch_size):
-        # type: (str, int) -> None
+    def update_lambda_event_source(self, event_uuid, batch_size,
+                                   maximum_batching_window_in_seconds=0):
+        # type: (str, int, Optional[int]) -> None
         lambda_client = self._client('lambda')
+        batch_window = maximum_batching_window_in_seconds
+        kwargs = {
+            'UUID': event_uuid,
+            'BatchSize': batch_size,
+            'MaximumBatchingWindowInSeconds': batch_window,
+        }
         self._call_client_method_with_retries(
-            lambda_client.update_event_source_mapping,
-            {'UUID': event_uuid, 'BatchSize': batch_size},
+            lambda_client.update_event_source_mapping, kwargs,
             max_attempts=10,
             should_retry=self._is_settling_error,
         )

tests/functional/test_awsclient.py

@@ -3592,6 +3592,7 @@ def test_can_create_kinesis_event_source(stubbed_session):
         FunctionName=function_name,
         BatchSize=batch_size,
         StartingPosition=starting_position,
+        MaximumBatchingWindowInSeconds=0
     ).returns({'UUID': 'my-uuid'})
 
     stubbed_session.activate_stubs()
@@ -3603,22 +3604,52 @@ def test_can_create_kinesis_event_source(stubbed_session):
     stubbed_session.verify_stubs()
 
 
+def test_can_create_kinesis_event_source_batching_window(stubbed_session):
+    kinesis_arn = 'arn:aws:kinesis:us-west-2:...:stream/MyStream'
+    function_name = 'myfunction'
+    batch_size = 100
+    starting_position = 'TRIM_HORIZON'
+    maximum_batching_window_in_seconds = 60
+
+    lambda_stub = stubbed_session.stub('lambda')
+    lambda_stub.create_event_source_mapping(
+        EventSourceArn=kinesis_arn,
+        FunctionName=function_name,
+        BatchSize=batch_size,
+        StartingPosition=starting_position,
+        MaximumBatchingWindowInSeconds=maximum_batching_window_in_seconds
+
+    ).returns({'UUID': 'my-uuid'})
+
+    stubbed_session.activate_stubs()
+    client = TypedAWSClient(stubbed_session)
+    result = client.create_lambda_event_source(
+        kinesis_arn, function_name, batch_size, starting_position,
+        maximum_batching_window_in_seconds
+    )
+    assert result == 'my-uuid'
+    stubbed_session.verify_stubs()
+
+
 def test_can_create_sqs_event_source(stubbed_session):
     queue_arn = 'arn:sqs:queue-name'
     function_name = 'myfunction'
     batch_size = 100
+    maximum_batching_window_in_seconds = 60
 
     lambda_stub = stubbed_session.stub('lambda')
     lambda_stub.create_event_source_mapping(
         EventSourceArn=queue_arn,
         FunctionName=function_name,
-        BatchSize=batch_size
+        BatchSize=batch_size,
+        MaximumBatchingWindowInSeconds=maximum_batching_window_in_seconds
     ).returns({'UUID': 'my-uuid'})
 
     stubbed_session.activate_stubs()
     client = TypedAWSClient(stubbed_session)
     result = client.create_lambda_event_source(
-        queue_arn, function_name, batch_size
+        queue_arn, function_name, batch_size,
+        maximum_batching_window_in_seconds=maximum_batching_window_in_seconds
     )
     assert result == 'my-uuid'
     stubbed_session.verify_stubs()
@@ -3633,7 +3664,8 @@ def test_can_retry_create_sqs_event_source(stubbed_session):
     lambda_stub.create_event_source_mapping(
         EventSourceArn=queue_arn,
         FunctionName=function_name,
-        BatchSize=batch_size
+        BatchSize=batch_size,
+        MaximumBatchingWindowInSeconds=0
     ).raises_error(
         error_code='InvalidParameterValueException',
         message=('The provided execution role does not '
@@ -3642,7 +3674,8 @@ def test_can_retry_create_sqs_event_source(stubbed_session):
     lambda_stub.create_event_source_mapping(
         EventSourceArn=queue_arn,
         FunctionName=function_name,
-        BatchSize=batch_size
+        BatchSize=batch_size,
+        MaximumBatchingWindowInSeconds=0
     ).returns({'UUID': 'my-uuid'})
 
     stubbed_session.activate_stubs()
@@ -3710,6 +3743,7 @@ def test_can_retry_update_event_source(stubbed_session):
     lambda_stub.update_event_source_mapping(
         UUID='my-uuid',
         BatchSize=5,
+        MaximumBatchingWindowInSeconds=0,
     ).returns({})
 
     stubbed_session.activate_stubs()
@@ -3720,6 +3754,23 @@ def test_can_retry_update_event_source(stubbed_session):
     stubbed_session.verify_stubs()
 
 
+def test_can_retry_update_event_source_batching_window(stubbed_session):
+    lambda_stub = stubbed_session.stub('lambda')
+    lambda_stub.update_event_source_mapping(
+        UUID='my-uuid',
+        BatchSize=5,
+        MaximumBatchingWindowInSeconds=60,
+    ).returns({})
+
+    stubbed_session.activate_stubs()
+    client = TypedAWSClient(stubbed_session)
+    client.update_lambda_event_source(
+        event_uuid='my-uuid', batch_size=5,
+        maximum_batching_window_in_seconds=60
+    )
+    stubbed_session.verify_stubs()
+
+
 @pytest.mark.parametrize('resource_name,service_name,is_verified', [
     ('queue-name', 'sqs', True),
     ('queue-name', 'not-sqs', False),
@@ -3815,11 +3866,13 @@ def test_can_update_lambda_event_source(stubbed_session):
     lambda_stub.update_event_source_mapping(
         UUID='my-uuid',
         BatchSize=5,
+        MaximumBatchingWindowInSeconds=60,
     ).returns({})
 
     stubbed_session.activate_stubs()
     client = TypedAWSClient(stubbed_session)
     client.update_lambda_event_source(
-        event_uuid='my-uuid', batch_size=5
+        event_uuid='my-uuid', batch_size=5,
+        maximum_batching_window_in_seconds=60
     )
     stubbed_session.verify_stubs()