Merge branch 'master' into authentication-under-domains

Author: albertzaharovits

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,70 @@
+name: Bug
+description: "Report a confirmed bug. For unconfirmed bugs please visit https://discuss.elastic.co/c/elasticsearch"
+labels: [">bug", "needs:triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Github is reserved for bug reports and feature requests; it is
+        not the place for general questions. If you have a question or
+        an unconfirmed bug, please visit the [forums](https://discuss.elastic.co/c/elasticsearch).
+        Please also check your OS is [supported](https://www.elastic.co/support/matrix#show_os).
+        If it is not, the issue is likely to be closed.
+
+        For security vulnerabilities please only send reports to security@elastic.co.
+        See https://www.elastic.co/community/security for more information.
+
+        Please fill in the following details to help us reproduce the bug:
+  - type: input
+    id: es_version
+    attributes:
+      label: Elasticsearch Version
+      description: The version of Elasticsearch you are running, found with `bin/elasticsearch --version`
+    validations:
+      required: true
+  - type: input
+    id: plugins
+    attributes:
+      label: Installed Plugins
+      description: Comma separated list of plugins that you have installed
+    validations:
+      required: false
+  - type: input
+    id: java_version
+    attributes:
+      label: Java Version
+      description: The version of Java Elasticsearch is running with, found with `java -version`
+      value: _bundled_
+    validations:
+      required: true
+  - type: input
+    id: os_version
+    attributes:
+      label: OS Version    
+      description: The version of your operating system, found with `uname -a` of on unix-like system
+    validations:
+      required: true
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem Description
+      description: A description of the problem including expected versus actual behavior
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to Reproduce
+      description: |
+        A minimal but complete recreation of the problem including (e.g.) index
+        creation, mappings, settings, query etc.  The easier you make for us to
+        reproduce it, the more likely that somebody will take the time to look at it.
+    validations:
+      required: true
+  - type: textarea
+    id: logs 
+    attributes:
+      label: Logs (if relevant)
+      description: Any log relevant log messages or snippets
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,19 @@
+name: Feature Request
+description: Request a new feature we haven't thought of
+labels: [">enhancement", "needs:triage"]
+body:
+  - type: markdown
+    attributes:
+      value: | 
+        Please first search existing issues for the feature you are requesting;
+        it may already exist, even as a closed issue.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Please give us as much context as possible about the feature. For example,
+        you could include a story about a time when you wanted to use the feature,
+        and also tell us what you had to do instead. The last part is helpful
+        because it gives us an idea of how much harder your life is without the
+        feature.

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,52 @@
+name: Test Failure
+description: A test failure in CI
+labels: [">test-failure"]
+body:
+  - type: markdown
+    attributes:
+      value: Please fill out the following information, and ensure you have attempted to reproduce locally
+  - type: input
+    id: link
+    attributes:
+      label: CI Link
+      description: A link to a Gradle buildscan (preferred) or Jenkins job with the failure
+    validations:
+      required: true
+  - type: input
+    id: repro_line
+    attributes:
+      label: Repro line
+      description: The reproduce line from the build output
+    validations:
+      required: true
+  - type: dropdown
+    id: reproducible
+    attributes:
+      label: Does it reproduce?
+      options:
+        - "Yes"
+        - "No"
+        - "Didn't try"
+    validations:
+      required: true
+  - type: input
+    id: branches
+    attributes:
+      label: Applicable branches
+      description: Branch names this failure has occurred on 
+    validations:
+      required: true
+  - type: input
+    id: history
+    attributes:
+      label: Failure history
+      description: Link to build stats and possible indication of when this started failing and how often
+    validations:
+      required: false
+  - type: textarea
+    id: excerpt
+    attributes:
+      label: Failure excerpt
+      description: The error or exception that occurs
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -556,7 +556,7 @@ version 5.3.2 run:
 ./gradlew v5.3.2#bwcTest
 -------------------------------------------------
 
-Use -Dtest.class and -Dtests.method to run a specific bwcTest test.
+Use -Dtests.class and -Dtests.method to run a specific bwcTest test.
 For example to run a specific tests from the x-pack rolling upgrade from 7.7.0:
 -------------------------------------------------
 ./gradlew :x-pack:qa:rolling-upgrade:v7.7.0#bwcTest \

.github/ISSUE_TEMPLATE/test-failure.md

@@ -28,9 +28,9 @@
 import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.fielddata.IndexFieldDataCache;
 import org.elasticsearch.index.mapper.MappedFieldType;
+import org.elasticsearch.index.mapper.NestedLookup;
 import org.elasticsearch.index.mapper.NumberFieldMapper;
 import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType;
-import org.elasticsearch.index.mapper.ObjectMapper;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.support.NestedScope;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
@@ -277,7 +277,7 @@ public Optional<SortAndFormats> buildSort(List<SortBuilder<?>> sortBuilders) thr
         }
 
         @Override
-        public ObjectMapper getObjectMapper(String path) {
+        public NestedLookup nestedLookup() {
             throw new UnsupportedOperationException();
         }
 

.github/ISSUE_TEMPLATE/test-failure.yml

@@ -202,14 +202,9 @@ configurations {
   integTestRuntimeOnly.extendsFrom(testRuntimeOnly)
 }
 dependencies {
-  constraints {
-    api("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.getProperty('jackson')}") {
-      version {
-        strictly "${versions.getProperty('jackson')}"
-      }
-      because 'We want to use the exact same jackson version we use in production'
-    }
-  }
+  components.all(JacksonAlignmentRule)
+  // Forcefully downgrade the jackson platform as used in production
+  api enforcedPlatform("com.fasterxml.jackson:jackson-bom:${versions.getProperty('jackson')}")
   api localGroovy()
   api gradleApi()
 
@@ -230,7 +225,8 @@ dependencies {
   api 'de.thetaphi:forbiddenapis:3.2'
   api 'com.avast.gradle:gradle-docker-compose-plugin:0.14.13'
   api 'org.apache.maven:maven-model:3.6.2'
-  api 'com.networknt:json-schema-validator:1.0.65'
+  // needs to match the jackson minor version in use
+  api 'com.networknt:json-schema-validator:1.0.49'
   api "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.getProperty('jackson')}"
   api 'org.ow2.asm:asm:9.2'
   api 'org.ow2.asm:asm-tree:9.2'
@@ -298,3 +294,14 @@ tasks.register("bootstrapPerformanceTests", Copy) {
   def root = file('..')
   filter(ReplaceTokens, tokens: [testGitCommit:GitInfo.gitInfo(root).revision])
 }
+
+abstract class JacksonAlignmentRule implements ComponentMetadataRule {
+  void execute(ComponentMetadataContext ctx) {
+    ctx.details.with {d ->
+      if (d.id.group.startsWith("com.fasterxml.jackson")) {
+        // declare that Jackson modules all belong to the Jackson virtual platform
+        belongsTo("com.fasterxml.jackson:jackson-bom:${d.id.version}")
+      }
+    }
+  }
+}

TESTING.asciidoc

@@ -47,7 +47,6 @@
  */
 public class ValidateJsonNoKeywordsTask extends DefaultTask {
 
-    private final ObjectMapper mapper = new ObjectMapper().configure(JsonParser.Feature.ALLOW_COMMENTS, true);
     private File jsonKeywords;
     private File report;
     private FileCollection inputFiles;
@@ -82,11 +81,12 @@ public File getReport() {
 
     @TaskAction
     public void validate(InputChanges inputChanges) {
+        final ObjectMapper mapper = new ObjectMapper().configure(JsonParser.Feature.ALLOW_COMMENTS, true);
         final Map<File, Set<String>> errors = new LinkedHashMap<>();
 
         getLogger().debug("Loading keywords from {}", jsonKeywords.getName());
 
-        final Map<String, Set<String>> languagesByKeyword = loadKeywords();
+        final Map<String, Set<String>> languagesByKeyword = loadKeywords(mapper);
 
         // incrementally evaluate input files
         StreamSupport.stream(inputChanges.getFileChanges(getInputFiles()).spliterator(), false)
@@ -173,7 +173,7 @@ public void validate(InputChanges inputChanges) {
      *
      * @return a mapping from keyword to languages.
      */
-    private Map<String, Set<String>> loadKeywords() {
+    private Map<String, Set<String>> loadKeywords(ObjectMapper mapper) {
         Map<String, Set<String>> languagesByKeyword = new HashMap<>();
 
         try {