Fix #24: light better handling of lint conf errors

sbaudoin · Nov 3, 2020 · c17e33c · c17e33c
1 parent 7444f8f
commit c17e33c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/com/github/sbaudoin/yamllint/YamlLintConfig.java b/src/main/java/com/github/sbaudoin/yamllint/YamlLintConfig.java
@@ -175,10 +175,12 @@ protected void parse(String rawContent) throws YamlLintConfigException {
         // Does this conf override another conf that we need to load?
         if (conf.containsKey("extends")) {
             try {
-                YamlLintConfig base = new YamlLintConfig(getExtendedConfigFile((String)conf.get("extends")));
+                YamlLintConfig base = new YamlLintConfig(getExtendedConfigFile((String) conf.get("extends")));
                 extend(base);
+            } catch (IllegalArgumentException e) {
+                throw new YamlLintConfigException("invalid extends config: " + e.getMessage(), e);
             } catch (Exception e) {
-                throw new YamlLintConfigException("invalid config: " + e.getMessage(), e);
+                throw new YamlLintConfigException("invalid extends config (unknown error): " + e.getMessage(), e);
             }
         }
 
@@ -293,8 +295,8 @@ protected static Map<String, Object> validateRuleConf(Rule rule, Object conf) th
      * @throws IllegalArgumentException if name is {@code null} or an error occurs handling the passed file name
      */
     protected URL getExtendedConfigFile(String name) {
-        if (name == null) {
-            throw new IllegalArgumentException("Argument cannot be null: need to extend something");
+        if (name == null || "".equals(name.trim())) {
+            throw new IllegalArgumentException("need to extend something");
         }
 
         // Is it a standard conf shipped with yamllint...

diff --git a/src/test/java/com/github/sbaudoin/yamllint/ExtendedYamlLintConfigTest.java b/src/test/java/com/github/sbaudoin/yamllint/ExtendedYamlLintConfigTest.java
@@ -30,21 +30,21 @@ public void testWrongExtend() throws IOException {
             new YamlLintConfig("extends:");
             fail("Invalid config not identified");
         } catch (YamlLintConfigException e) {
-            assertEquals("invalid config: Argument cannot be null: need to extend something", e.getMessage());
+            assertEquals("invalid extends config: need to extend something", e.getMessage());
         }
 
         try {
             new YamlLintConfig("extends:\n  - foo");
             fail("Invalid config not identified");
         } catch (YamlLintConfigException e) {
-            assertEquals("invalid config: java.util.ArrayList cannot be cast to java.lang.String", e.getMessage());
+            assertTrue(e.getMessage().startsWith("invalid extends config (unknown error): "));
         }
 
         try {
             new YamlLintConfig("extends: dummy");
             fail("Unknown ruleset should not be extended");
         } catch (YamlLintConfigException e) {
-            assertEquals("invalid config: Bundled configuration file \"dummy\" not found", e.getMessage());
+            assertEquals("invalid extends config: Bundled configuration file \"dummy\" not found", e.getMessage());
         }
 
         try {