From 718a241449f5bae865fbfdfb15ef346e1477d965 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Wed, 20 Apr 2022 08:54:56 +0200 Subject: [PATCH] Apply precommit checks for non productive projects (#85533) Ensure projects with only yaml, java or cluster tests also apply precommit checks. We only apply testingconventions now for projects with existing src test folder as the TestingConventionsTask is incompatible with projects with no test sourceSet. This is a prerequisite to port more projects away from using StandaloneRestTestPlugin and RestTestPlugin in favor of yaml, java or cluster tests with dedicated sourceSets. Also we fix deprecation warnings for forbiddenPattern and filePermissions tasks about implicit non declared dependencies on resources tasks --- .../internal/InternalPluginBuildPlugin.java | 28 +-- .../FilePermissionsPrecommitPlugin.java | 21 ++- .../ForbiddenPatternsPrecommitPlugin.java | 6 + .../precommit/ForbiddenPatternsTask.java | 1 + .../precommit/InternalPrecommitTasks.java | 13 +- .../internal/test/RestTestBasePlugin.java | 2 + .../gradle/plugin/PluginBuildPlugin.java | 1 + modules/runtime-fields-common/build.gradle | 5 +- rest-api-spec/build.gradle | 1 - test/x-content/build.gradle | 3 - .../xpack/eql/EqlRestValidationIT.java | 7 + .../actions/SearchableSnapshotActionIT.java | 19 +- .../xpack/ml/integration/TrainedModelIT.java | 164 +++++++++--------- .../preallocate/build.gradle | 2 - .../plugin/sql/qa/jdbc/security/build.gradle | 2 - .../sql/qa/server/security/build.gradle | 1 - .../test/rest/AbstractXPackRestTest.java | 2 +- .../qa/multi-node-tests/build.gradle | 2 +- .../continuous/LatestContinuousIT.java | 3 +- .../continuous/TransformContinuousIT.java | 6 +- 20 files changed, 161 insertions(+), 128 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalPluginBuildPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalPluginBuildPlugin.java index 3c51070f5bf8..8d2b8a4ce13a 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalPluginBuildPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalPluginBuildPlugin.java @@ -8,6 +8,7 @@ package org.elasticsearch.gradle.internal; +import org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin; import org.elasticsearch.gradle.internal.precommit.TestingConventionsTasks; import org.gradle.api.Project; @@ -17,15 +18,22 @@ public class InternalPluginBuildPlugin implements InternalPlugin { project.getPluginManager().apply(BuildPlugin.class); project.getPluginManager().apply(BaseInternalPluginBuildPlugin.class); - project.getTasks().withType(TestingConventionsTasks.class).named("testingConventions").configure(t -> { - t.getNaming().clear(); - t.getNaming() - .create("Tests", testingConventionRule -> testingConventionRule.baseClass("org.apache.lucene.tests.util.LuceneTestCase")); - t.getNaming().create("IT", testingConventionRule -> { - testingConventionRule.baseClass("org.elasticsearch.test.ESIntegTestCase"); - testingConventionRule.baseClass("org.elasticsearch.test.rest.ESRestTestCase"); - testingConventionRule.baseClass("org.elasticsearch.test.ESSingleNodeTestCase"); - }); - }); + project.getPlugins() + .withType( + TestingConventionsPrecommitPlugin.class, + plugin -> project.getTasks().withType(TestingConventionsTasks.class).named("testingConventions").configure(t -> { + t.getNaming().clear(); + t.getNaming() + .create( + "Tests", + testingConventionRule -> testingConventionRule.baseClass("org.apache.lucene.tests.util.LuceneTestCase") + ); + t.getNaming().create("IT", testingConventionRule -> { + testingConventionRule.baseClass("org.elasticsearch.test.ESIntegTestCase"); + testingConventionRule.baseClass("org.elasticsearch.test.rest.ESRestTestCase"); + testingConventionRule.baseClass("org.elasticsearch.test.ESSingleNodeTestCase"); + }); + }) + ); } } diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsPrecommitPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsPrecommitPlugin.java index 7f240b6d4cb8..b40fff68be62 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsPrecommitPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsPrecommitPlugin.java @@ -32,16 +32,19 @@ public class FilePermissionsPrecommitPlugin extends PrecommitPlugin implements I @Override public TaskProvider createTask(Project project) { - return project.getTasks() - .register( - FILEPERMISSIONS_TASK_NAME, - FilePermissionsTask.class, - filePermissionsTask -> filePermissionsTask.getSources() - .addAll( - providerFactory.provider( - () -> GradleUtils.getJavaSourceSets(project).stream().map(s -> s.getAllSource()).collect(Collectors.toList()) - ) + return project.getTasks().register(FILEPERMISSIONS_TASK_NAME, FilePermissionsTask.class, t -> { + t.getSources() + .addAll( + providerFactory.provider( + () -> GradleUtils.getJavaSourceSets(project).stream().map(s -> s.getAllSource()).collect(Collectors.toList()) ) + ); + t.dependsOn( + GradleUtils.getJavaSourceSets(project) + .stream() + .map(sourceSet -> sourceSet.getProcessResourcesTaskName()) + .collect(Collectors.toList()) ); + }); } } diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsPrecommitPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsPrecommitPlugin.java index 030191839095..cba15966b1ca 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsPrecommitPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsPrecommitPlugin.java @@ -39,6 +39,12 @@ public class ForbiddenPatternsPrecommitPlugin extends PrecommitPlugin implements () -> GradleUtils.getJavaSourceSets(project).stream().map(s -> s.getAllSource()).collect(Collectors.toList()) ) ); + forbiddenPatternsTask.dependsOn( + GradleUtils.getJavaSourceSets(project) + .stream() + .map(sourceSet -> sourceSet.getProcessResourcesTaskName()) + .collect(Collectors.toList()) + ); forbiddenPatternsTask.getRootDir().set(project.getRootDir()); }); } diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTask.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTask.java index 32059eefb868..abb933d14278 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTask.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTask.java @@ -66,6 +66,7 @@ public abstract class ForbiddenPatternsTask extends DefaultTask { .exclude("**/*.zip") .exclude("**/*.jks") .exclude("**/*.crt") + .exclude("**/*.p12") .exclude("**/*.keystore") .exclude("**/*.png") // vim swap file - included here to stop the build falling over if you happen to have a file open :-| diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/InternalPrecommitTasks.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/InternalPrecommitTasks.java index dbf1a5cbccf2..6e177e6987ba 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/InternalPrecommitTasks.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/InternalPrecommitTasks.java @@ -25,13 +25,22 @@ public class InternalPrecommitTasks { project.getPluginManager().apply(ForbiddenPatternsPrecommitPlugin.class); project.getPluginManager().apply(LicenseHeadersPrecommitPlugin.class); project.getPluginManager().apply(FilePermissionsPrecommitPlugin.class); - project.getPluginManager().apply(TestingConventionsPrecommitPlugin.class); project.getPluginManager().apply(LoggerUsagePrecommitPlugin.class); - project.getPluginManager().apply(JarHellPrecommitPlugin.class); + + // TestingConventionsPlugin is incompatible with projects without + // test source sets. We wanna remove this plugin once we moved away from + // StandaloneRestTest plugin and RestTestPlugin. For apply this plugin only + // when tests are available. + // Long Term we want remove the need for most of this plugins functionality + // and not rely on multiple test tasks against a sourceSet. + if (project.file("src/test").exists()) { + project.getPluginManager().apply(TestingConventionsPrecommitPlugin.class); + } // tasks with just tests don't need certain tasks to run, so this flag makes adding // the task optional if (withProductiveCode) { + project.getPluginManager().apply(JarHellPrecommitPlugin.class); project.getPluginManager().apply(ThirdPartyAuditPrecommitPlugin.class); project.getPluginManager().apply(DependencyLicensesPrecommitPlugin.class); project.getPluginManager().apply(SplitPackagesAuditPrecommitPlugin.class); diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/RestTestBasePlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/RestTestBasePlugin.java index ef5d1933f662..0b7338f6d96b 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/RestTestBasePlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/RestTestBasePlugin.java @@ -12,6 +12,7 @@ import org.elasticsearch.gradle.internal.ElasticsearchJavaBasePlugin; import org.elasticsearch.gradle.internal.ElasticsearchTestBasePlugin; import org.elasticsearch.gradle.internal.FixtureStop; import org.elasticsearch.gradle.internal.InternalTestClustersPlugin; +import org.elasticsearch.gradle.internal.precommit.InternalPrecommitTasks; import org.elasticsearch.gradle.test.SystemPropertyCommandLineArgumentProvider; import org.elasticsearch.gradle.testclusters.ElasticsearchCluster; import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask; @@ -48,6 +49,7 @@ public class RestTestBasePlugin implements Plugin { project.getPluginManager().apply(ElasticsearchJavaBasePlugin.class); project.getPluginManager().apply(ElasticsearchTestBasePlugin.class); project.getPluginManager().apply(InternalTestClustersPlugin.class); + InternalPrecommitTasks.create(project, false); project.getTasks().withType(RestIntegTestTask.class).configureEach(restIntegTestTask -> { @SuppressWarnings("unchecked") NamedDomainObjectContainer testClusters = (NamedDomainObjectContainer) project diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/plugin/PluginBuildPlugin.java b/build-tools/src/main/java/org/elasticsearch/gradle/plugin/PluginBuildPlugin.java index f3c13a5f546a..7ba2d33f7a46 100644 --- a/build-tools/src/main/java/org/elasticsearch/gradle/plugin/PluginBuildPlugin.java +++ b/build-tools/src/main/java/org/elasticsearch/gradle/plugin/PluginBuildPlugin.java @@ -138,6 +138,7 @@ public class PluginBuildPlugin implements Plugin { }); } }); + final var buildProperties = project.getTasks().register("pluginProperties", Copy.class, copy -> { copy.dependsOn(copyPluginPropertiesTemplate); copy.from(templateFile); diff --git a/modules/runtime-fields-common/build.gradle b/modules/runtime-fields-common/build.gradle index 54076aaecdf8..a429e9dd5978 100644 --- a/modules/runtime-fields-common/build.gradle +++ b/modules/runtime-fields-common/build.gradle @@ -20,7 +20,4 @@ dependencies { compileOnly project(':modules:lang-painless:spi') api project(':libs:elasticsearch-grok') api project(':libs:elasticsearch-dissect') -} - -//this plugin is here only for the painless extension, there are no unit tests -tasks.named("testingConventions").configure { enabled = false } +} \ No newline at end of file diff --git a/rest-api-spec/build.gradle b/rest-api-spec/build.gradle index 3baa2593f7da..3c938021af26 100644 --- a/rest-api-spec/build.gradle +++ b/rest-api-spec/build.gradle @@ -40,7 +40,6 @@ testClusters.configureEach { } tasks.named("test").configure { enabled = false } -tasks.named("jarHell").configure { enabled = false } tasks.named("yamlRestTestV7CompatTransform").configure { task -> diff --git a/test/x-content/build.gradle b/test/x-content/build.gradle index e0fb3c5c5981..147bdecc7aa6 100644 --- a/test/x-content/build.gradle +++ b/test/x-content/build.gradle @@ -32,9 +32,6 @@ tasks.named("dependencyLicenses").configure { enabled = false } tasks.named("dependenciesInfo").configure { enabled = false } tasks.named("dependenciesGraph").configure { enabled = false } -// no tests of the tests, yet -tasks.named("testingConventions").configure { enabled = false } - tasks.named("thirdPartyAudit").configure { ignoreMissingClasses( // classes are missing diff --git a/x-pack/plugin/eql/qa/security/src/javaRestTest/java/org/elasticsearch/xpack/eql/EqlRestValidationIT.java b/x-pack/plugin/eql/qa/security/src/javaRestTest/java/org/elasticsearch/xpack/eql/EqlRestValidationIT.java index c9e05fca7232..3cb5c5caa284 100644 --- a/x-pack/plugin/eql/qa/security/src/javaRestTest/java/org/elasticsearch/xpack/eql/EqlRestValidationIT.java +++ b/x-pack/plugin/eql/qa/security/src/javaRestTest/java/org/elasticsearch/xpack/eql/EqlRestValidationIT.java @@ -1,3 +1,10 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + package org.elasticsearch.xpack.eql; import org.elasticsearch.common.settings.Settings; diff --git a/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/actions/SearchableSnapshotActionIT.java b/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/actions/SearchableSnapshotActionIT.java index 0a50946e33e4..49742e57835b 100644 --- a/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/actions/SearchableSnapshotActionIT.java +++ b/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/actions/SearchableSnapshotActionIT.java @@ -94,7 +94,7 @@ public class SearchableSnapshotActionIT extends ESRestTestCase { createComposableTemplate( client(), - randomAlphaOfLengthBetween(5, 10).toLowerCase(), + randomAlphaOfLengthBetween(5, 10).toLowerCase(Locale.ROOT), dataStream, new Template(Settings.builder().put(LifecycleSettings.LIFECYCLE_NAME, policy).build(), null, null) ); @@ -125,7 +125,12 @@ public class SearchableSnapshotActionIT extends ESRestTestCase { createSnapshotRepo(client(), snapshotRepo, randomBoolean()); createNewSingletonPolicy(client(), policy, "cold", new SearchableSnapshotAction(snapshotRepo, true)); - createComposableTemplate(client(), randomAlphaOfLengthBetween(5, 10).toLowerCase(), dataStream, new Template(null, null, null)); + createComposableTemplate( + client(), + randomAlphaOfLengthBetween(5, 10).toLowerCase(Locale.ROOT), + dataStream, + new Template(null, null, null) + ); for (int i = 0; i < randomIntBetween(5, 10); i++) { indexDocument(client(), dataStream, true); @@ -199,7 +204,7 @@ public class SearchableSnapshotActionIT extends ESRestTestCase { createComposableTemplate( client(), - randomAlphaOfLengthBetween(5, 10).toLowerCase(), + randomAlphaOfLengthBetween(5, 10).toLowerCase(Locale.ROOT), dataStream, new Template(Settings.builder().put(LifecycleSettings.LIFECYCLE_NAME, policy).build(), null, null) ); @@ -289,7 +294,7 @@ public class SearchableSnapshotActionIT extends ESRestTestCase { createComposableTemplate( client(), - randomAlphaOfLengthBetween(5, 10).toLowerCase(), + randomAlphaOfLengthBetween(5, 10).toLowerCase(Locale.ROOT), dataStream, new Template( Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 5).put(LifecycleSettings.LIFECYCLE_NAME, policy).build(), @@ -368,7 +373,7 @@ public class SearchableSnapshotActionIT extends ESRestTestCase { createComposableTemplate( client(), - randomAlphaOfLengthBetween(5, 10).toLowerCase(), + randomAlphaOfLengthBetween(5, 10).toLowerCase(Locale.ROOT), dataStream, new Template( Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 5).put(LifecycleSettings.LIFECYCLE_NAME, policy).build(), @@ -628,7 +633,7 @@ public class SearchableSnapshotActionIT extends ESRestTestCase { createComposableTemplate( client(), - randomAlphaOfLengthBetween(5, 10).toLowerCase(), + randomAlphaOfLengthBetween(5, 10).toLowerCase(Locale.ROOT), dataStream, new Template( Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(LifecycleSettings.LIFECYCLE_NAME, policy).build(), @@ -675,7 +680,7 @@ public class SearchableSnapshotActionIT extends ESRestTestCase { createComposableTemplate( client(), - randomAlphaOfLengthBetween(5, 10).toLowerCase(), + randomAlphaOfLengthBetween(5, 10).toLowerCase(Locale.ROOT), dataStream, new Template(Settings.builder().put(LifecycleSettings.LIFECYCLE_NAME, policy).build(), null, null) ); diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/TrainedModelIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/TrainedModelIT.java index 7426b314fa1d..d57d714c74b9 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/TrainedModelIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/TrainedModelIT.java @@ -241,89 +241,89 @@ public class TrainedModelIT extends ESRestTestCase { private void putRegressionModel(String modelId) throws IOException { String modelConfig = """ - { - "definition": { - "trained_model": { - "ensemble": { - "feature_names": ["field.foo", "field.bar", "animal_cat", "animal_dog"], - "trained_models": [{ - "tree": { - "feature_names": ["field.foo", "field.bar", "animal_cat", "animal_dog"], - "tree_structure": [{ - "threshold": 0.5, - "split_feature": 0, - "node_index": 0, - "left_child": 1, - "right_child": 2 - }, { - "node_index": 1, - "leaf_value": [0.3] - }, { - "threshold": 0.0, - "split_feature": 3, - "node_index": 2, - "left_child": 3, - "right_child": 4 - }, { - "node_index": 3, - "leaf_value": [0.1] - }, { - "node_index": 4, - "leaf_value": [0.2] - }] - } - }, { - "tree": { - "feature_names": ["field.foo", "field.bar", "animal_cat", "animal_dog"], - "tree_structure": [{ - "threshold": 1.0, - "split_feature": 2, - "node_index": 0, - "left_child": 1, - "right_child": 2 - }, { - "node_index": 1, - "leaf_value": [1.5] - }, { - "node_index": 2, - "leaf_value": [0.9] - }] - } - }, { - "tree": { - "feature_names": ["field.foo", "field.bar", "animal_cat", "animal_dog"], - "tree_structure": [{ - "threshold": 0.2, - "split_feature": 1, - "node_index": 0, - "left_child": 1, - "right_child": 2 - }, { - "node_index": 1, - "leaf_value": [1.5] - }, { - "node_index": 2, - "leaf_value": [0.9] - }] - } - }], - "aggregate_output": { - "weighted_sum": { - "weights": [0.5, 0.5, 0.5] - } - }, - "target_type": "regression" - } - }, - "preprocessors": [] - }, - "input": { - "field_names": ["col1", "col2", "col3"] - }, - "inference_config": { - "regression": {} - } + { + "definition": { + "trained_model": { + "ensemble": { + "feature_names": ["field.foo", "field.bar", "animal_cat", "animal_dog"], + "trained_models": [{ + "tree": { + "feature_names": ["field.foo", "field.bar", "animal_cat", "animal_dog"], + "tree_structure": [{ + "threshold": 0.5, + "split_feature": 0, + "node_index": 0, + "left_child": 1, + "right_child": 2 + }, { + "node_index": 1, + "leaf_value": [0.3] + }, { + "threshold": 0.0, + "split_feature": 3, + "node_index": 2, + "left_child": 3, + "right_child": 4 + }, { + "node_index": 3, + "leaf_value": [0.1] + }, { + "node_index": 4, + "leaf_value": [0.2] + }] + } + }, { + "tree": { + "feature_names": ["field.foo", "field.bar", "animal_cat", "animal_dog"], + "tree_structure": [{ + "threshold": 1.0, + "split_feature": 2, + "node_index": 0, + "left_child": 1, + "right_child": 2 + }, { + "node_index": 1, + "leaf_value": [1.5] + }, { + "node_index": 2, + "leaf_value": [0.9] + }] + } + }, { + "tree": { + "feature_names": ["field.foo", "field.bar", "animal_cat", "animal_dog"], + "tree_structure": [{ + "threshold": 0.2, + "split_feature": 1, + "node_index": 0, + "left_child": 1, + "right_child": 2 + }, { + "node_index": 1, + "leaf_value": [1.5] + }, { + "node_index": 2, + "leaf_value": [0.9] + }] + } + }], + "aggregate_output": { + "weighted_sum": { + "weights": [0.5, 0.5, 0.5] + } + }, + "target_type": "regression" + } + }, + "preprocessors": [] + }, + "input": { + "field_names": ["col1", "col2", "col3"] + }, + "inference_config": { + "regression": {} } + } """; Request model = new Request("PUT", "_ml/trained_models/" + modelId); diff --git a/x-pack/plugin/searchable-snapshots/preallocate/build.gradle b/x-pack/plugin/searchable-snapshots/preallocate/build.gradle index 2794fc7e6ecd..6a6ceb8b5069 100644 --- a/x-pack/plugin/searchable-snapshots/preallocate/build.gradle +++ b/x-pack/plugin/searchable-snapshots/preallocate/build.gradle @@ -12,5 +12,3 @@ archivesBaseName = 'preallocate' dependencies { compileOnly project(":server") } - -tasks.named("testingConventions").configure { enabled = false } diff --git a/x-pack/plugin/sql/qa/jdbc/security/build.gradle b/x-pack/plugin/sql/qa/jdbc/security/build.gradle index 238511a613bc..10b9476b431a 100644 --- a/x-pack/plugin/sql/qa/jdbc/security/build.gradle +++ b/x-pack/plugin/sql/qa/jdbc/security/build.gradle @@ -47,6 +47,4 @@ subprojects { nonInputProperties.systemProperty 'tests.audit.yesterday.logfile', "${-> testClusters.integTest.singleNode().getAuditLog().getParentFile()}/integTest_audit-${new Date().format('yyyy-MM-dd')}.json" } - - tasks.named("testingConventions").configure { enabled = false } } diff --git a/x-pack/plugin/sql/qa/server/security/build.gradle b/x-pack/plugin/sql/qa/server/security/build.gradle index faa55451ae29..3ef2953fcb34 100644 --- a/x-pack/plugin/sql/qa/server/security/build.gradle +++ b/x-pack/plugin/sql/qa/server/security/build.gradle @@ -53,5 +53,4 @@ subprojects { "${-> testClusters.integTest.singleNode().getAuditLog().getParentFile()}/integTest_audit-${new Date().format('yyyy-MM-dd')}-1.json.gz" } - tasks.named("testingConventions").configure { enabled = false } } diff --git a/x-pack/plugin/src/test/java/org/elasticsearch/xpack/test/rest/AbstractXPackRestTest.java b/x-pack/plugin/src/test/java/org/elasticsearch/xpack/test/rest/AbstractXPackRestTest.java index fa124529e2b3..1ef7718aea8f 100644 --- a/x-pack/plugin/src/test/java/org/elasticsearch/xpack/test/rest/AbstractXPackRestTest.java +++ b/x-pack/plugin/src/test/java/org/elasticsearch/xpack/test/rest/AbstractXPackRestTest.java @@ -42,7 +42,7 @@ import static java.util.Collections.singletonMap; /** Runs rest tests against external cluster */ // TODO: Remove this timeout increase once this test suite is broken up @TimeoutSuite(millis = 60 * TimeUnits.MINUTE) -public class AbstractXPackRestTest extends ESClientYamlSuiteTestCase { +public abstract class AbstractXPackRestTest extends ESClientYamlSuiteTestCase { private static final String BASIC_AUTH_VALUE = basicAuthHeaderValue( "x_pack_rest_user", SecuritySettingsSourceField.TEST_PASSWORD_SECURE_STRING diff --git a/x-pack/plugin/transform/qa/multi-node-tests/build.gradle b/x-pack/plugin/transform/qa/multi-node-tests/build.gradle index d88b7c9493e9..6cd6c529a879 100644 --- a/x-pack/plugin/transform/qa/multi-node-tests/build.gradle +++ b/x-pack/plugin/transform/qa/multi-node-tests/build.gradle @@ -11,7 +11,7 @@ File keystoreDir = new File(project.buildDir, 'keystore') File nodeKey = file("$keystoreDir/testnode.pem") File nodeCert = file("$keystoreDir/testnode.crt") // Add key and certs to test classpath: it expects it there -tasks.register("copyKeyCerts", Copy) { +def copyKeyCerts = tasks.register("copyKeyCerts", Copy) { from(project(':x-pack:plugin:core').file('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/')) { include 'testnode.crt', 'testnode.pem' } diff --git a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/LatestContinuousIT.java b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/LatestContinuousIT.java index b2eff11a571a..9d585cd0bd47 100644 --- a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/LatestContinuousIT.java +++ b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/LatestContinuousIT.java @@ -21,6 +21,7 @@ import org.elasticsearch.xpack.core.transform.transforms.latest.LatestConfig; import java.io.IOException; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; @@ -140,7 +141,7 @@ public class LatestContinuousIT extends ContinuousTestCase { String transformBucketKey = eventFieldValue != null // The bucket key in source can be either an ordinary field or a runtime field. When it is runtime field, simulate its // script ("toUpperCase()") here. - ? "event".equals(eventField) ? eventFieldValue : eventFieldValue.toUpperCase() + ? "event".equals(eventField) ? eventFieldValue : eventFieldValue.toUpperCase(Locale.ROOT) : MISSING_BUCKET_KEY; // Verify that the results from the aggregation and the results from the transform are the same. diff --git a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/TransformContinuousIT.java b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/TransformContinuousIT.java index 05c52bd59a44..84a53f89cb14 100644 --- a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/TransformContinuousIT.java +++ b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/TransformContinuousIT.java @@ -375,7 +375,8 @@ public class TransformContinuousIT extends TransformRestTestCase { .startObject("script") .field( "source", - "if (doc['metric-timestamp'].size()!=0) {emit(doc['metric-timestamp'].value.minus(5, ChronoUnit.MINUTES).toInstant().toEpochMilli())}" + "if (doc['metric-timestamp'].size()!=0) {emit(doc['metric-timestamp'].value" + + ".minus(5, ChronoUnit.MINUTES).toInstant().toEpochMilli())}" ) .endObject() .endObject() @@ -384,7 +385,8 @@ public class TransformContinuousIT extends TransformRestTestCase { .startObject("script") .field( "source", - "if (doc['some-timestamp'].size()!=0) {emit(doc['some-timestamp'].value.minus(10, ChronoUnit.MINUTES).toInstant().toEpochMilli())}" + "if (doc['some-timestamp'].size()!=0) {emit(doc['some-timestamp'].value" + + ".minus(10, ChronoUnit.MINUTES).toInstant().toEpochMilli())}" ) .endObject() .endObject();