Organize repository-s3 tests in one project as test suites

Author: breskeby

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java

@@ -23,8 +23,9 @@
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ResolutionStrategy;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.plugins.JavaPluginExtension;
+import org.gradle.api.plugins.JvmTestSuitePlugin;
+import org.gradle.api.plugins.jvm.JvmTestSuite;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
@@ -35,6 +36,7 @@
 import org.gradle.api.tasks.testing.Test;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
 import org.gradle.jvm.toolchain.JavaToolchainService;
+import org.gradle.testing.base.TestingExtension;
 
 import java.util.List;
 import java.util.Map;
@@ -61,7 +63,9 @@ public void apply(Project project) {
         // make sure the global build info plugin is applied to the root project
         project.getRootProject().getPluginManager().apply(GlobalBuildInfoPlugin.class);
         buildParams = project.getRootProject().getExtensions().getByType(BuildParameterExtension.class);
-        project.getPluginManager().apply(JavaBasePlugin.class);
+        project.getPluginManager().apply(JvmTestSuitePlugin.class);
+        TestingExtension testing = project.getExtensions().getByType(TestingExtension.class);
+        testing.getSuites().withType(JvmTestSuite.class).configureEach(suite -> { suite.useJUnit(); });
         // common repositories setup
         project.getPluginManager().apply(RepositoriesSetupPlugin.class);
         project.getPluginManager().apply(ElasticsearchTestBasePlugin.class);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java

@@ -100,7 +100,6 @@ public RestTestBasePlugin(ProviderFactory providerFactory) {
     public void apply(Project project) {
         project.getPluginManager().apply(ElasticsearchJavaBasePlugin.class);
         project.getPluginManager().apply(InternalDistributionDownloadPlugin.class);
-        project.getPluginManager().apply(JvmTestSuitePlugin.class);
 
         var bwcVersions = loadBuildParams(project).get().getBwcVersions();
 

build-tools/src/main/java/org/elasticsearch/gradle/util/GradleUtils.java

@@ -14,6 +14,7 @@
 import org.gradle.api.Task;
 import org.gradle.api.UnknownTaskException;
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.ExternalModuleDependency;
 import org.gradle.api.artifacts.ModuleDependency;
 import org.gradle.api.artifacts.ProjectDependency;
 import org.gradle.api.plugins.JavaBasePlugin;
@@ -196,11 +197,9 @@ public static boolean isModuleProject(String projectPath) {
     }
 
     public static void disableTransitiveDependencies(Configuration config) {
-        config.getDependencies().configureEach(dep -> {
-            if (dep instanceof ModuleDependency
-                && dep instanceof ProjectDependency == false
-                && dep.getGroup().startsWith("org.elasticsearch") == false) {
-                ((ModuleDependency) dep).setTransitive(false);
+        config.getDependencies().withType(ExternalModuleDependency.class).configureEach(dep -> {
+            if (dep.getGroup().startsWith("org.elasticsearch") == false) {
+                dep.setTransitive(false);
             }
         });
     }

modules/build.gradle

@@ -9,7 +9,6 @@
 
 configure(subprojects.findAll { it.parent.path == project.path }) {
   group = 'org.elasticsearch.plugin' // for modules which publish client jars
-  // apply plugin: 'elasticsearch.internal-testclusters'
   apply plugin: 'elasticsearch.internal-es-plugin'
   apply plugin: 'elasticsearch.internal-test-artifact'
 

modules/repository-s3/build.gradle

@@ -8,8 +8,8 @@
  */
 org.elasticsearch.gradle.internal.test.rest.RestTestSuite
 
-apply plugin: 'elasticsearch.internal-yaml-rest-test'
 apply plugin: 'elasticsearch.internal-cluster-test'
+apply plugin: 'elasticsearch.internal-yaml-rest-test'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 
 esplugin {
@@ -41,27 +41,46 @@ dependencies {
 }
 
 tasks.named('check') {
+  // TODO revisit to be the default in ES
   dependsOn tasks.withType(Test)
 }
 
-
 testing {
   suites {
     configureEach {
+      // common configuration for all test suites in this project
       dependencies {
+        implementation project()
         implementation project(':test:framework')
-        implementation project(':test:fixtures:s3-fixture')
-        runtimeOnly "org.slf4j:slf4j-simple:${versions.slf4j}"
+        runtimeOnly("org.slf4j:slf4j-simple:${versions.slf4j}") {
+          // TODO: (Rene) this should be handled by ElasticsearchBase Plugin but there's an open issue with that.
+          transitive = false
+        }
+      }
+    }
+    test {
+      dependencies {
+        println "adding dependency = dependency"
+        implementation(project(':test:fixtures:s3-fixture'))
       }
     }
+    // test suite defined by InternalJavaRestTestPlugin
     internalClusterTest {
       dependencies {
         implementation project(':test:fixtures:minio-fixture')
       }
+      targets {
+        all {
+          testTask.configure {
+            // TODO: remove once https://github.com/elastic/elasticsearch/issues/101608 is fixed
+            systemProperty 'es.insecure_network_trace_enabled', 'true'
+          }
+        }
+      }
     }
+    // test suite for the java rest tests provided by the InternalJavaRestTestPlugin
     javaRestTest {
       dependencies {
-        implementation project()
         implementation project(':test:fixtures:aws-fixture-utils')
         implementation project(':test:fixtures:s3-fixture')
         implementation project(':test:fixtures:testcontainer-utils')
@@ -71,6 +90,7 @@ testing {
         implementation project(':test:fixtures:testcontainer-utils')
       }
     }
+    // test suite for the Yaml rest tests provided by the InternalYamlRestTestPlugin
     yamlRestTest {
       dependencies {
         implementation project()
@@ -79,7 +99,66 @@ testing {
         implementation project(':test:fixtures:testcontainer-utils')
       }
     }
-
+    // Add-hoc test suites require to be passed a type. (usually JvmTestSuite)
+    webIdentityTokenTest(JvmTestSuite) {
+      dependencies {
+        implementation project(':server')
+      }
+      targets {
+        all {
+          testTask.configure {
+            systemProperty 'es.allow_insecure_settings', 'true'
+          }
+        }
+      }
+    }
+    insecureCredentialsTest(JvmTestSuite) {
+      dependencies {
+        implementation project(':server')
+      }
+      targets {
+        all {
+          testTask.configure {
+            systemProperty 'es.allow_insecure_settings', 'true'
+          }
+        }
+      }
+    }
+    s3ThirdPartyTest(JvmTestSuite) {
+      dependencies {
+        implementation project(':test:fixtures:minio-fixture')
+        implementation project(':server')
+      }
+      targets {
+        all {
+          testTask.configure {
+            boolean useFixture = false
+            String s3PermanentAccessKey = System.getenv("amazon_s3_access_key")
+            String s3PermanentSecretKey = System.getenv("amazon_s3_secret_key")
+            String s3PermanentBucket = System.getenv("amazon_s3_bucket")
+            String s3PermanentBasePath = System.getenv("amazon_s3_base_path")
+
+            // If all these variables are missing then we are testing against the MinIO fixture instead, which has the following credentials hard-coded in.
+            if (!s3PermanentAccessKey && !s3PermanentSecretKey && !s3PermanentBucket && !s3PermanentBasePath) {
+              useFixture = true
+              s3PermanentAccessKey = 's3_test_access_key'
+              s3PermanentSecretKey = 's3_test_secret_key'
+              s3PermanentBucket = 'bucket'
+              s3PermanentBasePath = 'base_path'
+            }
+            println "useFixture = $useFixture"
+            systemProperty("tests.use.fixture", Boolean.toString(useFixture))
+            systemProperty 'test.s3.account', s3PermanentAccessKey
+            systemProperty 'test.s3.key', s3PermanentSecretKey
+            systemProperty 'test.s3.bucket', s3PermanentBucket
+            nonInputProperties.systemProperty 'test.s3.base', s3PermanentBasePath + "_third_party_tests_" + buildParams.testSeed
+
+            // test container accesses ~/.testcontainers.properties read
+            systemProperty "tests.security.manager", "false"
+          }
+        }
+      }
+    }
   }
 }
 
@@ -100,12 +179,6 @@ esplugin.bundleSpec.from('config/repository-s3') {
   into 'config'
 }
 
-tasks.named("internalClusterTest").configure {
-  // TODO: remove once https://github.com/elastic/elasticsearch/issues/101608 is fixed
-  systemProperty 'es.insecure_network_trace_enabled', 'true'
-}
-
-
 tasks.named("thirdPartyAudit").configure {
   ignoreMissingClasses(
     // classes are missing