Merge branch 'repository-encrypted-client-side-reformated' into repository-encrypted-feature-flag

Author: albertzaharovits

.ci/bwcVersions

@@ -27,5 +27,7 @@ BWC_VERSION:
   - "7.9.3"
   - "7.10.0"
   - "7.10.1"
+  - "7.10.2"
   - "7.11.0"
+  - "7.12.0"
   - "8.0.0"

.editorconfig

@@ -13,9 +13,11 @@ indent_size = 2
 
 [*.groovy]
 indent_size = 4
+max_line_length = 140
 
 [*.java]
 indent_size = 4
+max_line_length = 140
 
 [*.json]
 indent_size = 2

.gitignore

@@ -56,3 +56,6 @@ testfixtures_shared/
 
 # These are generated from .ci/jobs.t
 .ci/jobs/
+
+# Generated
+checkstyle_ide.xml

CONTRIBUTING.md

@@ -164,6 +164,45 @@ You can import the Elasticsearch project into IntelliJ IDEA via:
  - In the subsequent dialog navigate to the root `build.gradle` file
  - In the subsequent dialog select **Open as Project**
 
+#### Checkstyle
+
+If you have the [Checkstyle] plugin installed, you can configure IntelliJ to
+check the Elasticsearch code. However, the Checkstyle configuration file does
+not work by default with the IntelliJ plugin, so instead an IDE-specific config
+file is generated automatically after IntelliJ finishes syncing. You can
+manually generate the file with `./gradlew configureIdeCheckstyle` in case
+it is removed due to a `./gradlew clean` or other action.
+
+   1. Open **Preferences > Tools > Checkstyle**
+   2. Change the "Scan Scope" to "Only Java sources (including tests)"
+   3. Check the "+" under "Configuration file"
+   4. Set "Description" to "Elasticsearch" (or whatever you want)
+   5. Select "Use a local Checkstyle file"
+   6. For the "File", enter `checkstyle_ide.xml`
+   7. Tick "Store relative to project location"
+   8. Click "Next", then "Finish".
+   9. Click the box next to the new configuration to make it "Active". Without doing this,
+      you'll have to explicitly choose the "Elasticsearch" configuration in the Checkstyle
+      tool window and run the check manually. You can still do this with an active config.
+   10. Click "OK" to apply the new preferences
+
+#### Formatting
+
+We are in the process of migrating towards automatic formatting Java file
+using [spotless], backed by the Eclipse formatter. If you have the [Eclipse
+Code Formatter] installed, you can apply formatting directly in IntelliJ.
+
+   1. Open **Preferences > Other Settings > Eclipse Code Formatter**
+   2. Click "Use the Eclipse Code Formatter"
+   3. Under "Eclipse formatter config", select "Eclipse workspace/project
+      folder or config file"
+   4. Click "Browse", and navigate to the file `buildSrc/formatterConfig.xml`
+   5. Click "OK"
+
+Note that only some sub-projects in the Elasticsearch project are currently
+fully-formatted. You can see a list of project that **are not**
+automatically formatted in [gradle/formatting.gradle](gradle/formatting.gradle).
+
 ### Importing the project into Eclipse
 
 Elasticsearch builds using Gradle and Java 14. When importing into Eclipse you
@@ -699,3 +738,6 @@ non-documentation contribution. This is mentioned above, but it is worth
 repeating in this section because it has come up in this context.
 
 [intellij]: https://blog.jetbrains.com/idea/2017/07/intellij-idea-2017-2-is-here-smart-sleek-and-snappy/
+[Checkstyle]: https://plugins.jetbrains.com/plugin/1065-checkstyle-idea
+[spotless]: https://github.com/diffplug/spotless
+[Eclipse Code Formatter]: https://plugins.jetbrains.com/plugin/6546-eclipse-code-formatter

TESTING.asciidoc

@@ -248,6 +248,13 @@ Pass arbitrary jvm arguments.
 ./gradlew test -Dtests.jvm.argline="-Djava.security.debug=access,failure"
 ------------------------------
 
+Pass build arguments.
+
+------------------------------
+# Run tests against a release build. License key must be provided, but usually can be anything.
+./gradlew test -Dbuild.snapshot=false -Dlicense.key="x-pack/license-tools/src/test/resources/public.key"
+------------------------------
+
 == Running verification tasks
 
 To run all verification tasks, including static checks, unit tests, and integration tests:

build.gradle

@@ -287,23 +287,17 @@ gradle.projectsEvaluated {
       // :test:framework:test cannot run before and after :server:test
       return
     }
-    tasks.matching {it.name.equals('integTest')}.configureEach {integTestTask ->
+    tasks.matching { it.name.equals('integTest')}.configureEach {integTestTask ->
       integTestTask.mustRunAfter tasks.matching { it.name.equals("test") }
     }
 
     configurations.matching { it.canBeResolved }.all { Configuration configuration ->
       dependencies.matching { it instanceof ProjectDependency }.all { ProjectDependency dep ->
         Project upstreamProject = dep.dependencyProject
-        if (upstreamProject != null) {
-          if (project.path == upstreamProject.path) {
-            // TODO: distribution integ tests depend on themselves (!), fix that
-            return
-          }
+        if (project.path != upstreamProject?.path) {
           for (String taskName : ['test', 'integTest']) {
-            Task task = project.tasks.findByName(taskName)
-            Task upstreamTask = upstreamProject.tasks.findByName(taskName)
-            if (task != null && upstreamTask != null) {
-              task.shouldRunAfter(upstreamTask)
+            project.tasks.matching { it.name == taskName }.configureEach {task ->
+              task.shouldRunAfter(upstreamProject.tasks.matching { upStreamTask -> upStreamTask.name == taskName })
             }
           }
         }
@@ -487,7 +481,7 @@ allprojects {
 subprojects {
   project.ext.disableTasks = { String... tasknames ->
     for (String taskname : tasknames) {
-      project.tasks.named(taskname).configure { onlyIf { false } }
+      project.tasks.named(taskname).configure { enabled = false }
     }
   }
 }

buildSrc/build.gradle

@@ -103,6 +103,8 @@ dependencies {
   api 'com.avast.gradle:gradle-docker-compose-plugin:0.13.4'
   api 'org.apache.maven:maven-model:3.6.2'
   api 'com.networknt:json-schema-validator:1.0.36'
+  api 'org.ow2.asm:asm:9.0'
+  api 'org.ow2.asm:asm-tree:9.0'
   api "org.apache.httpcomponents:httpclient:${props.getProperty('httpclient')}"
   api "org.apache.httpcomponents:httpcore:${props.getProperty('httpcore')}"
   compileOnly "com.puppycrawl.tools:checkstyle:${props.getProperty('checkstyle')}"

buildSrc/reaper/build.gradle

@@ -1,4 +1,4 @@
-jar {
+tasks.named("jar").configure {
   archiveFileName = "${project.name}.jar"
   manifest {
     attributes 'Main-Class': 'org.elasticsearch.gradle.reaper.Reaper'

buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGitAwareGradleFuncTest.groovy

@@ -41,7 +41,7 @@ abstract class AbstractGitAwareGradleFuncTest extends AbstractGradleFuncTest {
     File setupGitRemote() {
         URL fakeRemote = getClass().getResource("fake_git/remote")
         File workingRemoteGit = new File(remoteRepoDirs.root, 'remote')
-        FileUtils.copyDirectory(new File(fakeRemote.file), workingRemoteGit)
+        FileUtils.copyDirectory(new File(fakeRemote.toURI()), workingRemoteGit)
         fakeRemote.file + "/.git"
         gradleRunner(workingRemoteGit, "wrapper").build()
 
@@ -50,12 +50,10 @@ abstract class AbstractGitAwareGradleFuncTest extends AbstractGradleFuncTest {
         execute('git config user.name "Build tool"', workingRemoteGit)
         execute("git add .", workingRemoteGit)
         execute('git commit -m"Initial"', workingRemoteGit)
-        execute("git checkout -b origin/8.0", workingRemoteGit)
         return workingRemoteGit;
     }
 
     GradleRunner gradleRunner(String... arguments) {
         gradleRunner(new File(testProjectDir.root, "cloned"), arguments)
     }
-
 }

buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy

@@ -90,7 +90,7 @@ abstract class AbstractGradleFuncTest extends Specification {
         return jarFile;
     }
 
-    File internalBuild(File buildScript = buildFile) {
+    File internalBuild(File buildScript = buildFile, String major = "7.9.1", String minor = "7.10.0", String bugfix = "7.11.0") {
         buildScript << """plugins {
           id 'elasticsearch.global-build-info'
         }
@@ -102,11 +102,13 @@ abstract class AbstractGradleFuncTest extends Specification {
         import org.elasticsearch.gradle.BwcVersions
         import org.elasticsearch.gradle.Version
 
-        Version currentVersion = Version.fromString("9.0.0")
-        BwcVersions versions = new BwcVersions(new TreeSet<>(
-        Arrays.asList(Version.fromString("8.0.0"), Version.fromString("8.0.1"), Version.fromString("8.1.0"), currentVersion)),
-            currentVersion)
-
+        Version currentVersion = Version.fromString("8.0.0")
+         def versionList = []
+               versionList.addAll(
+            Arrays.asList(Version.fromString("$major"), Version.fromString("$minor"), Version.fromString("$bugfix"), currentVersion)
+        )
+        
+        BwcVersions versions = new BwcVersions(new TreeSet<>(versionList), currentVersion)
         BuildParams.init { it.setBwcVersions(versions) }
         """
     }