Update regex to exclude API calls on the index

elastic · Jun 19, 2018 · b629d7e · b629d7e
1 parent 0641e18
commit b629d7e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy
@@ -41,9 +41,11 @@ public class RestTestsFromSnippetsTask extends SnippetsTask {
 
     /**
      * Doc write operations start with an index name that cannot
-     * start with -, _ or + and must be lower case.
+     * start with -, _ or + and must be lower case and are followed
+     * by the doc type or doc Id. If the 2nd part of the path
+     * (after the '/') starts with a '_' then it is an API call.
      */
-    private static final Pattern DOCS_WRITE_OP_PATTERN = Pattern.compile("^[^_\\-\\+][a-z_-]+/");
+    private static final Pattern DOCS_WRITE_OP_PATTERN = Pattern.compile("^[^_\\-\\+][a-z_-]+/[^_]");
 
     @Input
     Map<String, String> setups = new HashMap()

diff --git a/buildSrc/src/test/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTaskTest.groovy b/buildSrc/src/test/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTaskTest.groovy
@@ -49,7 +49,7 @@ class RestTestFromSnippetsTaskTest extends GroovyTestCase {
     void testIsDocWriteRequest() {
         assertTrue(isDocWriteRequest("doc-index/doc_id"));
         assertTrue(isDocWriteRequest("doc_index/doc_type/doc_id"));
-        assertFalse(isDocWriteRequest("doc_index"))
+        assertFalse(isDocWriteRequest("doc_index/_search"))
         assertFalse(isDocWriteRequest("_xpack/ml/datafeeds/datafeed-id/_preview"));
     }
 }