commit 019cb15c950c161289425469d3b6df7e57ea3320
author Edwin Kempin <ekempin@google.com> Fri Oct 09 14:14:21 2020 +0200
committer Edwin Kempin <ekempin@google.com> Mon Oct 12 12:19:49 2020 +0200
tree eed5e5b6587519a889384b116a813283d81bbb1f
parent ca2b6dc9be5d081553de75cfe818d0f5012eaf89

CodeOwnerConfigScanner#containsAnyCodeOwnerConfigFile: Handle invalid files

containsAnyCodeOwnerConfigFile should return true if a code owner config
exists irregardless of whether it is valid or not.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ia856d9648ecb3e8eb05977d1d04032ed8f604ede

java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScanner.java

diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScanner.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScanner.java
index 99ee653..06bd4ef 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScanner.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScanner.java
@@ -74,7 +74,7 @@
           found.set(true);
           return false;
         },
-        ignoreInvalidCodeOwnerConfigFiles());
+        (codeOwnerConfigFilePath, configInvalidException) -> found.set(true));
     return found.get();
   }
 

javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScannerTest.java

diff --git a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScannerTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScannerTest.java
index ea0eab7..14bf652 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScannerTest.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScannerTest.java
@@ -416,6 +416,16 @@
         .isTrue();
   }
 
+  @Test
+  public void containsOnlyInvalidCodeOwnerConfigFiles() throws Exception {
+    createInvalidCodeOwnerConfig("/OWNERS");
+
+    assertThat(
+            codeOwnerConfigScanner.containsAnyCodeOwnerConfigFile(
+                BranchNameKey.create(project, "master")))
+        .isTrue();
+  }
+
   private void visit() {
     codeOwnerConfigScanner.visit(
         BranchNameKey.create(project, "master"), visitor, invalidCodeOwnerConfigCallback);