ES 9.0.2 & 8.17.7 support (#1119)

Author: coutoPL

ci/supported-es-versions/es8x.txt

@@ -1,6 +1,7 @@
 8.18.2
 8.18.1
 8.18.0
+8.17.7
 8.17.6
 8.17.5
 8.17.4

ci/supported-es-versions/es9x.txt

@@ -1,2 +1,3 @@
+9.0.2
 9.0.1
 9.0.0

es816x/gradle.properties

@@ -1 +1 @@
-latestSupportedEsVersion=8.17.6
+latestSupportedEsVersion=8.17.7

es90x/gradle.properties

@@ -1 +1 @@
-latestSupportedEsVersion=9.0.1
+latestSupportedEsVersion=9.0.2

ror-tools-core/src/main/scala/tech/beshu/ror/tools/core/patches/Es818xPatch.scala

@@ -20,7 +20,6 @@ import just.semver.SemVer
 import tech.beshu.ror.tools.core.patches.base.TransportNetty4AwareEsPatch
 import tech.beshu.ror.tools.core.patches.internal.RorPluginDirectory
 import tech.beshu.ror.tools.core.patches.internal.filePatchers.*
-import tech.beshu.ror.tools.core.patches.internal.modifiers.NoOpFileModifier
 import tech.beshu.ror.tools.core.patches.internal.modifiers.bytecodeJars.*
 import tech.beshu.ror.tools.core.utils.EsUtil.es8182
 
@@ -33,10 +32,9 @@ private[patches] class Es818xPatch(rorPluginDirectory: RorPluginDirectory, esVer
       new RepositoriesServiceAvailableForClusterServiceForAnyTypeOfNode(esVersion)
     ),
     new EntitlementJarPatchCreator(
-      new ModifyEntitlementInitializationClass(esVersion),
       esVersion match {
         case v if v >= es8182 => new ModifyFilesEntitlementsValidationClass(esVersion)
-        case _ => NoOpFileModifier
+        case _ => new ModifyEntitlementInitializationClass(esVersion)
       },
       ModifyEntitlementRuntimePolicyParserClass,
     ),

ror-tools-core/src/main/scala/tech/beshu/ror/tools/core/patches/Es90xPatch.scala

@@ -21,6 +21,7 @@ import tech.beshu.ror.tools.core.patches.base.TransportNetty4AwareEsPatch
 import tech.beshu.ror.tools.core.patches.internal.RorPluginDirectory
 import tech.beshu.ror.tools.core.patches.internal.filePatchers.*
 import tech.beshu.ror.tools.core.patches.internal.modifiers.bytecodeJars.*
+import tech.beshu.ror.tools.core.utils.EsUtil.es902
 
 import scala.language.postfixOps
 
@@ -31,7 +32,10 @@ private[patches] class Es90xPatch(rorPluginDirectory: RorPluginDirectory, esVers
       new RepositoriesServiceAvailableForClusterServiceForAnyTypeOfNode(esVersion)
     ),
     new EntitlementJarPatchCreator(
-      new ModifyEntitlementInitializationClass(esVersion),
+      esVersion match {
+        case v if v >= es902 => new ModifyFilesEntitlementsValidationClass(esVersion)
+        case _ => new ModifyEntitlementInitializationClass(esVersion)
+      },
       ModifyEntitlementRuntimePolicyParserClass,
     ),
     new XPackCoreJarPatchCreator(

ror-tools-core/src/main/scala/tech/beshu/ror/tools/core/patches/internal/modifiers/bytecodeJars/ModifyEntitlementInitializationClass.scala

@@ -58,15 +58,15 @@ private[patches] class ModifyEntitlementInitializationClass(esVersion: SemVer)
       name match {
         case "validateReadFilesEntitlements" =>
           esVersion match
-            case v if v >= es901 =>
+            case v if v == es901 =>
               new DontValidateForbiddenPathsInCaseOfRorPlugin(
                 super.visitMethod(access, name, descriptor, signature, exceptions)
               )
             case v if v == es8181 =>
               new DontValidateForbiddenPathsInCaseOfRorPlugin(
                 super.visitMethod(access, name, descriptor, signature, exceptions)
               )
-            case v =>
+            case _ =>
               super.visitMethod(access, name, descriptor, signature, exceptions)
         case _ =>
           super.visitMethod(access, name, descriptor, signature, exceptions)

ror-tools-core/src/main/scala/tech/beshu/ror/tools/core/utils/EsUtil.scala

@@ -23,6 +23,7 @@ object EsUtil {
 
   private val transportNetty4JarNameRegex = """^transport-netty4-(\d+\.\d+\.\d+(-[a-zA-Z0-9]+)?)\.jar$""".r
 
+  val es902: SemVer = SemVer.unsafeParse("9.0.2")
   val es901: SemVer = SemVer.unsafeParse("9.0.1")
   val es900: SemVer = SemVer.unsafeParse("9.0.0")
   val es8182: SemVer = SemVer.unsafeParse("8.18.2")