module es63x - tests fixes

sscarduzio · Mar 15, 2024 · a7dbc23 · a7dbc23
1 parent 539d8f1
commit a7dbc23
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/...ration-tests/src/test/scala/tech/beshu/ror/integration/suites/AdminApiAuthMockSuite.scala b/...ration-tests/src/test/scala/tech/beshu/ror/integration/suites/AdminApiAuthMockSuite.scala
@@ -66,7 +66,7 @@ class AdminApiAuthMockSuite
       )
 
     createLocalClusterContainer(
-      esNewerOrEqual63ClusterSettings = esClusterSettingsCreator(
+      esNewerOrEqual65ClusterSettings = esClusterSettingsCreator(
         RorWithXpackSecurity(ReadonlyRestWithEnabledXpackSecurityPlugin.Config.Attributes.default.copy(
           rorConfigReloading = Enabled.Yes(2 seconds),
           rorCustomSettingsIndex = Some(readonlyrestIndexName),

diff --git a/...s/src/test/scala/tech/beshu/ror/integration/suites/AdminApiWithDefaultRorIndexSuite.scala b/...s/src/test/scala/tech/beshu/ror/integration/suites/AdminApiWithDefaultRorIndexSuite.scala
@@ -41,7 +41,7 @@ class AdminApiWithDefaultRorIndexSuite
       )
 
     createLocalClusterContainer(
-      esNewerOrEqual63ClusterSettings = esClusterSettingsCreator(
+      esNewerOrEqual65ClusterSettings = esClusterSettingsCreator(
         RorWithXpackSecurity(ReadonlyRestWithEnabledXpackSecurityPlugin.Config.Attributes.default.copy(
           rorConfigFileName = rorConfigFileName,
           rorConfigReloading = Enabled.Yes(settingsReloadInterval)
@@ -64,7 +64,7 @@ class AdminApiWithDefaultRorIndexSuite
       )
 
     createLocalClusterContainer(
-      esNewerOrEqual63ClusterSettings = esClusterSettingsCreator(
+      esNewerOrEqual65ClusterSettings = esClusterSettingsCreator(
         RorWithXpackSecurity(ReadonlyRestWithEnabledXpackSecurityPlugin.Config.Attributes.default.copy(
           rorConfigFileName = rorConfigFileName
         ))

diff --git a/integration-tests/src/test/scala/tech/beshu/ror/integration/suites/ClusterApiSuite.scala b/integration-tests/src/test/scala/tech/beshu/ror/integration/suites/ClusterApiSuite.scala
@@ -48,7 +48,7 @@ class ClusterApiSuite
     )
 
     createLocalClusterContainer(
-      esNewerOrEqual63ClusterSettings = esClusterSettingsCreator(
+      esNewerOrEqual65ClusterSettings = esClusterSettingsCreator(
         RorWithXpackSecurity(ReadonlyRestWithEnabledXpackSecurityPlugin.Config.Attributes.default.copy(
           rorConfigFileName = rorConfigFileName
         ))

diff --git a/...ration-tests/src/test/scala/tech/beshu/ror/integration/suites/DynamicVariablesSuite.scala b/...ration-tests/src/test/scala/tech/beshu/ror/integration/suites/DynamicVariablesSuite.scala
@@ -51,7 +51,7 @@ class DynamicVariablesSuite
     }
 
     createLocalClusterContainer(
-      esNewerOrEqual63ClusterSettings = esClusterSettingsCreator(
+      esNewerOrEqual65ClusterSettings = esClusterSettingsCreator(
         SecurityType.RorWithXpackSecurity(ReadonlyRestWithEnabledXpackSecurityPlugin.Config.Attributes.default.copy(
           rorConfigFileName = rorConfigFileName
         ))

diff --git a/...s/src/test/scala/tech/beshu/ror/integration/suites/IndexLifecycleManagementApiSuite.scala b/...s/src/test/scala/tech/beshu/ror/integration/suites/IndexLifecycleManagementApiSuite.scala
@@ -58,7 +58,7 @@ class IndexLifecycleManagementApiSuite
       nodeDataInitializer = IndexLifecycleManagementApiSuite.nodeDataInitializer()
     )
     createLocalClusterContainer(
-      esNewerOrEqual63ClusterSettings = esClusterSettingsCreator(
+      esNewerOrEqual65ClusterSettings = esClusterSettingsCreator(
         RorWithXpackSecurity(ReadonlyRestWithEnabledXpackSecurityPlugin.Config.Attributes.default.copy(
           rorConfigFileName = rorConfigFileName
         ))

diff --git a/integration-tests/src/test/scala/tech/beshu/ror/integration/suites/RemoteReindexSuite.scala b/integration-tests/src/test/scala/tech/beshu/ror/integration/suites/RemoteReindexSuite.scala
@@ -64,7 +64,7 @@ class RemoteReindexSuite
       securityType = securityType
     )
     createLocalClusterContainer(
-      esNewerOrEqual63ClusterSettings = clusterSettingsCreator {
+      esNewerOrEqual65ClusterSettings = clusterSettingsCreator {
         SecurityType.RorWithXpackSecurity(
           ReadonlyRestWithEnabledXpackSecurityPlugin.Config.Attributes.default.copy(
             rorConfigFileName = RemoteReindexSuite.this.rorConfigFileName,

diff --git a/integration-tests/src/test/scala/tech/beshu/ror/integration/suites/RorDisabledSuite.scala b/integration-tests/src/test/scala/tech/beshu/ror/integration/suites/RorDisabledSuite.scala
@@ -38,7 +38,7 @@ class RorDisabledSuite
   override lazy val targetEs = container.nodes.head
 
   override lazy val clusterContainer: EsClusterContainer = createLocalClusterContainer(
-    esNewerOrEqual63ClusterSettings = EsClusterSettings.create(
+    esNewerOrEqual65ClusterSettings = EsClusterSettings.create(
       clusterName = "ROR1",
       securityType = RorWithXpackSecurity(ReadonlyRestWithEnabledXpackSecurityPlugin.Config.Attributes.default.copy(
         rorConfigFileName = rorConfigFileName,

diff --git a/tests-utils/src/main/scala/tech/beshu/ror/utils/containers/EsClusterProvider.scala b/tests-utils/src/main/scala/tech/beshu/ror/utils/containers/EsClusterProvider.scala
@@ -26,10 +26,10 @@ import scala.collection.parallel.CollectionConverters._
 
 trait EsClusterProvider extends EsContainerCreator with EsModulePatterns {
 
-  def createLocalClusterContainer(esNewerOrEqual63ClusterSettings: EsClusterSettings,
+  def createLocalClusterContainer(esNewerOrEqual65ClusterSettings: EsClusterSettings,
                                   esOlderThan63ClusterSettings: EsClusterSettings): EsClusterContainer = {
-    if (isCurrentModuleNotExcluded(allEs6xBelowEs63x)) {
-      createLocalClusterContainer(esNewerOrEqual63ClusterSettings)
+    if (isCurrentModuleNotExcluded(allEs6xBelowEs65x)) {
+      createLocalClusterContainer(esNewerOrEqual65ClusterSettings)
     } else {
       createLocalClusterContainer(esOlderThan63ClusterSettings)
     }

diff --git a/.../src/main/scala/tech/beshu/ror/utils/containers/SingletonEsContainerWithRorSecurity.scala b/.../src/main/scala/tech/beshu/ror/utils/containers/SingletonEsContainerWithRorSecurity.scala
@@ -31,7 +31,7 @@ object SingletonEsContainerWithRorSecurity
     with EsModulePatterns {
 
   val singleton: EsClusterContainer = createLocalClusterContainer(
-    esNewerOrEqual63ClusterSettings = EsClusterSettings.create(
+    esNewerOrEqual65ClusterSettings = EsClusterSettings.create(
       clusterName = "ROR_SINGLE",
       securityType = RorWithXpackSecurity(ReadonlyRestWithEnabledXpackSecurityPlugin.Config.Attributes.default)
     ),