[RORDEV-1501] docker images issue with accepting consent (#1138)

Author: coutoPL

gradle.properties

@@ -1,5 +1,5 @@
 publishedPluginVersion=1.65.0
-pluginVersion=1.65.0
+pluginVersion=1.65.1
 pluginName=readonlyrest
 
 org.gradle.jvmargs=-Xmx6144m

ror-tools/src/main/scala/tech/beshu/ror/tools/RorToolsApp.scala

@@ -67,13 +67,14 @@ trait RorTools {
     }
   }
 
-  private def readArgsFromEnvVariables()(implicit rawEnvVariablesProvider: RawEnvVariablesProvider): Array[String] = {
+  private def readArgsFromEnvVariables()
+                                      (implicit rawEnvVariablesProvider: RawEnvVariablesProvider): Array[String] = {
     val allowedEnvVariableNames = List(
       consentFlagName,
     )
     rawEnvVariablesProvider.getSysEnv.toList
       .filter(env => allowedEnvVariableNames.contains(env._1.toLowerCase))
-      .flatMap { case (name, value) => Array(s"--$name", value) }
+      .flatMap { case (name, value) => Array(s"--${name.toLowerCase}", value) }
       .toArray
   }
 
@@ -192,6 +193,7 @@ trait RorTools {
     patchCommand,
     note(""),
     opt[String](consentFlagName)
+      .unbounded()
       .valueName("<yes/no>")
       .validate {
         case "yes" => success
@@ -255,7 +257,6 @@ trait RorTools {
 
   private def effectSetup(implicit inOut: InOut): OEffectSetup = new DefaultOEffectSetup {
     override def displayToOut(msg: String): Unit = inOut.println(msg)
-
     override def displayToErr(msg: String): Unit = inOut.printlnErr(msg)
   }
 

ror-tools/src/test/scala/tech/beshu/ror/tools/RorToolsAppSuite.scala

@@ -28,7 +28,7 @@ import tech.beshu.ror.tools.RorTools.Result
 import tech.beshu.ror.tools.core.patches.base.EsPatchMetadataCodec
 import tech.beshu.ror.tools.core.patches.internal.FilePatch.FilePatchMetadata
 import tech.beshu.ror.tools.core.patches.internal.RorPluginDirectory.EsPatchMetadata
-import tech.beshu.ror.tools.core.utils.{OsRawEnvVariablesProvider, RawEnvVariablesProvider, InOut}
+import tech.beshu.ror.tools.core.utils.{InOut, OsRawEnvVariablesProvider, RawEnvVariablesProvider}
 import tech.beshu.ror.tools.utils.{CapturingOutputAndMockingInput, ExampleEsWithRorContainer}
 import tech.beshu.ror.utils.files.FileUtils
 
@@ -165,6 +165,18 @@ class RorToolsAppSuite
           |""".stripMargin
       )
     }
+    "Patching not started when user declines to accept implications of patching (when env variable is set and arg is passed in the same time)" in {
+      val (result, output) = captureResultAndOutput(
+        RorToolsTestApp.run(Array("patch", "--I_UNDERSTAND_AND_ACCEPT_ES_PATCHING", "no"))(_, _),
+        mockedEnvs = Map("I_UNDERSTAND_AND_ACCEPT_ES_PATCHING" -> "no")
+      )
+      result should equal(Result.Failure)
+      output should equal(
+        """You have to confirm, that You understand the implications of ES patching in order to perform it.
+          |You can read about patching in our documentation: https://docs.readonlyrest.com/elasticsearch#id-3.-patch-elasticsearch.
+          |""".stripMargin
+      )
+    }
     "Patching not started when user declines to accept implications of patching (in interactive mode)" in {
       val (result, output) = captureResultAndOutputWithInteraction(
         RorToolsTestApp.run(Array("patch"))(_, _),
@@ -336,7 +348,6 @@ class RorToolsAppSuite
           .stripMargin
       )
     }
-
     "The patch is not detected when metadata file is missing and `verify` command is executed" in {
       val (patchResult, patchOutput) = captureResultAndOutput {
         RorToolsTestApp.run(Array("patch", "--I_UNDERSTAND_AND_ACCEPT_ES_PATCHING", "yes", "--es-path", esLocalPath.toString))(_, _)
@@ -368,7 +379,6 @@ class RorToolsAppSuite
            |""".stripMargin
       )
     }
-
     "The patch is not detected when metadata file is missing and `verify` command is executed (ES 9.x with detailed assertions)" excludeES(allEs6x, allEs7x, allEs8x) in {
       val (patchResult, patchOutput) = captureResultAndOutput {
         RorToolsTestApp.run(Array("patch", "--I_UNDERSTAND_AND_ACCEPT_ES_PATCHING", "yes", "--es-path", esLocalPath.toString))(_, _)