Bug 1746377: Fetch indices instead of search to seed index patterns

Author: jcantrill

src/it/java/io/fabric8/elasticsearch/ElasticsearchIntegrationTest.java

@@ -523,6 +523,13 @@ protected void assertThatResponseIsForbidden() {
         assertEquals(String.format("Exp. %s to be forbidden for %s", username, uri), 403, response.code());
     }
 
+    protected void assertThatResponseIsNotFound() {
+        String username = (String) testContext.get(USERNAME);
+        Response response = (Response) testContext.get(RESPONSE);
+        String uri = (String) testContext.get(URI);
+        assertEquals(String.format("Exp. %s to be not found for %s", username, uri), 404, response.code());
+    }
+    
     protected void assertThatResponseIsUnauthorized() {
         String username = (String) testContext.get(USERNAME);
         Response response = (Response) testContext.get(RESPONSE);

src/it/java/io/fabric8/elasticsearch/KibanaIndexModeIntegrationBase.java

@@ -41,7 +41,10 @@ protected void assertThatMessageEquals(String message) throws Exception {
 
     @Before
     public void setup() throws Exception {
-        givenDocumentIsIndexed("project.multi-tenancy-1.uuid.1970.01.01", "test", "0", "multi-tenancy-1-doc0");
+        //https://bugzilla.redhat.com/show_bug.cgi?id=1746377
+        for (int i = 0; i < 1100; ++ i) {
+            givenDocumentIsIndexed("project.multi-tenancy-1.uuid.1970.01.01", "test", String.valueOf(i), "multi-tenancy-1-doc0");
+        }
         givenDocumentIsIndexed("project.multi-tenancy-2.uuid.1970.01.01", "test", "0", "multi-tenancy-2-doc0");
         givenDocumentIsIndexed("project.multi-tenancy-3.uuid.1970.01.01", "test", "0", "multi-tenancy-3-doc0");
     }

src/it/java/io/fabric8/elasticsearch/KibanaIndexModeSharedOpsIntegrationTest.java

@@ -45,6 +45,17 @@ public void testNonAdminUserRetrievingDocuments() throws Exception {
         //verify access to unique kibana index
         whenGettingDocument(String.format("%s/config/%s", kibanaIndex, OLD_KIBANA_VERSION));
         assertThatResponseIsSuccessful();
+
+        
+        //verify seeded index patterns
+        for (String project : projects) {
+            whenGettingDocument(String.format("%s/index-pattern/%s", kibanaIndex, formatProjectIndexPattern(project, "uuid")));
+            assertThatResponseIsSuccessful();
+        }
+
+        //verify access to index pattern for project we dont administer
+        whenGettingDocument(String.format("%s/index-pattern/%s", kibanaIndex, formatProjectIndexPattern("multi-tenancy-3", "uuid")));
+        assertThatResponseIsNotFound();
 
         //verify search to individual projects
         for (String project : projects) {

src/main/java/io/fabric8/elasticsearch/plugin/PluginClient.java

@@ -57,6 +57,7 @@
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.common.util.concurrent.ThreadContext.StoredContext;
 import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.search.sort.SortOrder;
 
 import com.floragunn.searchguard.support.ConfigConstants;
 
@@ -163,6 +164,7 @@ public SearchResponse call() throws Exception {
                         .setTypes(types)
                         .setSize(size)
                         .setFetchSource(fetchSource)
+                        .addSort("_index", SortOrder.ASC)
                         .get();
             }
 

src/main/java/io/fabric8/elasticsearch/plugin/kibana/KibanaSeed.java

@@ -22,15 +22,13 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.Logger;
+import org.elasticsearch.action.admin.indices.get.GetIndexResponse;
 import org.elasticsearch.action.get.GetResponse;
-import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.search.SearchHit;
 
 import io.fabric8.elasticsearch.plugin.ConfigurationSettings;
 import io.fabric8.elasticsearch.plugin.OpenshiftRequestContextFactory.OpenshiftRequestContext;
@@ -192,16 +190,14 @@ private List<Project> filterProjectsWithIndices(Set<Project> projects) {
         }
         LOGGER.trace("Evaluating {} indexPattern for existing index.", patterns.size());
         Set<Project> result = new HashSet<>(projects.size());
-        SearchResponse response = pluginClient.search(patterns.toArray(new String[]{}), ArrayUtils.EMPTY_STRING_ARRAY, 1000, false);
-        if (response.getHits() == null ) {
-            LOGGER.warn("Searching for indexPatterns returned a response with a null hits (e.g. response.getHits())");
-            return Collections.emptyList();
-        }
-        for (SearchHit hit : response.getHits().getHits()){
-            LOGGER.trace("Evaluating index {}", hit.getIndex());
-            Project project = kibanaUtils.getProjectFromIndex(hit.getIndex());
-            LOGGER.trace("Found index for project {}", project);
-            result.add(project);
+        GetIndexResponse response = pluginClient.getIndex(patterns.toArray(new String[]{}));
+        for (String index : response.getIndices()) {
+            LOGGER.trace("Evaluating index {}", index);
+            Project project = kibanaUtils.getProjectFromIndex(index);
+            if(projects.contains(project)) {
+                LOGGER.trace("Found index for project {}", project);
+                result.add(project);
+            }
         }
         return new ArrayList<>(result);
     }