Revert "Merge pull request #566 from mozilla/fix_camelcase_alert"

This reverts commit 78fcd5b632, reversing
changes made to 761f16423d.

alerts/cloudtrail_logging_disabled.py

@@ -18,10 +18,10 @@ class AlertCloudtrailLoggingDisabled(AlertTask):
 
         search_query.add_must([
             TermMatch('_type', 'cloudtrail'),
-            TermMatch('details.eventname', 'StopLogging'),
+            TermMatch('details.eventName', 'StopLogging'),
         ])
 
-        search_query.add_must_not(TermMatch('details.errorcode', 'AccessDenied'))
+        search_query.add_must_not(TermMatch('details.errorCode', 'AccessDenied'))
 
         self.filtersManual(search_query)
         self.searchEventsSimple()
@@ -32,6 +32,6 @@ class AlertCloudtrailLoggingDisabled(AlertTask):
         tags = ['cloudtrail', 'aws', 'cloudtrailpagerduty']
         severity = 'CRITICAL'
 
-        summary = 'Cloudtrail Logging Disabled: ' + event['_source']['details']['requestparameters']['name']
+        summary = 'Cloudtrail Logging Disabled: ' + event['_source']['details']['requestParameters']['name']
 
         return self.createAlertDict(summary, category, tags, [event], severity)

tests/alerts/test_cloudtrail_deadman.py

@@ -14,7 +14,7 @@ class TestAlertCloudtrailDeadman(AlertTestSuite):
         "_type": "cloudtrail",
         "_source": {
             "details": {
-                "eventname": "somename"
+                "eventName": "somename"
             }
         }
     }

tests/alerts/test_cloudtrail_logging_disabled.py

@@ -13,8 +13,8 @@ class TestAlertCloudtrailLoggingDisabled(AlertTestSuite):
         "_type": "cloudtrail",
         "_source": {
             "details": {
-               "eventname": "StopLogging",
-                "requestparameters": {
+               "eventName": "StopLogging",
+                "requestParameters": {
                     "name": "cloudtrail_example_name"
                 }
             }
@@ -61,7 +61,7 @@ class TestAlertCloudtrailLoggingDisabled(AlertTestSuite):
     )
 
     event = AlertTestSuite.create_event(default_event)
-    event['_source']['details']['eventname'] = 'Badeventname'
+    event['_source']['details']['eventName'] = 'Badeventname'
     test_cases.append(
         NegativeAlertTestCase(
             description="Negative test case with bad eventName",
@@ -80,7 +80,7 @@ class TestAlertCloudtrailLoggingDisabled(AlertTestSuite):
     )
 
     event = AlertTestSuite.create_event(default_event)
-    event['_source']['details']['errorcode'] = 'AccessDenied'
+    event['_source']['details']['errorCode'] = 'AccessDenied'
     test_cases.append(
         NegativeAlertTestCase(
             description="Negative test case with excluding errorCode",

tests/lib/query_models/test_term_match.py

@@ -94,10 +94,5 @@ class TestTermMatchNegativeTestSuite(NegativeTestSuite):
             TermMatch('somekey', 'tag'): [
                 {'somekey': ['atag', 'tagging']},
             ],
-            TermMatch('CamelCaseKey', 'test'): [
-                {'camelcasekey': 'test'},
-                {'camelCaseKey': 'test'},
-                {'camelcaseKey': 'test'},
-            ],
         }
         return tests