[RORDEV-1326] ES 8.16.0 support (#1055)

azure-pipelines.yml

@@ -108,6 +108,8 @@ stages:
         strategy:
           maxParallel: 99
           matrix:
+            IT_es816x:
+              ROR_TASK: integration_es816x
             IT_es815x:
               ROR_TASK: integration_es815x
             IT_es814x:
@@ -166,8 +168,8 @@ stages:
         strategy:
           maxParallel: 99
           matrix:
-            IT_es815x:
-              ROR_TASK: integration_es815x
+            IT_es816x:
+              ROR_TASK: integration_es816x
             IT_es810x:
               ROR_TASK: integration_es810x
             IT_es80x:

ci/run-pipeline.sh

@@ -50,6 +50,10 @@ run_integration_tests() {
   ./gradlew integration-tests:test "-PesModule=$ES_MODULE" || (find . | grep hs_err | xargs cat && exit 1)
 }
 
+if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es816x" ]]; then
+  run_integration_tests "es816x"
+fi
+
 if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es815x" ]]; then
   run_integration_tests "es815x"
 fi

ci/supported-es-versions/es8x.txt

@@ -1,3 +1,4 @@
+8.16.0
 8.15.4
 8.15.3
 8.15.2

docker-envs/base-ror-docker/kbn/install-ror-kbn-using-api.sh

@@ -24,5 +24,5 @@ fi
 echo "Installing KBN ROR $ROR_VERSION..."
 /usr/share/kibana/bin/kibana-plugin install "https://api.beshu.tech/download/kbn?esVersion=$KBN_VERSION&pluginVersion=$ROR_VERSION&edition=$ROR_KBN_EDITION&email=ror-sandbox%40readonlyrest.com"
 echo "Patching KBN ROR $ROR_VERSION..."
-/usr/share/kibana/node/bin/node plugins/readonlyrestkbn/ror-tools.js patch
+/usr/share/kibana/node/bin/node plugins/readonlyrestkbn/ror-tools.js patch --I_UNDERSTAND_AND_ACCEPT_KBN_PATCHING=yes
 echo "DONE!"

docker-envs/base-ror-docker/kbn/install-ror-kbn-using-file.sh

@@ -3,5 +3,5 @@
 echo "Installing KBN ROR from file..."
 /usr/share/kibana/bin/kibana-plugin install file:///tmp/ror.zip
 echo "Patching KBN ROR..."
-/usr/share/kibana/node/bin/node plugins/readonlyrestkbn/ror-tools.js patch
+/usr/share/kibana/node/bin/node plugins/readonlyrestkbn/ror-tools.js patch --I_UNDERSTAND_AND_ACCEPT_KBN_PATCHING=yes
 echo "DONE!"

docker-envs/eck/eck-ror-bootstrap.sh

@@ -20,7 +20,7 @@ show_help() {
 
 export ES_VERSION=""
 export KBN_VERSION=""
-export ECK_VERSION="2.13.0"
+export ECK_VERSION="2.14.0"
 
 while [[ $# -gt 0 ]]; do
   case $1 in

docker-envs/eck/kind-cluster/ror/kbn.yml

@@ -23,5 +23,7 @@ spec:
           env:
             - name: ROR_ACTIVATION_KEY
               value: "<YOUR_ACTIVATION_KEY/>"
-            - name: I_UNDERSTAND_IMPLICATION_OF_KBN_PATCHING
+            - name: I_UNDERSTAND_AND_ACCEPT_KBN_PATCHING # ROR 1.61.0 and newer
+              value: "yes"
+            - name: I_UNDERSTAND_IMPLICATION_OF_KBN_PATCHING # pre ROR 1.61.0
               value: "yes"

es710x/src/main/scala/tech/beshu/ror/es/actions/rradmin/rest/RestRRAdminAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAdminAction()
+class RestRRAdminAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es710x/src/main/scala/tech/beshu/ror/es/actions/rrauditevent/rest/RestRRAuditEventAction.scala

@@ -35,7 +35,7 @@ import scala.jdk.CollectionConverters.*
 import scala.util.Try
 
 @Inject
-class RestRRAuditEventAction()
+class RestRRAuditEventAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es710x/src/main/scala/tech/beshu/ror/es/actions/rrauthmock/rest/RestRRAuthMockAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.utils.RestToXContentWithStatusListener
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAuthMockAction()
+class RestRRAuthMockAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es710x/src/main/scala/tech/beshu/ror/es/actions/rrmetadata/rest/RestRRUserMetadataAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.actions.rrmetadata.{RRUserMetadataActionType, RRUserMet
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRUserMetadataAction()
+class RestRRUserMetadataAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es710x/src/main/scala/tech/beshu/ror/es/actions/rrtestconfig/rest/RestRRTestConfigAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRTestConfigAction()
+class RestRRTestConfigAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es711x/src/main/scala/tech/beshu/ror/es/actions/rradmin/rest/RestRRAdminAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAdminAction()
+class RestRRAdminAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es711x/src/main/scala/tech/beshu/ror/es/actions/rrauditevent/rest/RestRRAuditEventAction.scala

@@ -35,7 +35,7 @@ import scala.jdk.CollectionConverters.*
 import scala.util.Try
 
 @Inject
-class RestRRAuditEventAction()
+class RestRRAuditEventAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es711x/src/main/scala/tech/beshu/ror/es/actions/rrauthmock/rest/RestRRAuthMockAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.utils.RestToXContentWithStatusListener
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAuthMockAction()
+class RestRRAuthMockAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es711x/src/main/scala/tech/beshu/ror/es/actions/rrmetadata/rest/RestRRUserMetadataAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.actions.rrmetadata.{RRUserMetadataActionType, RRUserMet
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRUserMetadataAction()
+class RestRRUserMetadataAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es711x/src/main/scala/tech/beshu/ror/es/actions/rrtestconfig/rest/RestRRTestConfigAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRTestConfigAction()
+class RestRRTestConfigAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es714x/src/main/scala/tech/beshu/ror/es/actions/rradmin/rest/RestRRAdminAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAdminAction()
+class RestRRAdminAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es714x/src/main/scala/tech/beshu/ror/es/actions/rrauditevent/rest/RestRRAuditEventAction.scala

@@ -35,7 +35,7 @@ import scala.jdk.CollectionConverters.*
 import scala.util.Try
 
 @Inject
-class RestRRAuditEventAction()
+class RestRRAuditEventAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es714x/src/main/scala/tech/beshu/ror/es/actions/rrauthmock/rest/RestRRAuthMockAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.utils.RestToXContentWithStatusListener
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAuthMockAction()
+class RestRRAuthMockAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es714x/src/main/scala/tech/beshu/ror/es/actions/rrmetadata/rest/RestRRUserMetadataAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.actions.rrmetadata.{RRUserMetadataActionType, RRUserMet
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRUserMetadataAction()
+class RestRRUserMetadataAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es714x/src/main/scala/tech/beshu/ror/es/actions/rrtestconfig/rest/RestRRTestConfigAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRTestConfigAction()
+class RestRRTestConfigAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es716x/src/main/scala/tech/beshu/ror/es/actions/rradmin/rest/RestRRAdminAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAdminAction()
+class RestRRAdminAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es716x/src/main/scala/tech/beshu/ror/es/actions/rrauditevent/rest/RestRRAuditEventAction.scala

@@ -35,7 +35,7 @@ import scala.jdk.CollectionConverters.*
 import scala.util.Try
 
 @Inject
-class RestRRAuditEventAction()
+class RestRRAuditEventAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es716x/src/main/scala/tech/beshu/ror/es/actions/rrauthmock/rest/RestRRAuthMockAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.utils.RestToXContentWithStatusListener
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAuthMockAction()
+class RestRRAuthMockAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es716x/src/main/scala/tech/beshu/ror/es/actions/rrmetadata/rest/RestRRUserMetadataAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.actions.rrmetadata.{RRUserMetadataActionType, RRUserMet
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRUserMetadataAction()
+class RestRRUserMetadataAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es716x/src/main/scala/tech/beshu/ror/es/actions/rrtestconfig/rest/RestRRTestConfigAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRTestConfigAction()
+class RestRRTestConfigAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es717x/src/main/scala/tech/beshu/ror/es/actions/rradmin/rest/RestRRAdminAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAdminAction()
+class RestRRAdminAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es717x/src/main/scala/tech/beshu/ror/es/actions/rrauditevent/rest/RestRRAuditEventAction.scala

@@ -35,7 +35,7 @@ import scala.jdk.CollectionConverters.*
 import scala.util.Try
 
 @Inject
-class RestRRAuditEventAction()
+class RestRRAuditEventAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es717x/src/main/scala/tech/beshu/ror/es/actions/rrauthmock/rest/RestRRAuthMockAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.utils.RestToXContentWithStatusListener
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAuthMockAction()
+class RestRRAuthMockAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es717x/src/main/scala/tech/beshu/ror/es/actions/rrmetadata/rest/RestRRUserMetadataAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.actions.rrmetadata.{RRUserMetadataActionType, RRUserMet
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRUserMetadataAction()
+class RestRRUserMetadataAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es717x/src/main/scala/tech/beshu/ror/es/actions/rrtestconfig/rest/RestRRTestConfigAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRTestConfigAction()
+class RestRRTestConfigAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es77x/src/main/scala/tech/beshu/ror/es/actions/rradmin/rest/RestRRAdminAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAdminAction()
+class RestRRAdminAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es77x/src/main/scala/tech/beshu/ror/es/actions/rrauditevent/rest/RestRRAuditEventAction.scala

@@ -35,7 +35,7 @@ import scala.jdk.CollectionConverters.*
 import scala.util.Try
 
 @Inject
-class RestRRAuditEventAction()
+class RestRRAuditEventAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es77x/src/main/scala/tech/beshu/ror/es/actions/rrauthmock/rest/RestRRAuthMockAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.utils.RestToXContentWithStatusListener
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAuthMockAction()
+class RestRRAuthMockAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es77x/src/main/scala/tech/beshu/ror/es/actions/rrmetadata/rest/RestRRUserMetadataAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.actions.rrmetadata.{RRUserMetadataActionType, RRUserMet
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRUserMetadataAction()
+class RestRRUserMetadataAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es77x/src/main/scala/tech/beshu/ror/es/actions/rrtestconfig/rest/RestRRTestConfigAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRTestConfigAction()
+class RestRRTestConfigAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es78x/src/main/scala/tech/beshu/ror/es/actions/rradmin/rest/RestRRAdminAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAdminAction()
+class RestRRAdminAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es78x/src/main/scala/tech/beshu/ror/es/actions/rrauditevent/rest/RestRRAuditEventAction.scala

@@ -35,7 +35,7 @@ import scala.jdk.CollectionConverters.*
 import scala.util.Try
 
 @Inject
-class RestRRAuditEventAction()
+class RestRRAuditEventAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es78x/src/main/scala/tech/beshu/ror/es/actions/rrauthmock/rest/RestRRAuthMockAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.utils.RestToXContentWithStatusListener
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAuthMockAction()
+class RestRRAuthMockAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es78x/src/main/scala/tech/beshu/ror/es/actions/rrmetadata/rest/RestRRUserMetadataAction.scala

@@ -31,7 +31,7 @@ import tech.beshu.ror.es.actions.rrmetadata.{RRUserMetadataActionType, RRUserMet
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRUserMetadataAction()
+class RestRRUserMetadataAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es78x/src/main/scala/tech/beshu/ror/es/actions/rrtestconfig/rest/RestRRTestConfigAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRTestConfigAction()
+class RestRRTestConfigAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(

es79x/src/main/scala/tech/beshu/ror/es/actions/rradmin/rest/RestRRAdminAction.scala

@@ -30,7 +30,7 @@ import java.util
 import scala.jdk.CollectionConverters.*
 
 @Inject
-class RestRRAdminAction()
+class RestRRAdminAction
   extends BaseRestHandler with RestHandler {
 
   override def routes(): util.List[Route] = List(