Address comments of @rylnd

elastic · Nov 30, 2020 · c47a47d · c47a47d
1 parent 9dbee12
commit c47a47d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/...lution/server/lib/detection_engine/signals/mappings/build_risk_score_from_mapping.test.ts b/...lution/server/lib/detection_engine/signals/mappings/build_risk_score_from_mapping.test.ts
@@ -36,7 +36,7 @@ describe('buildRiskScoreFromMapping', () => {
         fieldValue: 42,
         scoreDefault: 57,
         scoreMapping: mappingToSingleField(),
-        expected: overridenScoreOf(42),
+        expected: overriddenScoreOf(42),
       });
     });
 
@@ -45,7 +45,7 @@ describe('buildRiskScoreFromMapping', () => {
         fieldValue: 3.14,
         scoreDefault: 57,
         scoreMapping: mappingToSingleField(),
-        expected: overridenScoreOf(3.14),
+        expected: overriddenScoreOf(3.14),
       });
     });
 
@@ -74,7 +74,7 @@ describe('buildRiskScoreFromMapping', () => {
         fieldValue: '42',
         scoreDefault: 57,
         scoreMapping: mappingToSingleField(),
-        expected: overridenScoreOf(42),
+        expected: overriddenScoreOf(42),
       });
     });
 
@@ -83,7 +83,7 @@ describe('buildRiskScoreFromMapping', () => {
         fieldValue: '3.14',
         scoreDefault: 57,
         scoreMapping: mappingToSingleField(),
-        expected: overridenScoreOf(3.14),
+        expected: overriddenScoreOf(3.14),
       });
     });
 
@@ -112,7 +112,7 @@ describe('buildRiskScoreFromMapping', () => {
         fieldValue: [3.14],
         scoreDefault: 57,
         scoreMapping: mappingToSingleField(),
-        expected: overridenScoreOf(3.14),
+        expected: overriddenScoreOf(3.14),
       });
     });
 
@@ -121,7 +121,7 @@ describe('buildRiskScoreFromMapping', () => {
         fieldValue: [42, -42, 17, 87, 87.5, '86.5', 110, 66],
         scoreDefault: 57,
         scoreMapping: mappingToSingleField(),
-        expected: overridenScoreOf(87.5),
+        expected: overriddenScoreOf(87.5),
       });
     });
 
@@ -130,7 +130,7 @@ describe('buildRiskScoreFromMapping', () => {
         fieldValue: [-1, 1, '3', '1.5', '3.14', 2],
         scoreDefault: 57,
         scoreMapping: mappingToSingleField(),
-        expected: overridenScoreOf(3.14),
+        expected: overriddenScoreOf(3.14),
       });
     });
   });
@@ -178,7 +178,7 @@ describe('buildRiskScoreFromMapping', () => {
           fieldValue: value,
           scoreDefault: 57,
           scoreMapping: mappingToSingleField(),
-          expected: overridenScoreOf(expectedScore),
+          expected: overriddenScoreOf(expectedScore),
         });
       });
     });
@@ -213,7 +213,7 @@ function scoreOf(value: number) {
   };
 }
 
-function overridenScoreOf(value: number) {
+function overriddenScoreOf(value: number) {
   return {
     riskScore: value,
     riskScoreMeta: { riskScoreOverridden: true },

diff --git a/...ty_solution/server/lib/detection_engine/signals/mappings/build_risk_score_from_mapping.ts b/...ty_solution/server/lib/detection_engine/signals/mappings/build_risk_score_from_mapping.ts
@@ -48,7 +48,7 @@ export const buildRiskScoreFromMapping = ({
 
   if (validNumbers.length > 0) {
     const maxNumber = getMaxOf(validNumbers);
-    return overridenScore(maxNumber);
+    return overriddenScore(maxNumber);
   }
 
   return defaultScore(riskScore);
@@ -83,6 +83,6 @@ function defaultScore(riskScore: RiskScore): BuildRiskScoreFromMappingReturn {
   return { riskScore, riskScoreMeta: {} };
 }
 
-function overridenScore(riskScore: RiskScore): BuildRiskScoreFromMappingReturn {
+function overriddenScore(riskScore: RiskScore): BuildRiskScoreFromMappingReturn {
   return { riskScore, riskScoreMeta: { riskScoreOverridden: true } };
 }
diff --git a/...solution/server/lib/detection_engine/signals/mappings/build_severity_from_mapping.test.ts b/...solution/server/lib/detection_engine/signals/mappings/build_severity_from_mapping.test.ts
@@ -44,7 +44,7 @@ describe('buildSeverityFromMapping', () => {
           { field: ECS_FIELD, operator: 'equals', value: '33', severity: 'high' },
           { field: ECS_FIELD, operator: 'equals', value: '43', severity: 'critical' },
         ],
-        expected: overridenSeverityOf('medium'),
+        expected: overriddenSeverityOf('medium'),
       });
     });
 
@@ -72,7 +72,7 @@ describe('buildSeverityFromMapping', () => {
           { field: ANY_FIELD, operator: 'equals', value: '33', severity: 'high' },
           { field: ANY_FIELD, operator: 'equals', value: '43', severity: 'critical' },
         ],
-        expected: overridenSeverityOf('medium', ANY_FIELD),
+        expected: overriddenSeverityOf('medium', ANY_FIELD),
       });
     });
 
@@ -85,7 +85,7 @@ describe('buildSeverityFromMapping', () => {
           { field: ANY_FIELD, operator: 'equals', value: 'anything', severity: 'medium' },
           { field: ANY_FIELD, operator: 'equals', value: 'hackerman', severity: 'critical' },
         ],
-        expected: overridenSeverityOf('critical', ANY_FIELD),
+        expected: overriddenSeverityOf('critical', ANY_FIELD),
       });
     });
   });
@@ -101,7 +101,7 @@ describe('buildSeverityFromMapping', () => {
           { field: ECS_FIELD, operator: 'equals', value: '33', severity: 'high' },
           { field: ECS_FIELD, operator: 'equals', value: '43', severity: 'critical' },
         ],
-        expected: overridenSeverityOf('critical'),
+        expected: overriddenSeverityOf('critical'),
       });
     });
 
@@ -116,7 +116,7 @@ describe('buildSeverityFromMapping', () => {
           { field: ANY_FIELD, operator: 'equals', value: 'foo', severity: 'low' },
           { field: ANY_FIELD, operator: 'equals', value: 'boo', severity: 'medium' },
         ],
-        expected: overridenSeverityOf('critical', ANY_FIELD),
+        expected: overriddenSeverityOf('critical', ANY_FIELD),
       });
     });
   });
@@ -131,7 +131,7 @@ describe('buildSeverityFromMapping', () => {
           { field: ECS_FIELD, operator: 'equals', value: '23', severity: 'critical' },
           { field: ECS_FIELD, operator: 'equals', value: '23', severity: 'high' },
         ],
-        expected: overridenSeverityOf('critical'),
+        expected: overriddenSeverityOf('critical'),
       });
     });
   });
@@ -162,7 +162,7 @@ function severityOf(value: Severity) {
   };
 }
 
-function overridenSeverityOf(value: Severity, field = ECS_FIELD) {
+function overriddenSeverityOf(value: Severity, field = ECS_FIELD) {
   return {
     severity: value,
     severityMeta: {

diff --git a/...rity_solution/server/lib/detection_engine/signals/mappings/build_severity_from_mapping.ts b/...rity_solution/server/lib/detection_engine/signals/mappings/build_severity_from_mapping.ts
@@ -51,20 +51,20 @@ export const buildSeverityFromMapping = ({
   );
 
   severityMappingSorted.forEach((mapping) => {
-    const eventField = mapping.field;
+    const mappingField = mapping.field;
     const mappingValue = mapping.value;
-    const eventValue = get(eventField, eventSource);
+    const eventValue = get(mappingField, eventSource);
 
-    const normalizedEventValues = normalizeEventValue(eventField, eventValue);
-    const normalizedMappingValue = normalizeMappingValue(eventField, mappingValue);
+    const normalizedEventValues = normalizeEventValue(mappingField, eventValue);
+    const normalizedMappingValue = normalizeMappingValue(mappingField, mappingValue);
 
     if (normalizedEventValues.has(normalizedMappingValue)) {
       severityMatch = { ...mapping };
     }
   });
 
   if (severityMatch != null && SeverityIOTS.is(severityMatch.severity)) {
-    return overridenSeverity(severityMatch.severity, severityMatch.field);
+    return overriddenSeverity(severityMatch.severity, severityMatch.field);
   }
 
   return defaultSeverity(severity);
@@ -110,7 +110,7 @@ function defaultSeverity(value: Severity): BuildSeverityFromMappingReturn {
   };
 }
 
-function overridenSeverity(value: Severity, field: string): BuildSeverityFromMappingReturn {
+function overriddenSeverity(value: Severity, field: string): BuildSeverityFromMappingReturn {
   return {
     severity: value,
     severityMeta: {