Merge pull request #163 from costin/dev

Author: costin

benchmarks/src/main/resources/org/elasticsearch/benchmark/xcontent/monitor_cluster_stats.json

@@ -298,16 +298,6 @@
           "extended_plugins" : [ ],
           "has_native_controller" : false
         },
-        {
-          "name" : "ingest-attachment",
-          "version" : "7.10.0",
-          "elasticsearch_version" : "7.10.0",
-          "java_version" : "1.8",
-          "description" : "Ingest processor that uses Apache Tika to extract contents",
-          "classname" : "org.elasticsearch.ingest.attachment.IngestAttachmentPlugin",
-          "extended_plugins" : [ ],
-          "has_native_controller" : false
-        },
         {
           "name" : "mapper-murmur3",
           "version" : "7.10.0",

build-tools-internal/build.gradle

@@ -213,6 +213,7 @@ repositories {
 configurations {
   integTestRuntimeOnly.extendsFrom(testRuntimeOnly)
 }
+
 dependencies {
   constraints {
       integTestImplementation('org.ow2.asm:asm:9.3')
@@ -297,7 +298,6 @@ tasks.named('test').configure {
   useJUnitPlatform()
 }
 tasks.register("integTest", Test) {
-  inputs.dir(file("src/testKit")).withPropertyName("testkit dir").withPathSensitivity(PathSensitivity.RELATIVE)
   systemProperty 'test.version_under_test', version
   testClassesDirs = sourceSets.integTest.output.classesDirs
   classpath = sourceSets.integTest.runtimeClasspath

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleInternalPluginFuncTest.groovy

@@ -0,0 +1,31 @@
+/*
+ * 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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.gradle.fixtures
+
+import org.gradle.api.Plugin
+
+abstract class AbstractGradleInternalPluginFuncTest extends AbstractJavaGradleFuncTest {
+
+    abstract <T extends Plugin> Class<T> getPluginClassUnderTest();
+
+    def setup() {
+        buildFile << """
+        import ${getPluginClassUnderTest().getName()}
+        
+        plugins {
+          // bring in build-tools-internal onto the classpath
+          id 'elasticsearch.global-build-info'
+        }
+        // internally used plugins do not have a plugin id as they are
+        // not intended to be used directly from build scripts 
+        plugins.apply(${getPluginClassUnderTest().getSimpleName()})
+        
+        """
+    }
+}

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/LocalRepositoryFixture.groovy

@@ -0,0 +1,59 @@
+/*
+ * 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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.gradle.fixtures
+
+import net.bytebuddy.ByteBuddy
+import net.bytebuddy.dynamic.DynamicType
+import org.junit.rules.ExternalResource
+import org.junit.rules.TemporaryFolder
+
+class LocalRepositoryFixture extends ExternalResource{
+
+    private TemporaryFolder temporaryFolder
+
+    LocalRepositoryFixture(TemporaryFolder temporaryFolder){
+        this.temporaryFolder = temporaryFolder
+    }
+
+    void generateJar(String group, String module, String version, String... clazzNames){
+        def baseGroupFolderPath = group.replace('.', '/')
+        def targetFolder = new File(repoDir, "${baseGroupFolderPath}/$module/$version")
+        targetFolder.mkdirs()
+
+        def jarFile = new File(targetFolder, "${module}-${version}.jar")
+        clazzNames.each {clazzName ->
+            DynamicType.Unloaded<?> dynamicType = new ByteBuddy().subclass(Object.class)
+                    .name(clazzName)
+                    .make()
+            if(jarFile.exists()) {
+                dynamicType.inject(jarFile);
+            }else {
+                dynamicType.toJar(jarFile);
+            }
+        }
+    }
+
+    void configureBuild(File buildFile) {
+        buildFile << """
+        repositories {
+          maven {
+            name = "local-test"
+            url = "${getRepoDir()}"
+            metadataSources {
+              artifact()
+            }
+          }
+        }  
+        """
+    }
+
+    File getRepoDir() {
+        new File(temporaryFolder.root, 'local-repo')
+    }
+}

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/ElasticsearchJavaModulePathPluginFuncTest.groovy

@@ -24,7 +24,7 @@ class ElasticsearchJavaModulePathPluginFuncTest extends AbstractJavaGradleFuncTe
     public static final String ES_VERSION = VersionProperties.getElasticsearch()
 
     def setup() {
-        javaMainClass()
+        clazz("org.acme.JavaMainClass")
         subProject("some-lib") << """
             plugins {
                 id 'java-library'

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/precommit/LicenseHeadersPrecommitPluginFuncTest.groovy

@@ -8,19 +8,24 @@
 
 package org.elasticsearch.gradle.internal.precommit
 
-import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
+import org.elasticsearch.gradle.fixtures.AbstractGradleInternalPluginFuncTest
+import org.elasticsearch.gradle.internal.conventions.precommit.LicenseHeadersPrecommitPlugin
+import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin
 import org.gradle.testkit.runner.TaskOutcome
 
-class LicenseHeadersPrecommitPluginFuncTest extends AbstractGradleFuncTest {
+class LicenseHeadersPrecommitPluginFuncTest extends AbstractGradleInternalPluginFuncTest {
 
-    def "detects invalid files with invalid license header"() {
-        given:
+    Class<? extends PrecommitPlugin> pluginClassUnderTest = LicenseHeadersPrecommitPlugin.class
+
+    def setup() {
+        configurationCacheCompatible = true
         buildFile << """
-        plugins {
-            id 'java'
-            id 'elasticsearch.internal-licenseheaders'
-        }
+        apply plugin:'java'
         """
+    }
+
+    def "detects invalid files with invalid license header"() {
+        given:
         dualLicensedFile()
         unknownSourceFile()
         unapprovedSourceFile()
@@ -39,11 +44,6 @@ class LicenseHeadersPrecommitPluginFuncTest extends AbstractGradleFuncTest {
     def "can filter source files"() {
         given:
         buildFile << """
-        plugins {
-            id 'java'
-            id 'elasticsearch.internal-licenseheaders'
-        }
-
         tasks.named("licenseHeaders").configure {
             excludes << 'org/acme/filtered/**/*'
         }
@@ -61,12 +61,6 @@ class LicenseHeadersPrecommitPluginFuncTest extends AbstractGradleFuncTest {
 
     def "supports sspl by convention"() {
         given:
-        buildFile << """
-        plugins {
-            id 'java'
-            id 'elasticsearch.internal-licenseheaders'
-        }
-        """
         dualLicensedFile()
 
         when:
@@ -79,11 +73,6 @@ class LicenseHeadersPrecommitPluginFuncTest extends AbstractGradleFuncTest {
     def "sspl default additional license can be overridden"() {
         given:
         buildFile << """
-        plugins {
-            id 'java'
-            id 'elasticsearch.internal-licenseheaders'
-        }
-
         tasks.named("licenseHeaders").configure {
             additionalLicense 'ELAST', 'Elastic License 2.0', '2.0; you may not use this file except in compliance with the Elastic License'
         }
@@ -173,4 +162,5 @@ class LicenseHeadersPrecommitPluginFuncTest extends AbstractGradleFuncTest {
         String normalizedPath = normalized(sourceFile.getPath())
         (normalizedPath.substring(normalizedPath.indexOf("src/main/java")) - "src/main/java/" - ("/" + sourceFile.getName())).replaceAll("/", ".")
     }
+
 }