Merge pull request #2 from secondmeasure/fix-502-errors

Fix 502 errors
secondmeasure · May 26, 2022 · cce04c5 · cce04c5
2 parents 0678952 + 8f2d01a
commit cce04c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 48 deletions.
diff --git a/gateway-ha/src/main/java/com/lyft/data/gateway/ha/router/RoutingGroupSelector.java b/gateway-ha/src/main/java/com/lyft/data/gateway/ha/router/RoutingGroupSelector.java
@@ -37,23 +37,21 @@ static RoutingGroupSelector byRoutingRulesEngine(String rulesConfigPath) {
     RulesEngine rulesEngine = new DefaultRulesEngine();
     MVELRuleFactory ruleFactory = new MVELRuleFactory(new YamlRuleDefinitionReader());
 
-    return request -> {
-      try {
-        Rules rules = ruleFactory.createRules(
-            new FileReader(rulesConfigPath));
+    try {
+      Rules rules = ruleFactory.createRules(new FileReader(rulesConfigPath));
+      return request -> {
         Facts facts = new Facts();
         HashMap<String, String> result = new HashMap<String, String>();
         facts.put("request", request);
         facts.put("result", result);
         rulesEngine.fire(rules, facts);
         return result.get("routingGroup");
-      } catch (Exception e) {
-        Logger.log.error("Error opening rules configuration file,"
-            + " using routing group header as default.", e);
-        return Optional.ofNullable(request.getHeader(ROUTING_GROUP_HEADER))
-          .orElse(request.getHeader(ALTERNATE_ROUTING_GROUP_HEADER));
-      }
-    };
+      };
+    } catch (Exception e) {
+      Logger.log.error("Error opening rules configuration file,"
+          + " using routing group header as default.", e);
+      return byRoutingGroupHeader();
+    }
   }
 
   /**

diff --git a/gateway-ha/src/test/java/com/lyft/data/gateway/ha/router/TestRoutingGroupSelector.java b/gateway-ha/src/test/java/com/lyft/data/gateway/ha/router/TestRoutingGroupSelector.java
@@ -82,41 +82,4 @@ public void testByRoutingRulesEngineNoMatch(String rulesConfigPath) {
         routingGroupSelector.findRoutingGroup(mockRequest), null);
   }
 
-  public void testByRoutingRulesEngineFileChange() throws Exception {
-    File file = File.createTempFile("routing_rules", ".yml");
-
-    FileWriter fw = new FileWriter(file);
-    fw.write(
-        "---\n"
-        + "name: \"airflow\"\n"
-        + "description: \"if query from airflow, route to etl group\"\n"
-        + "condition: \"request.getHeader(\\\"X-Trino-Source\\\") == \\\"airflow\\\"\"\n"
-        + "actions:\n"
-        + "  - \"result.put(\\\"routingGroup\\\", \\\"etl\\\")\"");
-    fw.close();
-
-    RoutingGroupSelector routingGroupSelector =
-        RoutingGroupSelector.byRoutingRulesEngine(file.getPath());
-
-    HttpServletRequest mockRequest = mock(HttpServletRequest.class);
-
-    when(mockRequest.getHeader(TRINO_SOURCE_HEADER)).thenReturn("airflow");
-    Assert.assertEquals(
-        routingGroupSelector.findRoutingGroup(mockRequest), "etl");
-
-    fw = new FileWriter(file);
-    fw.write(
-        "---\n"
-        + "name: \"airflow\"\n"
-        + "description: \"if query from airflow, route to etl group\"\n"
-        + "condition: \"request.getHeader(\\\"X-Trino-Source\\\") == \\\"airflow\\\"\"\n"
-        + "actions:\n"
-        + "  - \"result.put(\\\"routingGroup\\\", \\\"etl2\\\")\""); // change from etl to etl2
-    fw.close();
-
-    when(mockRequest.getHeader(TRINO_SOURCE_HEADER)).thenReturn("airflow");
-    Assert.assertEquals(
-        routingGroupSelector.findRoutingGroup(mockRequest), "etl2");
-    file.deleteOnExit();
-  }
 }