[pr] second round of feeback

airbnb · Jul 17, 2017 · d0de948 · d0de948
1 parent 21cb539
commit d0de948
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 23 deletions.
diff --git a/stream_alert/alert_processor/main.py b/stream_alert/alert_processor/main.py
@@ -52,7 +52,7 @@ def handler(event, context):
     function_name = context.function_name
 
     # Return the current list of statuses back to the caller
-    return list(status for status in run(event, region, function_name, config))
+    return list(run(event, region, function_name, config))
 
 def run(alert, region, function_name, config):
     """Send an Alert to its described outputs.

diff --git a/terraform/modules/tf_stream_alert/s3.tf b/terraform/modules/tf_stream_alert/s3.tf
diff --git a/test/unit/stream_alert_cli/test_outputs.py b/test/unit/stream_alert_cli/test_outputs.py
@@ -34,7 +34,7 @@
 
 def test_load_output_config():
     """Load outputs configuration"""
-    config = load_outputs_config()
+    config = load_outputs_config('test/unit/conf')
     loaded_config_keys = sorted(config.keys())
 
     expected_config_keys = [u'aws-lambda', u'aws-s3', u'pagerduty', u'phantom', u'slack']

diff --git a/test/unit/stream_alert_rule_processor/test_sink.py b/test/unit/stream_alert_rule_processor/test_sink.py
@@ -69,12 +69,13 @@ def test_json_from_dict():
         json_message = sink._json_dump(alert)
 
         # Test with single alert entry
-        assert_equal(json_message, '{"record": {"record_data_key02_01": ' \
-            '"record_data_value02_01", "record_data_key01_01": "record_data_value01_01"}, ' \
-            '"metadata": {"source": {"service": "payload_service_01", ' \
-            '"entity": "payload_entity_01"}, "rule_name": "test_rule_01", ' \
-            '"type": "payload_type_01", "log": "payload_data_01", ' \
-            '"outputs": "rule.outputs_01"}}')
+        assert_equal(json_message, '{"record": {"record_data_key02_01": '
+                     '"record_data_value02_01", "record_data_key01_01": '
+                     '"record_data_value01_01"}, "metadata": {"source": '
+                     '{"service": "payload_service_01", "entity": '
+                     '"payload_entity_01"}, "rule_name": "test_rule_01", '
+                     '"type": "payload_type_01", "log": "payload_data_01", '
+                     '"outputs": "rule.outputs_01"}}')
 
 def get_payload(byte_size):
     """Returns a base64 encoded random payload of (roughly) byte_size length