skeleton for adding Search Strategy restrictions

elastic · Jan 17, 2019 · a53d647 · a53d647
1 parent b45ae1d
commit a53d647
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/src/legacy/core_plugins/metrics/server/lib/search_strategies/search_strategies_register.js b/src/legacy/core_plugins/metrics/server/lib/search_strategies/search_strategies_register.js
@@ -45,10 +45,13 @@ export default class SearchStrategiesRegister {
 
   static async getViableStrategy(req, indexPattern) {
     for (const searchStrategy of strategies) {
-      const isViable = await searchStrategy.isViable(req, indexPattern);
+      const { isViable, restrictions } = await searchStrategy.checkForViability(req, indexPattern);
 
       if (isViable) {
-        return searchStrategy;
+        return {
+          searchStrategy,
+          restrictions,
+        };
       }
     }
   }

diff --git a/...y/core_plugins/metrics/server/lib/search_strategies/strategies/default_search_strategy.js b/...y/core_plugins/metrics/server/lib/search_strategies/strategies/default_search_strategy.js
@@ -33,7 +33,10 @@ export default class DefaultSearchStrategy extends AbstractSearchStrategy {
     super(server, callWithRequestFactory, SearchRequest);
   }
 
-  isViable() {
-    return true;
+  checkForViability() {
+    return {
+      isViable: true,
+      restrictions: {},
+    };
   }
 }
diff --git a/src/legacy/core_plugins/metrics/server/lib/vis_data/get_annotations.js b/src/legacy/core_plugins/metrics/server/lib/vis_data/get_annotations.js
@@ -31,7 +31,7 @@ function validAnnotation(annotation) {
 
 export default async (req, panel) => {
   const indexPattern = panel.index_pattern;
-  const searchStrategy = await SearchStrategiesRegister.getViableStrategy(req, indexPattern);
+  const { searchStrategy } = await SearchStrategiesRegister.getViableStrategy(req, indexPattern);
   const searchRequest = searchStrategy.getSearchRequest(req, indexPattern);
   const bodies = panel.annotations
     .filter(validAnnotation)

diff --git a/src/legacy/core_plugins/metrics/server/lib/vis_data/get_series_data.js b/src/legacy/core_plugins/metrics/server/lib/vis_data/get_series_data.js
@@ -24,7 +24,7 @@ import SearchStrategiesRegister from '../search_strategies/search_strategies_reg
 
 export async function getSeriesData(req, panel) {
   const indexPattern = panel.index_pattern;
-  const searchStrategy = await SearchStrategiesRegister.getViableStrategy(req, indexPattern);
+  const { searchStrategy } = await SearchStrategiesRegister.getViableStrategy(req, indexPattern);
   const searchRequest = searchStrategy.getSearchRequest(req, indexPattern);
 
   const body = panel.series

diff --git a/src/legacy/core_plugins/metrics/server/lib/vis_data/get_table_data.js b/src/legacy/core_plugins/metrics/server/lib/vis_data/get_table_data.js
@@ -25,7 +25,7 @@ import SearchStrategiesRegister from '../search_strategies/search_strategies_reg
 
 export async function getTableData(req, panel) {
   const indexPattern = panel.index_pattern;
-  const searchStrategy = await SearchStrategiesRegister.getViableStrategy(req, indexPattern);
+  const { searchStrategy } = await SearchStrategiesRegister.getViableStrategy(req, indexPattern);
   const searchRequest = searchStrategy.getSearchRequest(req, indexPattern);
   const body = buildRequestBody(req, panel);
 

diff --git a/x-pack/plugins/rollup/server/lib/search_strategies/rollup_search_strategy.js b/x-pack/plugins/rollup/server/lib/search_strategies/rollup_search_strategy.js
@@ -41,7 +41,12 @@ export default (AbstractSearchStrategy, RollupSearchRequest) =>
       return await this.numberOfRollupJobs(req, indexPattern) === 1;
     }
 
-    async isViable(req, indexPattern) {
-      return await this.hasOneRollupJob(req, indexPattern);
+    async checkForViability(req, indexPattern) {
+      const isViable = await this.hasOneRollupJob(req, indexPattern);
+
+      return {
+        isViable,
+        restrictions: {},
+      };
     }
   });