fix S3 bucket notification configuration with single Event type specified (localstack#419)

Author: whummer

localstack/services/s3/s3_listener.py

@@ -13,7 +13,7 @@
 from localstack.constants import DEFAULT_REGION
 from localstack.utils import persistence
 from localstack.utils.aws import aws_stack
-from localstack.utils.common import short_uid, timestamp, TIMESTAMP_FORMAT_MILLIS, to_str, to_bytes
+from localstack.utils.common import short_uid, timestamp, TIMESTAMP_FORMAT_MILLIS, to_str, to_bytes, clone
 from localstack.utils.analytics import event_publisher
 from localstack.services.generic_proxy import ProxyListener
 
@@ -383,17 +383,21 @@ def forward_request(self, method, path, data, headers):
             if method == 'PUT':
                 parsed = xmltodict.parse(data)
                 notif_config = parsed.get('NotificationConfiguration')
+                S3_NOTIFICATIONS.pop(bucket, None)
                 for dest in ['Queue', 'Topic', 'CloudFunction']:
                     config = notif_config.get('%sConfiguration' % (dest))
                     if config:
-                        # TODO: what if we have multiple destinations - would we overwrite the config?
+                        events = config.get('Event')
+                        if isinstance(events, six.string_types):
+                            events = [events]
                         notification_details = {
                             'Id': config.get('Id'),
-                            'Event': config.get('Event'),
+                            'Event': events,
                             dest: config.get(dest),
                             'Filter': config.get('Filter')
                         }
-                        S3_NOTIFICATIONS[bucket] = json.loads(json.dumps(notification_details))
+                        # TODO: what if we have multiple destinations - would we overwrite the config?
+                        S3_NOTIFICATIONS[bucket] = clone(notification_details)
 
             # return response for ?notification request
             return response

tests/integration/test_notifications.py

@@ -107,3 +107,24 @@ def test_bucket_notifications():
 
     # receive, assert, and delete message from SQS
     receive_assert_delete(queue_url, [{'key': test_key2}, {'name': TEST_BUCKET_NAME_WITH_NOTIFICATIONS}], sqs_client)
+
+    # delete notification config
+    s3_client.put_bucket_notification_configuration(
+        Bucket=TEST_BUCKET_NAME_WITH_NOTIFICATIONS, NotificationConfiguration={})
+    config = s3_client.get_bucket_notification_configuration(Bucket=TEST_BUCKET_NAME_WITH_NOTIFICATIONS)
+    assert not config.get('QueueConfigurations')
+
+    # put notification config with single event type
+    event = 's3:ObjectCreated:*'
+    s3_client.put_bucket_notification_configuration(Bucket=TEST_BUCKET_NAME_WITH_NOTIFICATIONS,
+        NotificationConfiguration={
+            'QueueConfigurations': [{
+                'Id': 'id123456',
+                'QueueArn': queue_arn,
+                'Events': [event]
+            }]
+        }
+    )
+    config = s3_client.get_bucket_notification_configuration(Bucket=TEST_BUCKET_NAME_WITH_NOTIFICATIONS)
+    config = config['QueueConfigurations'][0]
+    assert config['Events'] == [event]

tests/integration/test_s3.py

@@ -30,6 +30,6 @@ def test_bucket_policy():
     )
     assert response['ResponseMetadata']['HTTPStatusCode'] == 204
 
-    # retrieve and check notification config
+    # retrieve and check policy config
     saved_policy = s3_client.get_bucket_policy(Bucket=TEST_BUCKET_NAME_WITH_POLICY)['Policy']
     assert json.loads(saved_policy) == policy