Merge branch 'main' into fix/metrics-data

rundeck · Jun 30, 2023 · 3ecf42c · 3ecf42c
2 parents c4a8fb1 + 5df67a9
commit 3ecf42c
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 16 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ buildConfig = "3.0.3"
 owasp = "7.1.0.1"
 jacksonDatabind = "2.15.0"
 picocli = "4.6.3"
-snakeYaml = "1.33"
+snakeYaml = "2.0"
 #used for authz lib integration
 rundeck = "4.2.0-20220509"
 testcontainers = "1.17.2"

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
@@ -8859,3 +8859,50 @@ H2Ir6RZpmqeY4NI6ujL41iUru20RzTNCAQA8jgmCMq9kDxaykpzdSvFHnyijywCZ
 B1jblPtxo2UqRO/qhPfqSkoVcpWmxgiPUFOr
 =w8k7
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub    A9321EDAA5CB3202
+uid    Werner Randelshofer <[email protected]>
+
+sub    D36DB5C489BAAC5B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQGNBGBoC2ABDACyCWLqqAo9NeThE90hBoYomtgLci5I8+7PxSYeQfzUYjXzZcnh
+6d/zHaeC0zxGhT2LNe5i3p2e36xSeFDobjG2Il/nv+4jFCgbn3TZ2hEingPuPsg5
+isodOXHBSY9iHPTKInpiu+J79MWP9GVZ6GeOOgQaNSrNN3uDE1w3rukB2SrXGdfT
+/6YZIOtwWZVzc2m9lalPmOAyI4KLI/s37C8Ozfv3c+Bx11WRVzWVpBTo94fU4DPu
+Yzkx2Wxuc4TT5k6bQJI/GHi36M7xkUauXhkRCNvBz+LFVcFjtsv6S37L6RZib6mz
+jZTW+iyD4h66gqzg3hSRxv4YzHgR/Os26Br2ioZNzH6hJFtNktR4oN/2kydmj5Od
+WYjvdMmd/dMbZheZE3f8sziUKCyvWMIddnHAM81uDTXgWcMgYSa3npOGZhfk41z+
+w9o2f1kXIfdurqlA1n8np07PLw5Rfpjvbs7EZxPTJwcc1enaNyL64fb+YIUtFrcW
+Dt1zUMEDkbcZL1UAEQEAAbQ0V2VybmVyIFJhbmRlbHNob2ZlciA8d2VybmVyLnJh
+bmRlbHNob2ZlckBibHVld2luLmNoPokB1AQTAQgAPgIbAwULCQgHAgYVCgkICwIE
+FgIDAQIeAQIXgBYhBG6tdSs+Kzjo4iNte6kyHtqlyzICBQJgaA0gBQkSzATAAAoJ
+EKkyHtqlyzICv4wL/14Q5+HH7odJ6+Owe22fR5k5zTcop7FJL16vx9I6aY66NSZQ
+xYJFQl2eq/ukGFSzukVCpxKRnZYTatRiWf0rFLb3Q+TEAaaOhEgQ4rO9PcctYlqe
+yC7m/UMrv/mMizOGYzG4eco3V0jFYCWrat3KjGMumm8n8vZpQXizxFwnVHtF15o3
+Y7vajCkyi47RI1Dwth71UorTSoryGJUMHAk0jKV5SZZjCDrYBc4vib2b0Qqxjonw
+r/ug5h+R+c7Ho1I2KiAasT5UEL1R6VcEekgTkB7n8U24eh7u/HeRJA35sFxJOQ+8
+5Tf5ROs5E/lbjGGiVTX4YIErbe92w44NdsloQHdTBIOUQtIPuLWDuXvmBrkxYoYa
+pij0ERT3Np52iZ3X8X4dCDMH5hNK+LeCGTLqnLsXoUt+biUyDQzSRttrhNgvjW8o
+gMkHLG6XZGoERDm4g0u39tU4qoxauYREdBa5IDyBRJeAltsTFQGOh07sfIXVs9xd
+tNuQoz4UNVsaU3hu87kBjQRgaAtgAQwA9dZFGqc0/6pUKDUsT+2hMh0z5mISLc+x
+6v4wbAqiEcBE9uoKf0LniRfVeehmuJpiUPgOf3TyxNbxeWiFuJELZbnrYztAeRE6
+6Zxk6i2Mv+207fdlj3mhphdEWh4f/0AJa2PAmiwlcxq1O3VJ/Wfn3huCqIU5cmqn
+mGKH9LPaW1aJBxWl9+x6mmPVySxpTaQRrnNnumZf9K5lwGEsccvpkLP7J1Nlv7HL
+O8oliPCInEMcsrVqfiKU/bybxNW1wzPJxp8LNLaCNxuLNl4RCp7tPQuZgjcoCnz+
+JwcxnmNGI+FKqSsFXBZyNTWiQJuaFUQa0QON/+Qj3p+OyW15f+FfLjHI/BkNAi4n
+cNeeazAwuLCMJGMS+dLarHMbbAKLaH0UI062ch3Aq2Sa3io1gU6vYHvoKNMNfYdN
+woGX85EkzX6A9fm9jBviios1RLkpfO70MoxpWjl/rwHG57GOItWZ7O53ebs6HrFP
+dUYQs0Gz/lj+BaQPwDcMxADfYtGnYMepABEBAAGJAbwEGAEIACYWIQRurXUrPis4
+6OIjbXupMh7apcsyAgUCYGgLYAIbDAUJA8JnAAAKCRCpMh7apcsyAj39DACMEaGs
+skfZBBbF9BHklmN9OHbGKK4qfwY6f3Pl+QEC4m2y5Uaxgx4n0SJZ/p4YdVopRj07
+cdVYEkqJC31co0XPvfbjyBfhcH1BXkKQiYAZMUTqc+ILGHrY/vzP27Je+vck6M+n
+tQ/2rBBiPtD6Bj2RcuXupr6MiGavF5U5vzLUkYm49Oq2Wi5gIuBF8+6ipjnzrVl4
+HqGUlFEt8RK3W4I/ZWTJBlwxaIWoAIfkE54FtSqN4dY+LoNllMKbzjFBemXfZXHA
+FEH9cjNh5EvFKm53ff8X+WNgodiVaH+qv2VMZZngEtmj2Y94v5x5z+Q3vcoGH6FU
+dLjefYm5uwEhhBsTyz8gyBmoj8cBBnw3DZexyOPLGDj/3FSimww0HXf8RIR7Msc5
+GGMLXqSZ4WVZM59pFsqjmqfgl+C8WYWMLAt7sXJGuyl2LQoAtR5gpkPZqA0wQiIX
+e7/RgIs6TpqdS4uLh52KzW7VUXqywr+qH53RFujkS0KijW96LbblENk54Kk=
+=rtCH
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -32,6 +32,7 @@
             <trusting group="org.yaml" name="snakeyaml" version="1.30"/>
             <trusting group="org.yaml" name="snakeyaml" version="1.31"/>
             <trusting group="org.yaml" name="snakeyaml" version="1.33"/>
+            <trusting group="org.yaml" name="snakeyaml" version="2.0"/>
          </trusted-key>
          <trusted-key id="144219b604dde6a2383fa0ee9c6404ebce3e4464" group="com.github.zafarkhaja" name="java-semver" version="0.9.0"/>
          <trusted-key id="19beab2d799c020f17c69126b16698a4adf4d638">
@@ -94,6 +95,7 @@
          <trusted-key id="694621a7227d8d5289699830abe9f3126bb741c1" group="com.google.guava"/>
          <trusted-key id="6a27b2f30f3db8bf86d519f7ec5bce97b4defa96" group="com.esotericsoftware" name="minlog" version="1.3.1"/>
          <trusted-key id="6dd3b8c64ef75253beb2c53ad908a43fb7ec07ac" group="com.sun.activation"/>
+         <trusted-key id="6ead752b3e2b38e8e2236d7ba9321edaa5cb3202" group="ch.randelshofer" name="fastdoubleparser" version="0.8.0"/>
          <trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" group="org.jetbrains.kotlin"/>
          <trusted-key id="70cd19bfd9f6c330027d6f260315bfb7970a144f">
             <trusting group="javax.xml.bind"/>
@@ -216,6 +218,14 @@
             <sha256 value="b9bcee7ec438ba25255d6e8967557de5e16f7eade35a9fde6b923f9c37d66ae4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="ch.randelshofer" name="fastdoubleparser" version="0.8.0">
+         <artifact name="fastdoubleparser-0.8.0.jar">
+            <sha256 value="10fe288fd7a2cdaf5175332b73529f9abf8fd54dcfff317d6967c0c35ffb133b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="fastdoubleparser-0.8.0.pom">
+            <sha256 value="5563e5dd4bb054759f0f83851606d99d2426d75c27372814027005e92d1c2aaa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.beust" name="jcommander" version="1.72">
          <artifact name="jcommander-1.72.jar">
             <sha256 value="e0de160b129b2414087e01fe845609cd55caec6820cfd4d0c90fabcc7bdb8c1e" origin="Generated by Gradle"/>
@@ -412,6 +422,9 @@
          <artifact name="jackson-annotations-2.15.0.jar">
             <sha256 value="91adcd3dcf5fd9a16499934e7536a23d456692a0093e3d4fd52f138c3936348c" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="jackson-annotations-2.15.0.module">
+            <sha256 value="bf1555a2e4bb3f23db391fc4c8dfc6157ec64e8c376588144a260f541b2de1ae" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="jackson-annotations-2.15.0.pom">
             <sha256 value="2f8159b442196faaa0e1374e2d2234b57feec32b27617fa1d7f5d9a8e0be3728" origin="Generated by Gradle"/>
          </artifact>
@@ -468,6 +481,9 @@
          <artifact name="jackson-core-2.15.0.jar">
             <sha256 value="5b483f68fa9dd6aa37da37d1f79dd5c4b9464238f4f0660a242cb6b5c724950c" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="jackson-core-2.15.0.module">
+            <sha256 value="ee1d06a38e8d44d81a2e6a6f54b7d864ae4b2ff710ddf58a2bdfb891f2717381" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="jackson-core-2.15.0.pom">
             <sha256 value="0a3af5df36f1f27e17644817a62409baa25864a3493a3d2880ad7009b0e703ae" origin="Generated by Gradle"/>
          </artifact>
@@ -516,6 +532,9 @@
          <artifact name="jackson-databind-2.15.0.jar">
             <sha256 value="00c5a5d5ae71ac8e8d5b8da606841e2251c806355939cb5d51c4cdc6b644a0dc" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="jackson-databind-2.15.0.module">
+            <sha256 value="a1a842346fde9efc48ddb938b44f1eeebd446868f5cd7031326653a132c06f83" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="jackson-databind-2.15.0.pom">
             <sha256 value="8c380d3fe3dcc298d028798a1f92dfc31824fda041144af2362f1fcf30ee788f" origin="Generated by Gradle"/>
          </artifact>
@@ -4545,6 +4564,14 @@
             <sha256 value="ea7d48fd45321a6033d97cd288186d48e5e92cc0c7066e7388d7c4ceb4af5957" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.yaml" name="snakeyaml" version="2.0">
+         <artifact name="snakeyaml-2.0.jar">
+            <sha256 value="880c9d896e4b74a06c549c15ca496450165d6909fa15d7e662bee8f6a66d7afa" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="snakeyaml-2.0.pom">
+            <sha256 value="43c761f92b549c8b08fb992080253e49f0a983e544ef0663c1f4f9d68eb52616" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="pl.allegro.tech.build" name="axion-release-plugin" version="1.13.9">
          <artifact name="axion-release-plugin-1.13.9.jar">
             <pgp value="79eb1eae95f376ab9629429de2d0f3764b54797f"/>

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

diff --git a/gradlew.bat b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

diff --git a/rd-cli-tool/build.gradle b/rd-cli-tool/build.gradle
@@ -105,13 +105,8 @@ set -e
 RD_CONF=${RD_CONF:-$HOME/.$APP_NAME/$APP_NAME.conf}
 test -f $RD_CONF && . $RD_CONF
 export RD_EXT_DIR=${RD_EXT_DIR:-$HOME/.$APP_NAME/extv2}
-'''
-    )
-    def setJ11AddOpens=appendConfigData.curry(
-        '^APP_ARGS=.*$',
-        '''
-if $JAVACMD --add-opens 2>&1 | grep 'requires modules' >/dev/null; then
-  JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
+if [ ! -z "$(java --add-opens 2>&1 | grep 'requires modules')" ]; then
+  export JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
 fi
 '''
     )
@@ -126,7 +121,6 @@ fi
                         .readLines()
                         .collect(setE)
                         .collect(setClasspath)
-                        .collect(setJ11AddOpens)
                         .join('\n')
     }
 

diff --git a/rd-cli-tool/src/main/java/org/rundeck/client/tool/Main.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/Main.java
@@ -285,7 +285,7 @@ private static void configYamlFormat(final RdBuilder belt, final RdClientConfig
                         DumperOptions.FlowStyle.FLOW
         );
         dumperOptions.setPrettyFlow(config.getBool("RD_YAML_PRETTY", true));
-        Representer representer = new Representer();
+        Representer representer = new Representer(dumperOptions);
         representer.addClassTag(JobItem.class, Tag.MAP);
         representer.addClassTag(ScheduledJobItem.class, Tag.MAP);
         representer.addClassTag(DateInfo.class, Tag.MAP);

diff --git a/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/Configure.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/Configure.java
@@ -27,6 +27,7 @@
 import org.rundeck.client.tool.options.ProjectNameOptions;
 import org.rundeck.client.tool.options.ProjectRequiredNameOptions;
 import org.rundeck.client.tool.options.UnparsedConfigOptions;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 import picocli.CommandLine;
@@ -157,7 +158,7 @@ public static Map<String, String> loadConfig(final ConfigFileOptions opts,
                     inputConfig.putAll(map);
                     break;
                 case yaml:
-                    Yaml yaml = new Yaml(new SafeConstructor());
+                    Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
                     try (FileInputStream fis = new FileInputStream(input)) {
                         Object load = yaml.load(fis);
                         if (load instanceof Map) {