opensearch-project · nknize · Feb 9, 2021 · Feb 9, 2021
@@ -291,9 +291,6 @@ restResources {
 }
 ---------------------------------------------------------------------------
 
-YAML REST tests that include x-pack specific APIs need to explicitly declare
-which APIs are required through a similar `includeXpack` configuration.
-
 The REST tests are run automatically when executing the "./gradlew check" command. To run only the
 YAML REST tests use the following command (modules and plugins may also include YAML REST tests):
 

@@ -255,17 +255,7 @@ class RestTestsFromSnippetsTask extends SnippetsTask {
                 current.println("        - stash_path_replace")
                 current.println("        - warnings")
                 if (test.testEnv != null) {
-                    switch (test.testEnv) {
-                    case 'basic':
-                    case 'gold':
-                    case 'platinum':
-                    case 'enterprise':
-                        current.println("        - xpack")
-                        break;
-                    default:
-                        throw new InvalidUserDataException('Unsupported testEnv: '
-                                + test.testEnv)
-                    }
+                    throw new InvalidUserDataException('Unsupported testEnv: ' + test.testEnv);
                 }
             }
             if (test.skip) {

@@ -782,26 +782,9 @@ public void testApiNamingConventions() throws Exception {
                             assertTrue("method [" + method.getName() + "], api [" + apiName + "] should be deprecated",
                                 method.isAnnotationPresent(Deprecated.class));
                         } else {
-                            //TODO xpack api are currently ignored, we need to load xpack yaml spec too
-                            if (apiName.startsWith("xpack.") == false &&
-                                apiName.startsWith("license.") == false &&
-                                apiName.startsWith("machine_learning.") == false &&
-                                apiName.startsWith("watcher.") == false &&
-                                apiName.startsWith("graph.") == false &&
-                                apiName.startsWith("migration.") == false &&
-                                apiName.startsWith("security.") == false &&
-                                apiName.startsWith("index_lifecycle.") == false &&
-                                apiName.startsWith("transform.") == false &&
-                                apiName.endsWith("freeze") == false &&
-                                apiName.endsWith("reload_analyzers") == false &&
-                                apiName.startsWith("async_search") == false &&
-                                // IndicesClientIT.getIndexTemplate should be renamed "getTemplate" in version 8.0 when we
+                            if (// IndicesClientIT.getIndexTemplate should be renamed "getTemplate" in version 8.0 when we
                                 // can get rid of 7.0's deprecated "getTemplate"
-                                apiName.equals("indices.get_index_template") == false &&
-                                org.elasticsearch.common.collect.List.of("indices.data_streams_stats",
-                                    "indices.delete_data_stream",
-                                    "indices.create_data_stream",
-                                    "indices.get_data_stream").contains(apiName) == false) {
+                                apiName.equals("indices.get_index_template") == false ) {
                                 apiNotFound.add(apiName);
                             }
                         }

@@ -133,14 +133,6 @@ by default, thus the related skip sections can be removed from the tests.
 The `features` field can either be a string or an array of strings.
 The skip section requires to specify either a `version` or a `features` list.
 
-=== Available Features
-
-=== `xpack`
-Requires x-pack to be enabled on the `Elasticsearch` instance the rest test is running against
-
-=== `no_xpack`
-Requires the test to run against an oss distribution of `Elasticsearch`
-
 === `catch_unauthorized`
 
 Runner supports `catch: unauthorized` on a `do` operator.

@@ -20,7 +20,7 @@
 ---
 "No templates":
     - skip:
-        features: default_shards, no_xpack
+        features: default_shards
     - do:
         cat.templates: {}
 
@@ -199,7 +199,7 @@
     - skip:
         version: " - 7.7.99"
         reason: "format changed in 7.8 to accomodate V2 index templates"
-        features: default_shards, no_xpack
+        features: default_shards
 
     - do:
         indices.put_template:
@@ -252,7 +252,7 @@
     - skip:
         version: " - 7.7.99"
         reason: "format changed in 7.8 to accomodate V2 index templates"
-        features: default_shards, no_xpack
+        features: default_shards
 
     - do:
         indices.put_template:
@@ -280,7 +280,6 @@
                  test_1       \s+
                  \[t\*,\ te\*\]
                  \n
-                 \n
               $/
 
 ---

@@ -16,7 +16,6 @@ setup:
   - skip:
       version: " - 7.7.99"
       reason: "node roles were not sorted before 7.8.0"
-      features: [no_xpack]
 
   - do:
       nodes.info: {}

@@ -143,16 +143,6 @@ public static List<Object> entityAsList(Response response) throws IOException {
         }
     }
 
-    /**
-     * Does any node in the cluster being tested have x-pack installed?
-     */
-    public static boolean hasXPack() {
-        if (hasXPack == null) {
-            throw new IllegalStateException("must be called inside of a rest test case test");
-        }
-        return hasXPack;
-    }
-
     private static List<HttpHost> clusterHosts;
     /**
      * A client for the running Elasticsearch cluster
@@ -163,15 +153,13 @@ public static boolean hasXPack() {
      * completes
      */
     private static RestClient adminClient;
-    private static Boolean hasXPack;
     private static TreeSet<Version> nodeVersions;
 
     @Before
     public void initClient() throws IOException {
         if (client == null) {
             assert adminClient == null;
             assert clusterHosts == null;
-            assert hasXPack == null;
             assert nodeVersions == null;
             String cluster = getTestRestCluster();
             String[] stringUrls = cluster.split(",");
@@ -190,25 +178,17 @@ public void initClient() throws IOException {
             client = buildClient(restClientSettings(), clusterHosts.toArray(new HttpHost[clusterHosts.size()]));
             adminClient = buildClient(restAdminSettings(), clusterHosts.toArray(new HttpHost[clusterHosts.size()]));
 
-            hasXPack = false;
             nodeVersions = new TreeSet<>();
             Map<?, ?> response = entityAsMap(adminClient.performRequest(new Request("GET", "_nodes/plugins")));
             Map<?, ?> nodes = (Map<?, ?>) response.get("nodes");
             for (Map.Entry<?, ?> node : nodes.entrySet()) {
                 Map<?, ?> nodeInfo = (Map<?, ?>) node.getValue();
                 nodeVersions.add(Version.fromString(nodeInfo.get("version").toString()));
-                for (Object module: (List<?>) nodeInfo.get("modules")) {
-                    Map<?, ?> moduleInfo = (Map<?, ?>) module;
-                    if (moduleInfo.get("name").toString().startsWith("x-pack-")) {
-                        hasXPack = true;
-                    }
-                }
             }
         }
         assert client != null;
         assert adminClient != null;
         assert clusterHosts != null;
-        assert hasXPack != null;
         assert nodeVersions != null;
     }
 
@@ -350,7 +330,6 @@ public static void closeClients() throws IOException {
             clusterHosts = null;
             client = null;
             adminClient = null;
-            hasXPack = null;
             nodeVersions = null;
         }
     }
@@ -547,67 +526,13 @@ private void wipeCluster() throws Exception {
 
         // wipe index templates
         if (preserveTemplatesUponCompletion() == false) {
-            if (hasXPack) {
-                /*
-                 * Delete only templates that xpack doesn't automatically
-                 * recreate. Deleting them doesn't hurt anything, but it
-                 * slows down the test because xpack will just recreate
-                 * them.
-                 */
-                Request request = new Request("GET", "_cat/templates");
-                request.addParameter("h", "name");
-                String templates = EntityUtils.toString(adminClient().performRequest(request).getEntity());
-                if (false == "".equals(templates)) {
-                    for (String template : templates.split("\n")) {
-                        if (isXPackTemplate(template)) continue;
-                        if ("".equals(template)) {
-                            throw new IllegalStateException("empty template in templates list:\n" + templates);
-                        }
-                        logger.info("Clearing template [{}]", template);
-                        try {
-                            adminClient().performRequest(new Request("DELETE", "_template/" + template));
-                        } catch (ResponseException e) {
-                            // This is fine, it could be a V2 template
-                            assertThat(e.getMessage(), containsString("index_template [" + template + "] missing"));
-                            try {
-                                adminClient().performRequest(new Request("DELETE", "_index_template/" + template));
-                            } catch (ResponseException e2) {
-                                // We hit a version of ES that doesn't support index templates v2 yet, so it's safe to ignore
-                            }
-                        }
-                    }
-                }
-                try {
-                    Request compReq = new Request("GET", "_component_template");
-                    String componentTemplates = EntityUtils.toString(adminClient().performRequest(compReq).getEntity());
-                    Map<String, Object> cTemplates = XContentHelper.convertToMap(JsonXContent.jsonXContent, componentTemplates, false);
-                    @SuppressWarnings("unchecked")
-                    List<String> names = ((List<Map<String, Object>>) cTemplates.get("component_templates")).stream()
-                        .map(ct -> (String) ct.get("name"))
-                        .collect(Collectors.toList());
-                    for (String componentTemplate : names) {
-                        try {
-                            if (isXPackTemplate(componentTemplate)) {
-                                continue;
-                            }
-                            adminClient().performRequest(new Request("DELETE", "_component_template/" + componentTemplate));
-                        } catch (ResponseException e) {
-                                logger.debug(new ParameterizedMessage("unable to remove component template {}", componentTemplate), e);
-                        }
-                    }
-                } catch (Exception e) {
-                    logger.info("ignoring exception removing all component templates", e);
-                    // We hit a version of ES that doesn't support index templates v2 yet, so it's safe to ignore
-                }
-            } else {
-                logger.debug("Clearing all templates");
-                adminClient().performRequest(new Request("DELETE", "_template/*"));
-                try {
-                    adminClient().performRequest(new Request("DELETE", "_index_template/*"));
-                    adminClient().performRequest(new Request("DELETE", "_component_template/*"));
-                } catch (ResponseException e) {
-                    // We hit a version of ES that doesn't support index templates v2 yet, so it's safe to ignore
-                }
+            logger.debug("Clearing all templates");
+            adminClient().performRequest(new Request("DELETE", "_template/*"));
+            try {
+                adminClient().performRequest(new Request("DELETE", "_index_template/*"));
+                adminClient().performRequest(new Request("DELETE", "_component_template/*"));
+            } catch (ResponseException e) {
+                // We hit a version of ES that doesn't support index templates v2 yet, so it's safe to ignore
             }
         }
 
@@ -1154,35 +1079,6 @@ private static void assertAcked(String message, Response response) throws IOExce
         assertThat(message + ": response is not acknowledged", acknowledged, equalTo(Boolean.TRUE));
     }
 
-    /**
-     * Is this template one that is automatically created by xpack?
-     */
-    protected static boolean isXPackTemplate(String name) {
-        if (name.startsWith(".transform-")) {
-            return true;
-        }
-        switch (name) {
-            case "logstash-index-template":
-            case ".logstash-management":
-            case "security_audit_log":
-            case ".slm-history":
-            case "saml-service-provider":
-            case "logs":
-            case "logs-settings":
-            case "logs-mappings":
-            case "metrics":
-            case "metrics-settings":
-            case "metrics-mappings":
-            case "synthetics":
-            case "synthetics-settings":
-            case "synthetics-mappings":
-            case ".snapshot-blob-cache":
-                return true;
-            default:
-                return false;
-        }
-    }
-
     public void flush(String index, boolean force) throws IOException {
         logger.info("flushing index {} force={}", index, force);
         final Request flushRequest = new Request("POST", "/" + index + "/_flush");
@@ -1269,10 +1165,6 @@ public void ensurePeerRecoveryRetentionLeasesRenewedAndSynced(String index) thro
         }, 60, TimeUnit.SECONDS);
     }
 
-    public static Boolean getHasXPack() {
-        return hasXPack;
-    }
-
     /**
      * Returns the minimum node version among all nodes of the cluster
      */
@@ -1325,37 +1217,6 @@ protected static void performSyncedFlush(String indexName, boolean retryOnConfli
         });
     }
 
-    /**
-     * Wait for the license to be applied and active. The specified admin client is used to check the license and this is done using
-     * {@link ESTestCase#assertBusy(CheckedRunnable)} to give some time to the License to be applied on nodes.
-     *
-     * @param restClient the client to use
-     * @throws Exception if an exception is thrown while checking the status of the license
-     */
-    protected static void waitForActiveLicense(final RestClient restClient) throws Exception {
-        assertBusy(() -> {
-            final Request request = new Request(HttpGet.METHOD_NAME, "/_xpack");
-            request.setOptions(RequestOptions.DEFAULT.toBuilder());
-
-            final Response response = restClient.performRequest(request);
-            assertOK(response);
-
-            try (InputStream is = response.getEntity().getContent()) {
-                XContentType xContentType = XContentType.fromMediaTypeOrFormat(response.getEntity().getContentType().getValue());
-                final Map<String, ?> map = XContentHelper.convertToMap(xContentType.xContent(), is, true);
-                assertThat(map, notNullValue());
-                assertThat("License must exist", map.containsKey("license"), equalTo(true));
-                @SuppressWarnings("unchecked")
-                final Map<String, ?> license = (Map<String, ?>) map.get("license");
-                assertThat("Expecting non-null license", license, notNullValue());
-                assertThat("License status must exist", license.containsKey("status"), equalTo(true));
-                final String status = (String) license.get("status");
-                assertThat("Expecting non-null license status", status, notNullValue());
-                assertThat("Expecting active license", status, equalTo("active"));
-            }
-        });
-    }
-
     static final Pattern CREATE_INDEX_MULTIPLE_MATCHING_TEMPLATES = Pattern.compile("^index \\[(.+)\\] matches multiple legacy " +
         "templates \\[(.+)\\], composable templates will only match a single template$");
 

@@ -63,15 +63,7 @@ private Features() {
      */
     public static boolean areAllSupported(List<String> features) {
         for (String feature : features) {
-            if (feature.equals("xpack")) {
-                if (false == ESRestTestCase.hasXPack()) {
-                    return false;
-                }
-            } else if (feature.equals("no_xpack")) {
-                if (ESRestTestCase.hasXPack()) {
-                    return false;
-                }
-            } else if (false == isSupported(feature)) {
+            if (false == isSupported(feature)) {
                 return false;
             }
         }