From 1f30d64fe1769c361b749e846cfbeb25c5529e6a Mon Sep 17 00:00:00 2001
From: Jake Landis <jake.landis@elastic.co>
Date: Mon, 9 Mar 2020 12:29:39 -0500
Subject: [PATCH] Optimize which Rest resources are used by the Rest tests.

This should help with Gradle's incremental compile such that projects
only depend upon the resources they use.

related #52114
---
 modules/aggs-matrix-stats/build.gradle                    | 6 ++++++
 modules/analysis-common/build.gradle                      | 6 ++++++
 modules/ingest-common/build.gradle                        | 6 ++++++
 modules/ingest-geoip/build.gradle                         | 6 ++++++
 modules/ingest-user-agent/build.gradle                    | 6 ++++++
 modules/lang-expression/build.gradle                      | 5 +++++
 modules/lang-mustache/build.gradle                        | 6 ++++++
 modules/lang-painless/build.gradle                        | 7 +++++++
 modules/mapper-extras/build.gradle                        | 6 ++++++
 modules/parent-join/build.gradle                          | 6 ++++++
 modules/percolator/build.gradle                           | 5 +++++
 modules/rank-eval/build.gradle                            | 6 ++++++
 modules/reindex/build.gradle                              | 7 +++++++
 modules/repository-url/build.gradle                       | 8 +++++++-
 modules/transport-netty4/build.gradle                     | 6 ++++++
 plugins/analysis-icu/build.gradle                         | 6 ++++++
 plugins/analysis-kuromoji/build.gradle                    | 6 ++++++
 plugins/analysis-nori/build.gradle                        | 5 +++++
 plugins/analysis-phonetic/build.gradle                    | 6 ++++++
 plugins/analysis-smartcn/build.gradle                     | 6 ++++++
 plugins/analysis-stempel/build.gradle                     | 6 ++++++
 plugins/analysis-ukrainian/build.gradle                   | 6 ++++++
 plugins/discovery-azure-classic/build.gradle              | 5 +++++
 plugins/discovery-ec2/build.gradle                        | 6 ++++++
 plugins/discovery-ec2/qa/amazon-ec2/build.gradle          | 6 ++++++
 plugins/discovery-gce/build.gradle                        | 6 ++++++
 plugins/discovery-gce/qa/gce/build.gradle                 | 6 ++++++
 plugins/ingest-attachment/build.gradle                    | 6 ++++++
 plugins/mapper-annotated-text/build.gradle                | 6 ++++++
 plugins/mapper-murmur3/build.gradle                       | 6 ++++++
 plugins/mapper-size/build.gradle                          | 6 ++++++
 plugins/repository-azure/build.gradle                     | 6 ++++++
 .../qa/microsoft-azure-storage/build.gradle               | 6 ++++++
 plugins/repository-gcs/build.gradle                       | 6 ++++++
 .../repository-gcs/qa/google-cloud-storage/build.gradle   | 6 ++++++
 plugins/repository-hdfs/build.gradle                      | 6 ++++++
 plugins/store-smb/build.gradle                            | 6 +++++-
 x-pack/plugin/autoscaling/qa/rest/build.gradle            | 1 +
 x-pack/plugin/ccr/qa/rest/build.gradle                    | 3 ++-
 x-pack/plugin/enrich/qa/rest/build.gradle                 | 1 +
 x-pack/plugin/eql/qa/rest/build.gradle                    | 1 +
 x-pack/plugin/graph/qa/with-security/build.gradle         | 1 +
 x-pack/plugin/ilm/qa/rest/build.gradle                    | 1 +
 x-pack/plugin/ml/qa/ml-with-security/build.gradle         | 1 +
 x-pack/plugin/watcher/qa/rest/build.gradle                | 2 ++
 45 files changed, 230 insertions(+), 3 deletions(-)

diff --git a/modules/aggs-matrix-stats/build.gradle b/modules/aggs-matrix-stats/build.gradle
index b397edf2cbb5c..ffe8145eba341 100644
--- a/modules/aggs-matrix-stats/build.gradle
+++ b/modules/aggs-matrix-stats/build.gradle
@@ -21,3 +21,9 @@ esplugin {
   description 'Adds aggregations whose input are a list of numeric fields and output includes a matrix.'
   classname 'org.elasticsearch.search.aggregations.matrix.MatrixAggregationPlugin'
 }
+
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'cluster', 'index', 'search', 'nodes'
+  }
+}
diff --git a/modules/analysis-common/build.gradle b/modules/analysis-common/build.gradle
index 773c645f698cc..24e6e651c3fd9 100644
--- a/modules/analysis-common/build.gradle
+++ b/modules/analysis-common/build.gradle
@@ -23,6 +23,12 @@ esplugin {
   extendedPlugins = ['lang-painless']
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'cluster', 'search', 'nodes', 'bulk', 'termvectors', 'explain', 'count'
+  }
+}
+
 dependencies {
   compileOnly project(':modules:lang-painless')
 }
diff --git a/modules/ingest-common/build.gradle b/modules/ingest-common/build.gradle
index 6590bdc1c52ef..2ff50f1543ed9 100644
--- a/modules/ingest-common/build.gradle
+++ b/modules/ingest-common/build.gradle
@@ -29,6 +29,12 @@ dependencies {
   compile project(':libs:elasticsearch-dissect')
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'ingest', 'cluster', 'indices', 'index', 'bulk', 'nodes', 'get', 'update', 'cat', 'mget'
+  }
+}
+
 testClusters.integTest {
   // Needed in order to test ingest pipeline templating:
   // (this is because the integTest node is not using default distribution, but only the minimal number of required modules)
diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle
index ce9dc7d574c12..d994e730e18e7 100644
--- a/modules/ingest-geoip/build.gradle
+++ b/modules/ingest-geoip/build.gradle
@@ -35,6 +35,12 @@ dependencies {
   testCompile 'org.elasticsearch:geolite2-databases:20191119'
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'cluster', 'nodes', 'get', 'ingest'
+  }
+}
+
 task copyDefaultGeoIp2DatabaseFiles(type: Copy) {
   from { zipTree(configurations.testCompile.files.find { it.name.contains('geolite2-databases') }) }
   into "${project.buildDir}/ingest-geoip"
diff --git a/modules/ingest-user-agent/build.gradle b/modules/ingest-user-agent/build.gradle
index b3e17d58360d4..d45b30c9f1daf 100644
--- a/modules/ingest-user-agent/build.gradle
+++ b/modules/ingest-user-agent/build.gradle
@@ -22,6 +22,12 @@ esplugin {
   classname 'org.elasticsearch.ingest.useragent.IngestUserAgentPlugin'
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'cluster', 'nodes', 'get', 'ingest'
+  }
+}
+
 testClusters.integTest {
   extraConfigFile 'ingest-user-agent/test-regexes.yml', file('src/test/test-regexes.yml')
 }
diff --git a/modules/lang-expression/build.gradle b/modules/lang-expression/build.gradle
index 2fd6e53effa34..d3a165c13b947 100644
--- a/modules/lang-expression/build.gradle
+++ b/modules/lang-expression/build.gradle
@@ -29,6 +29,11 @@ dependencies {
   compile 'org.ow2.asm:asm-commons:5.0.4'
   compile 'org.ow2.asm:asm-tree:5.0.4'
 }
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'cluster', 'nodes', 'search'
+  }
+}
 
 dependencyLicenses {
   mapping from: /lucene-.*/, to: 'lucene'
diff --git a/modules/lang-mustache/build.gradle b/modules/lang-mustache/build.gradle
index 5adc409c8bcc1..ed0641b89fa1a 100644
--- a/modules/lang-mustache/build.gradle
+++ b/modules/lang-mustache/build.gradle
@@ -26,3 +26,9 @@ dependencies {
   compile "com.github.spullara.mustache.java:compiler:0.9.6"
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes', 'indices', 'index', 'bulk',
+      'put_script', 'render_search_template', 'search_template', 'msearch_template', 'lang_mustache'
+  }
+}
diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle
index 75e41dcf2e2aa..68a990a3dda9a 100644
--- a/modules/lang-painless/build.gradle
+++ b/modules/lang-painless/build.gradle
@@ -44,6 +44,13 @@ dependencyLicenses {
   mapping from: /asm-.*/, to: 'asm'
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes', 'indices', 'index', 'search', 'get', 'bulk', 'update', 
+                'scripts_painless_execute', 'put_script', 'delete_script'
+  }
+}
+
 test {
   // in WhenThingsGoWrongTests we intentionally generate an out of memory error, this prevents the heap from being dumped to disk
   jvmArgs '-XX:-OmitStackTraceInFastThrow', '-XX:-HeapDumpOnOutOfMemoryError'
diff --git a/modules/mapper-extras/build.gradle b/modules/mapper-extras/build.gradle
index d4f3b6871a631..4d2e4b7d70ffe 100644
--- a/modules/mapper-extras/build.gradle
+++ b/modules/mapper-extras/build.gradle
@@ -21,3 +21,9 @@ esplugin {
   description 'Adds advanced field mappers'
   classname 'org.elasticsearch.index.mapper.MapperExtrasPlugin'
 }
+
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes', 'indices', 'index', 'search', 'get' 
+  }
+}
diff --git a/modules/parent-join/build.gradle b/modules/parent-join/build.gradle
index 756a65a371a9b..d6cb0c3c3a515 100644
--- a/modules/parent-join/build.gradle
+++ b/modules/parent-join/build.gradle
@@ -21,3 +21,9 @@ esplugin {
   description 'This module adds the support parent-child queries and aggregations'
   classname 'org.elasticsearch.join.ParentJoinPlugin'
 }
+
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes', 'indices', 'index', 'search' 
+  }
+}
diff --git a/modules/percolator/build.gradle b/modules/percolator/build.gradle
index b0cb4390b02bb..ae19823db1542 100644
--- a/modules/percolator/build.gradle
+++ b/modules/percolator/build.gradle
@@ -26,6 +26,11 @@ dependencies {
   testCompile project(path: ':modules:parent-join', configuration: 'runtime')
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'search', 'msearch'  
+  }
+}
 dependencyLicenses {
   // Don't check the client's license. We know it.
   dependencies = project.configurations.runtime.fileCollection {
diff --git a/modules/rank-eval/build.gradle b/modules/rank-eval/build.gradle
index 35f8fef5176a5..1adcd3016e50d 100644
--- a/modules/rank-eval/build.gradle
+++ b/modules/rank-eval/build.gradle
@@ -22,6 +22,12 @@ esplugin {
   classname 'org.elasticsearch.index.rankeval.RankEvalPlugin'
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'rank_eval'  
+  }
+}
+
 testClusters.integTest {
   // Modules who's integration is explicitly tested in integration tests
   module file(project(':modules:lang-mustache').tasks.bundlePlugin.archiveFile)
diff --git a/modules/reindex/build.gradle b/modules/reindex/build.gradle
index e255c2567cc9a..a6b60166c343f 100644
--- a/modules/reindex/build.gradle
+++ b/modules/reindex/build.gradle
@@ -55,6 +55,13 @@ dependencies {
   testCompile project(path: ':modules:parent-join', configuration: 'runtime')
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes', 'indices', 'index', 'get', 'search', 'mget', 'count', 
+                'update_by_query', 'delete_by_query', 'reindex_rethrottle', 'tasks', 'reindex', 'put_script'  
+  }
+}
+
 thirdPartyAudit.ignoreMissingClasses(
   // Commons logging
   'javax.servlet.ServletContextEvent',
diff --git a/modules/repository-url/build.gradle b/modules/repository-url/build.gradle
index 31fba2964f0c5..cec28b1d00fc8 100644
--- a/modules/repository-url/build.gradle
+++ b/modules/repository-url/build.gradle
@@ -26,7 +26,13 @@ esplugin {
   classname 'org.elasticsearch.plugin.repository.url.URLRepositoryPlugin'
 }
 
-// This directory is shared between two URL repositories and one FS repository in YAML integration tests
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes', 'indices', 'index', 'bulk', 'count', 'snapshot' 
+  }
+}
+
+ // This directory is shared between two URL repositories and one FS repository in YAML integration tests
 File repositoryDir = new File(project.buildDir, "shared-repository")
 
 /** A task to start the URLFixture which exposes the repositoryDir over HTTP **/
diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle
index 9db16d00e7d61..02386665abb41 100644
--- a/modules/transport-netty4/build.gradle
+++ b/modules/transport-netty4/build.gradle
@@ -43,6 +43,12 @@ dependencies {
   compile "io.netty:netty-transport:${versions.netty}"
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes'
+  }
+}
+
 dependencyLicenses {
   mapping from: /netty-.*/, to: 'netty'
 }
diff --git a/plugins/analysis-icu/build.gradle b/plugins/analysis-icu/build.gradle
index 3fbf7f09b726e..3d1e2909c2291 100644
--- a/plugins/analysis-icu/build.gradle
+++ b/plugins/analysis-icu/build.gradle
@@ -35,6 +35,12 @@ dependencies {
   compile "com.ibm.icu:icu4j:${versions.icu4j}"
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'search'
+  }
+}
+
 dependencyLicenses {
   mapping from: /lucene-.*/, to: 'lucene'
 }
diff --git a/plugins/analysis-kuromoji/build.gradle b/plugins/analysis-kuromoji/build.gradle
index 333818a8d61b7..85c8b472aceea 100644
--- a/plugins/analysis-kuromoji/build.gradle
+++ b/plugins/analysis-kuromoji/build.gradle
@@ -26,6 +26,12 @@ dependencies {
   compile "org.apache.lucene:lucene-analyzers-kuromoji:${versions.lucene}"
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'search'
+  }
+}
+
 dependencyLicenses {
   mapping from: /lucene-.*/, to: 'lucene'
 }
diff --git a/plugins/analysis-nori/build.gradle b/plugins/analysis-nori/build.gradle
index a9d3a1126dc58..c732ec9037db9 100644
--- a/plugins/analysis-nori/build.gradle
+++ b/plugins/analysis-nori/build.gradle
@@ -26,6 +26,11 @@ dependencies {
   compile "org.apache.lucene:lucene-analyzers-nori:${versions.lucene}"
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'search'
+  }
+}
 dependencyLicenses {
   mapping from: /lucene-.*/, to: 'lucene'
 }
diff --git a/plugins/analysis-phonetic/build.gradle b/plugins/analysis-phonetic/build.gradle
index 61c4fdbd58394..82091b91d9ead 100644
--- a/plugins/analysis-phonetic/build.gradle
+++ b/plugins/analysis-phonetic/build.gradle
@@ -27,6 +27,12 @@ dependencies {
   compile "commons-codec:commons-codec:${versions.commonscodec}"
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'search'
+  }
+}
+
 dependencyLicenses {
   mapping from: /lucene-.*/, to: 'lucene'
 }
diff --git a/plugins/analysis-smartcn/build.gradle b/plugins/analysis-smartcn/build.gradle
index ebe44850d00a7..a6d287ef690de 100644
--- a/plugins/analysis-smartcn/build.gradle
+++ b/plugins/analysis-smartcn/build.gradle
@@ -26,6 +26,12 @@ dependencies {
   compile "org.apache.lucene:lucene-analyzers-smartcn:${versions.lucene}"
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'search'
+  }
+}
+
 dependencyLicenses {
   mapping from: /lucene-.*/, to: 'lucene'
 }
diff --git a/plugins/analysis-stempel/build.gradle b/plugins/analysis-stempel/build.gradle
index 488e99ec912bd..7f90e10817364 100644
--- a/plugins/analysis-stempel/build.gradle
+++ b/plugins/analysis-stempel/build.gradle
@@ -26,6 +26,12 @@ dependencies {
   compile "org.apache.lucene:lucene-analyzers-stempel:${versions.lucene}"
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'search'
+  }
+}
+
 dependencyLicenses {
   mapping from: /lucene-.*/, to: 'lucene'
 }
diff --git a/plugins/analysis-ukrainian/build.gradle b/plugins/analysis-ukrainian/build.gradle
index 0e254e5f05026..cec538d7d79a8 100644
--- a/plugins/analysis-ukrainian/build.gradle
+++ b/plugins/analysis-ukrainian/build.gradle
@@ -29,6 +29,12 @@ dependencies {
   compile "ua.net.nlp:morfologik-ukrainian-search:3.7.5"
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'search'
+  }
+}
+
 dependencyLicenses {
   mapping from: /lucene-.*/, to: 'lucene'
   mapping from: /morfologik-.*/, to: 'lucene'
diff --git a/plugins/discovery-azure-classic/build.gradle b/plugins/discovery-azure-classic/build.gradle
index 257777526c92b..bbad69232d0fa 100644
--- a/plugins/discovery-azure-classic/build.gradle
+++ b/plugins/discovery-azure-classic/build.gradle
@@ -57,6 +57,11 @@ dependencies {
   compile 'javax.xml.bind:jaxb-api:2.2.2'
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes'
+  }
+}
 // needed to be consistent with ssl host checking
 String host = InetAddress.getLoopbackAddress().getHostAddress()
 
diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle
index a9ae35393de16..54e08f71d1727 100644
--- a/plugins/discovery-ec2/build.gradle
+++ b/plugins/discovery-ec2/build.gradle
@@ -40,6 +40,12 @@ dependencies {
   compile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes'
+  }
+}
+
 dependencyLicenses {
   mapping from: /aws-java-sdk-.*/, to: 'aws-java-sdk'
   mapping from: /jackson-.*/, to: 'jackson'
diff --git a/plugins/discovery-ec2/qa/amazon-ec2/build.gradle b/plugins/discovery-ec2/qa/amazon-ec2/build.gradle
index 023c864d62e7c..a10d9feccfdce 100644
--- a/plugins/discovery-ec2/qa/amazon-ec2/build.gradle
+++ b/plugins/discovery-ec2/qa/amazon-ec2/build.gradle
@@ -32,6 +32,12 @@ dependencies {
   testCompile project(path: ':plugins:discovery-ec2', configuration: 'runtime')
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes'
+  }
+}
+
 final int ec2NumberOfNodes = 3
 
 Map<String, Object> expansions = [
diff --git a/plugins/discovery-gce/build.gradle b/plugins/discovery-gce/build.gradle
index 7e5c29ff5c33c..275eb9312a30b 100644
--- a/plugins/discovery-gce/build.gradle
+++ b/plugins/discovery-gce/build.gradle
@@ -21,6 +21,12 @@ dependencies {
   compile "commons-codec:commons-codec:${versions.commonscodec}"
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes'
+  }
+}
+
 dependencyLicenses {
   mapping from: /google-.*/, to: 'google'
 }
diff --git a/plugins/discovery-gce/qa/gce/build.gradle b/plugins/discovery-gce/qa/gce/build.gradle
index 3a5bf84c7ba93..7eb2fe13aae8f 100644
--- a/plugins/discovery-gce/qa/gce/build.gradle
+++ b/plugins/discovery-gce/qa/gce/build.gradle
@@ -33,6 +33,12 @@ dependencies {
   testCompile project(path: ':plugins:discovery-gce', configuration: 'runtime')
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes'
+  }
+}
+
 /** A task to start the GCEFixture which emulates a GCE service **/
 task gceFixture(type: AntFixture) {
   dependsOn compileTestJava
diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle
index 0c5d5deaf3f04..668c4c397e814 100644
--- a/plugins/ingest-attachment/build.gradle
+++ b/plugins/ingest-attachment/build.gradle
@@ -72,6 +72,12 @@ dependencies {
   compile 'org.apache.commons:commons-lang3:3.9'
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes', 'ingest', 'index', 'get' 
+  }
+}
+
 dependencyLicenses {
   mapping from: /apache-mime4j-.*/, to: 'apache-mime4j'
 }
diff --git a/plugins/mapper-annotated-text/build.gradle b/plugins/mapper-annotated-text/build.gradle
index 8ce1ca2a416fe..2ae9a9278b0a5 100644
--- a/plugins/mapper-annotated-text/build.gradle
+++ b/plugins/mapper-annotated-text/build.gradle
@@ -21,3 +21,9 @@ esplugin {
   description 'The Mapper Annotated_text plugin adds support for text fields with markup used to inject annotation tokens into the index.'
   classname 'org.elasticsearch.plugin.mapper.AnnotatedTextPlugin'
 }
+
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'search'
+  }
+}
diff --git a/plugins/mapper-murmur3/build.gradle b/plugins/mapper-murmur3/build.gradle
index 5b985d9138f52..f556e82db3867 100644
--- a/plugins/mapper-murmur3/build.gradle
+++ b/plugins/mapper-murmur3/build.gradle
@@ -21,3 +21,9 @@ esplugin {
   description 'The Mapper Murmur3 plugin allows to compute hashes of a field\'s values at index-time and to store them in the index.'
   classname 'org.elasticsearch.plugin.mapper.MapperMurmur3Plugin'
 }
+
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'search'
+  }
+}
diff --git a/plugins/mapper-size/build.gradle b/plugins/mapper-size/build.gradle
index 5a49ce5d04b78..0c757b4966bd3 100644
--- a/plugins/mapper-size/build.gradle
+++ b/plugins/mapper-size/build.gradle
@@ -21,3 +21,9 @@ esplugin {
   description 'The Mapper Size plugin allows document to record their uncompressed size at index time.'
   classname 'org.elasticsearch.plugin.mapper.MapperSizePlugin'
 }
+
+restResources {
+  restApi {
+    includeCore '_common', 'indices', 'index', 'get'
+  }
+}
diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle
index 5a11f8b02bf84..33ab95e6ea405 100644
--- a/plugins/repository-azure/build.gradle
+++ b/plugins/repository-azure/build.gradle
@@ -32,6 +32,12 @@ dependencies {
   testCompile project(':test:fixtures:azure-fixture')
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes'
+  }
+}
+
 dependencyLicenses {
   mapping from: /azure-.*/, to: 'azure'
   mapping from: /jackson-.*/, to: 'jackson'
diff --git a/plugins/repository-azure/qa/microsoft-azure-storage/build.gradle b/plugins/repository-azure/qa/microsoft-azure-storage/build.gradle
index 529ee899fc8c4..b594ff3b172f2 100644
--- a/plugins/repository-azure/qa/microsoft-azure-storage/build.gradle
+++ b/plugins/repository-azure/qa/microsoft-azure-storage/build.gradle
@@ -29,6 +29,12 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 apply plugin: 'elasticsearch.test.fixtures'
 
+restResources {
+  restApi {
+    includeCore '_common', 'snapshot', 'bulk', 'count', 'indices'
+  }
+}
+
 testFixtures.useFixture ":test:fixtures:azure-fixture", "azure-fixture"
 
 boolean useFixture = false
diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle
index bd20c36922297..9af1ae73327ef 100644
--- a/plugins/repository-gcs/build.gradle
+++ b/plugins/repository-gcs/build.gradle
@@ -56,6 +56,12 @@ dependencies {
   testCompile project(':test:fixtures:gcs-fixture')
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes'
+  }
+}
+
 dependencyLicenses {
   mapping from: /google-cloud-.*/, to: 'google-cloud'
   mapping from: /google-auth-.*/, to: 'google-auth'
diff --git a/plugins/repository-gcs/qa/google-cloud-storage/build.gradle b/plugins/repository-gcs/qa/google-cloud-storage/build.gradle
index aaa5a4ddc553b..10105d2f2348c 100644
--- a/plugins/repository-gcs/qa/google-cloud-storage/build.gradle
+++ b/plugins/repository-gcs/qa/google-cloud-storage/build.gradle
@@ -36,6 +36,12 @@ dependencies {
   testCompile project(path: ':plugins:repository-gcs')
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'snapshot','indices', 'index', 'bulk', 'count'
+  }
+}
+
 testFixtures.useFixture(':test:fixtures:gcs-fixture')
 boolean useFixture = false
 
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
index 83e3735300a0f..bf570b8e0abb6 100644
--- a/plugins/repository-hdfs/build.gradle
+++ b/plugins/repository-hdfs/build.gradle
@@ -74,6 +74,12 @@ dependencies {
   }
 }
 
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes', 'indices', 'index', 'snapshot'
+  }
+}
+
 normalization {
   runtimeClasspath {
     // ignore generated keytab files for the purposes of build avoidance
diff --git a/plugins/store-smb/build.gradle b/plugins/store-smb/build.gradle
index f2238e0a49c90..87aad3e59769b 100644
--- a/plugins/store-smb/build.gradle
+++ b/plugins/store-smb/build.gradle
@@ -21,4 +21,8 @@ esplugin {
   description 'The Store SMB plugin adds support for SMB stores.'
   classname 'org.elasticsearch.plugin.store.smb.SMBStorePlugin'
 }
-
+restResources {
+  restApi {
+    includeCore '_common', 'cluster', 'nodes', 'index', 'indices', 'get'
+  }
+}
diff --git a/x-pack/plugin/autoscaling/qa/rest/build.gradle b/x-pack/plugin/autoscaling/qa/rest/build.gradle
index 631c6e950ee1a..d7d66eeffc27f 100644
--- a/x-pack/plugin/autoscaling/qa/rest/build.gradle
+++ b/x-pack/plugin/autoscaling/qa/rest/build.gradle
@@ -11,6 +11,7 @@ dependencies {
 
 restResources {
   restApi {
+    includeCore '_common'
     includeXpack 'autoscaling'
   }
 }
diff --git a/x-pack/plugin/ccr/qa/rest/build.gradle b/x-pack/plugin/ccr/qa/rest/build.gradle
index d95ac271df519..fd16660178c57 100644
--- a/x-pack/plugin/ccr/qa/rest/build.gradle
+++ b/x-pack/plugin/ccr/qa/rest/build.gradle
@@ -5,8 +5,9 @@ apply plugin: 'elasticsearch.standalone-test'
 
 restResources {
   restApi {
+    includeCore '_common', 'cluster', 'nodes', 'indices', 'index', 'info' 
     includeXpack 'ccr'
-  }
+  } 
 }
 
 dependencies {
diff --git a/x-pack/plugin/enrich/qa/rest/build.gradle b/x-pack/plugin/enrich/qa/rest/build.gradle
index 209154dd448b0..9344134741778 100644
--- a/x-pack/plugin/enrich/qa/rest/build.gradle
+++ b/x-pack/plugin/enrich/qa/rest/build.gradle
@@ -4,6 +4,7 @@ apply plugin: 'elasticsearch.rest-test'
 
 restResources {
   restApi {
+    includeCore '_common', 'indices', 'index'
     includeXpack 'enrich'
   }
 }
diff --git a/x-pack/plugin/eql/qa/rest/build.gradle b/x-pack/plugin/eql/qa/rest/build.gradle
index a7e94fcba6d6d..43077d1d5c5d8 100644
--- a/x-pack/plugin/eql/qa/rest/build.gradle
+++ b/x-pack/plugin/eql/qa/rest/build.gradle
@@ -6,6 +6,7 @@ apply plugin: 'elasticsearch.rest-test'
 
 restResources {
   restApi {
+    includeCore '_common', 'bulk'
     includeXpack 'eql'
   }
 }
diff --git a/x-pack/plugin/graph/qa/with-security/build.gradle b/x-pack/plugin/graph/qa/with-security/build.gradle
index 869e926102dcb..2f0461dd3f189 100644
--- a/x-pack/plugin/graph/qa/with-security/build.gradle
+++ b/x-pack/plugin/graph/qa/with-security/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 // bring in graph rest test suite
 restResources {
   restApi {
+    includeCore '_common', 'cluster', 'indices', 'index'
     includeXpack 'graph'
   }
   restTests {
diff --git a/x-pack/plugin/ilm/qa/rest/build.gradle b/x-pack/plugin/ilm/qa/rest/build.gradle
index 6c5ea98a0b46d..741c924cc14f5 100644
--- a/x-pack/plugin/ilm/qa/rest/build.gradle
+++ b/x-pack/plugin/ilm/qa/rest/build.gradle
@@ -10,6 +10,7 @@ dependencies {
 
 restResources {
   restApi {
+    includeCore '_common', 'cluster', 'indices', 'index'
     includeXpack 'ilm', 'slm'
   }
 }
diff --git a/x-pack/plugin/ml/qa/ml-with-security/build.gradle b/x-pack/plugin/ml/qa/ml-with-security/build.gradle
index 2ac378e472a7b..c6710ffe6a1be 100644
--- a/x-pack/plugin/ml/qa/ml-with-security/build.gradle
+++ b/x-pack/plugin/ml/qa/ml-with-security/build.gradle
@@ -11,6 +11,7 @@ dependencies {
 // bring in machine learning rest test suite
 restResources {
   restApi {
+    includeCore '_common', 'cluster', 'nodes', 'indices', 'index', 'search', 'get', 'count', 'ingest'
     includeXpack 'ml', 'cat'
   }
   restTests {
diff --git a/x-pack/plugin/watcher/qa/rest/build.gradle b/x-pack/plugin/watcher/qa/rest/build.gradle
index df648262e9973..4d0ad83d7c9a6 100644
--- a/x-pack/plugin/watcher/qa/rest/build.gradle
+++ b/x-pack/plugin/watcher/qa/rest/build.gradle
@@ -21,6 +21,8 @@ artifacts {
 
 restResources {
   restApi {
+    includeCore '_common', 'cluster', 'nodes', 'search', 'get', 'indices', 
+                'index', 'put_script', 'ingest', 'count'
     includeXpack 'watcher', 'xpack'
   }
 }