Merge master

scan.py

@@ -154,17 +154,28 @@ def sns_start_scan(s3_object):
     )
 
 
+<<<<<<< HEAD
 def sns_scan_results(s3_object, scan_result, scan_signature):
+=======
+def sns_scan_results(s3_object, result):
+>>>>>>> master
     # Don't publish if SNS ARN has not been supplied
     if AV_STATUS_SNS_ARN in [None, ""]:
         return
     # Don't publish if result is CLEAN and CLEAN results should not be published
+<<<<<<< HEAD
     if scan_result == AV_STATUS_CLEAN and not str_to_bool(AV_STATUS_SNS_PUBLISH_CLEAN):
         return
     # Don't publish if result is INFECTED and INFECTED results should not be published
     if scan_result == AV_STATUS_INFECTED and not str_to_bool(
         AV_STATUS_SNS_PUBLISH_INFECTED
     ):
+=======
+    if result == AV_STATUS_CLEAN and not str_to_bool(AV_STATUS_SNS_PUBLISH_CLEAN):
+        return
+    # Don't publish if result is INFECTED and INFECTED results should not be published
+    if result == AV_STATUS_INFECTED and not str_to_bool(AV_STATUS_SNS_PUBLISH_INFECTED):
+>>>>>>> master
         return
     message = {
         "bucket": s3_object.bucket_name,