Skip to content

Commit bc15a63

Browse files
jfredenkkrik-es
andauthored
[8.19] Remove remaining logic and tests for subobjects:auto (#137428) (#138648)
* Remove remaining logic and tests for subobjects:auto (#137428) * Remove remaining logic and tests for subobjects:auto * skip compat tests * skip compat tests (cherry picked from commit 8c110cb) # Conflicts: # qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java # qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java # qa/smoke-test-multinode/src/yamlRestTest/java/org/elasticsearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java # rest-api-spec/build.gradle # rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java # rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/92_metrics_auto_subobjects.yml # rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml # rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/15_composition.yml # rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/330_fetch_fields.yml # server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java # server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java # server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java # server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java # x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java # x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/src/yamlRestTest/java/org/elasticsearch/multiproject/test/XpackWithMultipleProjectsClientYamlTestSuiteIT.java * fixup! Rebase issue * fixup! Rebase issue * fixup! Remove empty file * fixup! Remove test --------- Co-authored-by: Kostas Krikellas <[email protected]>
1 parent e34ace0 commit bc15a63

File tree

17 files changed

+40
-1061
lines changed

17 files changed

+40
-1061
lines changed

qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ public class CcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
8989
.setting("xpack.security.enabled", "false")
9090
// geohex_grid requires gold license
9191
.setting("xpack.license.self_generated.type", "trial")
92-
.feature(FeatureFlag.TIME_SERIES_MODE)
93-
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED);
92+
.feature(FeatureFlag.TIME_SERIES_MODE);
9493

9594
private static ElasticsearchCluster remoteCluster = ElasticsearchCluster.local()
9695
.name(REMOTE_CLUSTER_NAME)

qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public class RcsCcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
9191
.setting("xpack.security.remote_cluster_server.ssl.enabled", "false")
9292
.setting("xpack.security.remote_cluster_client.ssl.enabled", "false")
9393
.feature(FeatureFlag.TIME_SERIES_MODE)
94-
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
9594
.user("test_admin", "x-pack-test-password");
9695

9796
private static ElasticsearchCluster fulfillingCluster = ElasticsearchCluster.local()

qa/mixed-cluster/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
8383
setting 'health.master_history.no_master_transitions_threshold', '10'
8484
}
8585
requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
86-
requiresFeature 'sub_objects_auto', Version.fromString("8.16.0")
8786
if (bwcVersion.before(Version.fromString("8.18.0"))) {
8887
jvmArgs '-da:org.elasticsearch.index.mapper.DocumentMapper'
8988
jvmArgs '-da:org.elasticsearch.index.mapper.MapperService'

qa/smoke-test-multinode/src/yamlRestTest/java/org/elasticsearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class SmokeTestMultiNodeClientYamlTestSuiteIT extends ESClientYamlSuiteTe
3535
// The first node does not have the ingest role so we're sure ingest requests are forwarded:
3636
.node(0, n -> n.setting("node.roles", "[master,data,ml,remote_cluster_client,transform]"))
3737
.feature(FeatureFlag.TIME_SERIES_MODE)
38-
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
3938
.build();
4039

4140
public SmokeTestMultiNodeClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class ClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
3535
.module("health-shards-availability")
3636
.module("data-streams")
3737
.feature(FeatureFlag.TIME_SERIES_MODE)
38-
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
3938
.build();
4039

4140
public ClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/92_metrics_auto_subobjects.yml

Lines changed: 0 additions & 262 deletions
This file was deleted.

0 commit comments

Comments
 (0)