libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

fix: remove the env values from echos (#28184)

Browse source 
closes: #28090

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
This commit is contained in:
Steven Hawkins 2024-03-27 09:33:16 -04:00 committed by GitHub
parent a53cacc0a7
commit 8407ae3bc5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
quarkus/dist/src/main/content/bin/kc.bat vendored
View file

@ -72,7 +72,7 @@ goto READ-ARGS
:MAIN :MAIN
if not "x%JAVA_OPTS%" == "x" ( if not "x%JAVA_OPTS%" == "x" (
echo "JAVA_OPTS already set in environment; overriding default settings with values: %JAVA_OPTS%" echo "JAVA_OPTS already set in environment; overriding default settings"
) else ( ) else (
rem The defaults set up Keycloak with '-XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90' which proved to provide a good throughput and efficiency in the total memory allocation and CPU overhead. rem The defaults set up Keycloak with '-XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90' which proved to provide a good throughput and efficiency in the total memory allocation and CPU overhead.
rem If the memory is not used, it will be freed. See https://developers.redhat.com/blog/2017/04/04/openjdk-and-containers for details. rem If the memory is not used, it will be freed. See https://developers.redhat.com/blog/2017/04/04/openjdk-and-containers for details.
@ -93,13 +93,13 @@ if not "x%JAVA_OPTS%" == "x" (
set "JAVA_OPTS=%JAVA_OPTS% %JAVA_OPTS_KC_HEAP%" set "JAVA_OPTS=%JAVA_OPTS% %JAVA_OPTS_KC_HEAP%"
) else ( ) else (
echo "JAVA_OPTS_KC_HEAP already set in environment; overriding default settings with values: %JAVA_OPTS_KC_HEAP%" echo "JAVA_OPTS_KC_HEAP already set in environment; overriding default settings"
) )
) )
@REM See also https://github.com/wildfly/wildfly-core/blob/7e5624cf92ebe4b64a4793a8c0b2a340c0d6d363/core-feature-pack/common/src/main/resources/content/bin/common.sh#L57-L60 @REM See also https://github.com/wildfly/wildfly-core/blob/7e5624cf92ebe4b64a4793a8c0b2a340c0d6d363/core-feature-pack/common/src/main/resources/content/bin/common.sh#L57-L60
if not "x%JAVA_ADD_OPENS%" == "x" ( if not "x%JAVA_ADD_OPENS%" == "x" (
echo "JAVA_ADD_OPENS already set in environment; overriding default settings with values: %JAVA_ADD_OPENS%" echo "JAVA_ADD_OPENS already set in environment; overriding default settings"
) else ( ) else (
set "JAVA_ADD_OPENS=--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED" set "JAVA_ADD_OPENS=--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED"
) )
@ -107,14 +107,14 @@ set "JAVA_OPTS=%JAVA_OPTS% %JAVA_ADD_OPENS%"
@REM Set the default locale for the JVM to English to prevent locale-specific character variations @REM Set the default locale for the JVM to English to prevent locale-specific character variations
if not "x%JAVA_LOCALE%" == "x" ( if not "x%JAVA_LOCALE%" == "x" (
echo "JAVA_LOCALE already set in environment; overriding default settings with values: %JAVA_LOCALE%" echo "JAVA_LOCALE already set in environment; overriding default settings"
) else ( ) else (
set "JAVA_LOCALE=-Duser.language=en -Duser.country=US" set "JAVA_LOCALE=-Duser.language=en -Duser.country=US"
) )
set "JAVA_OPTS=%JAVA_OPTS% %JAVA_LOCALE%" set "JAVA_OPTS=%JAVA_OPTS% %JAVA_LOCALE%"
if not "x%JAVA_OPTS_APPEND%" == "x" ( if not "x%JAVA_OPTS_APPEND%" == "x" (
echo "Appending additional Java properties to JAVA_OPTS: %JAVA_OPTS_APPEND%" echo "Appending additional Java properties to JAVA_OPTS"
set JAVA_OPTS=%JAVA_OPTS% %JAVA_OPTS_APPEND% set JAVA_OPTS=%JAVA_OPTS% %JAVA_OPTS_APPEND%
) )

10
quarkus/dist/src/main/content/bin/kc.sh vendored
View file

@ -109,20 +109,20 @@ if [ -z "$JAVA_OPTS" ]; then
JAVA_OPTS_KC_HEAP="$JAVA_OPTS_KC_HEAP -Xms64m -Xmx512m" JAVA_OPTS_KC_HEAP="$JAVA_OPTS_KC_HEAP -Xms64m -Xmx512m"
fi fi
else else
echo "JAVA_OPTS_KC_HEAP already set in environment; overriding default settings with values: $JAVA_OPTS_KC_HEAP" echo "JAVA_OPTS_KC_HEAP already set in environment; overriding default settings"
fi fi
JAVA_OPTS="$JAVA_OPTS $JAVA_OPTS_KC_HEAP" JAVA_OPTS="$JAVA_OPTS $JAVA_OPTS_KC_HEAP"
else else
echo "JAVA_OPTS already set in environment; overriding default settings with values: $JAVA_OPTS" echo "JAVA_OPTS already set in environment; overriding default settings"
fi fi
# See also https://github.com/wildfly/wildfly-core/blob/7e5624cf92ebe4b64a4793a8c0b2a340c0d6d363/core-feature-pack/common/src/main/resources/content/bin/common.sh#L57-L60 # See also https://github.com/wildfly/wildfly-core/blob/7e5624cf92ebe4b64a4793a8c0b2a340c0d6d363/core-feature-pack/common/src/main/resources/content/bin/common.sh#L57-L60
if [ -z "$JAVA_ADD_OPENS" ]; then if [ -z "$JAVA_ADD_OPENS" ]; then
JAVA_ADD_OPENS="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED" JAVA_ADD_OPENS="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED"
else else
echo "JAVA_ADD_OPENS already set in environment; overriding default settings with values: $JAVA_ADD_OPENS" echo "JAVA_ADD_OPENS already set in environment; overriding default settings"
fi fi
JAVA_OPTS="$JAVA_OPTS $JAVA_ADD_OPENS" JAVA_OPTS="$JAVA_OPTS $JAVA_ADD_OPENS"
@ -130,12 +130,12 @@ JAVA_OPTS="$JAVA_OPTS $JAVA_ADD_OPENS"
if [ -z "$JAVA_LOCALE" ]; then if [ -z "$JAVA_LOCALE" ]; then
JAVA_LOCALE="-Duser.language=en -Duser.country=US" JAVA_LOCALE="-Duser.language=en -Duser.country=US"
else else
echo "JAVA_LOCALE already set in environment; overriding default settings with values: $JAVA_LOCALE" echo "JAVA_LOCALE already set in environment; overriding default settings"
fi fi
JAVA_OPTS="$JAVA_OPTS $JAVA_LOCALE" JAVA_OPTS="$JAVA_OPTS $JAVA_LOCALE"
if [ -n "$JAVA_OPTS_APPEND" ]; then if [ -n "$JAVA_OPTS_APPEND" ]; then
echo "Appending additional Java properties to JAVA_OPTS: $JAVA_OPTS_APPEND" echo "Appending additional Java properties to JAVA_OPTS"
JAVA_OPTS="$JAVA_OPTS $JAVA_OPTS_APPEND" JAVA_OPTS="$JAVA_OPTS $JAVA_OPTS_APPEND"
fi fi

13
quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/JavaOptsScriptTest.java vendored
View file

@ -62,7 +62,8 @@ public class JavaOptsScriptTest {
assertThat(output, matchesPattern("(?s).*Using JAVA_OPTS: " + DEFAULT_OPTS + ".*")); assertThat(output, matchesPattern("(?s).*Using JAVA_OPTS: " + DEFAULT_OPTS + ".*"));
assertThat(output, not(containsString("-Xms64m -Xmx512m"))); assertThat(output, not(containsString("-Xms64m -Xmx512m")));
assertThat(output, not(containsString("-XX:MaxRAMPercentage=70 -XX:MinRAMPercentage=70 -XX:InitialRAMPercentage=50"))); assertThat(output, not(containsString("-XX:MaxRAMPercentage=70 -XX:MinRAMPercentage=70 -XX:InitialRAMPercentage=50")));
assertThat(output, containsString("JAVA_OPTS_KC_HEAP already set in environment; overriding default settings with values: -Xms128m")); assertThat(output, containsString("JAVA_OPTS_KC_HEAP already set in environment; overriding default settings"));
assertThat(output, containsString(" -Xms128m "));
} }
@Test @Test
@ -70,10 +71,10 @@ public class JavaOptsScriptTest {
@WithEnvVars({"JAVA_OPTS_KC_HEAP", "-Xms128m", "JAVA_OPTS", "-Xmx256m"}) @WithEnvVars({"JAVA_OPTS_KC_HEAP", "-Xms128m", "JAVA_OPTS", "-Xmx256m"})
void testCustomJavaHeapContainerOptsWithCustomJavaOpts(LaunchResult result) { void testCustomJavaHeapContainerOptsWithCustomJavaOpts(LaunchResult result) {
String output = result.getOutput(); String output = result.getOutput();
assertThat(output, not(containsString("JAVA_OPTS_KC_HEAP already set in environment; overriding default settings with values:"))); assertThat(output, not(containsString("JAVA_OPTS_KC_HEAP already set in environment; overriding default settings with values")));
assertThat(output, not(containsString("-Xms128m"))); assertThat(output, not(containsString("-Xms128m")));
assertThat(output, containsString("JAVA_OPTS already set in environment; overriding default settings with values: -Xmx256m")); assertThat(output, containsString("JAVA_OPTS already set in environment; overriding default settings"));
assertThat(output, containsString("Using JAVA_OPTS: -Xmx256m")); assertThat(output, containsString("Using JAVA_OPTS: -Xmx256m"));
} }
@ -82,7 +83,7 @@ public class JavaOptsScriptTest {
@WithEnvVars({ "JAVA_OPTS", "-Dfoo=bar"}) @WithEnvVars({ "JAVA_OPTS", "-Dfoo=bar"})
void testJavaOpts(LaunchResult result) { void testJavaOpts(LaunchResult result) {
String output = result.getOutput(); String output = result.getOutput();
assertThat(output, containsString("JAVA_OPTS already set in environment; overriding default settings with values: -Dfoo=bar")); assertThat(output, containsString("JAVA_OPTS already set in environment; overriding default settings"));
assertThat(output, containsString("Using JAVA_OPTS: -Dfoo=bar")); assertThat(output, containsString("Using JAVA_OPTS: -Dfoo=bar"));
} }
@ -91,7 +92,7 @@ public class JavaOptsScriptTest {
@WithEnvVars({ "JAVA_OPTS_APPEND", "-Dfoo=bar"}) @WithEnvVars({ "JAVA_OPTS_APPEND", "-Dfoo=bar"})
void testJavaOptsAppend(LaunchResult result) { void testJavaOptsAppend(LaunchResult result) {
String output = result.getOutput(); String output = result.getOutput();
assertThat(output, containsString("Appending additional Java properties to JAVA_OPTS: -Dfoo=bar")); assertThat(output, containsString("Appending additional Java properties to JAVA_OPTS"));
assertThat(output, matchesPattern("(?s).*Using JAVA_OPTS: " + DEFAULT_OPTS + " -Dfoo=bar\\n.*")); assertThat(output, matchesPattern("(?s).*Using JAVA_OPTS: " + DEFAULT_OPTS + " -Dfoo=bar\\n.*"));
} }
@ -100,7 +101,7 @@ public class JavaOptsScriptTest {
@WithEnvVars({ "JAVA_ADD_OPENS", "-Dfoo=bar"}) @WithEnvVars({ "JAVA_ADD_OPENS", "-Dfoo=bar"})
void testJavaAddOpens(LaunchResult result) { void testJavaAddOpens(LaunchResult result) {
String output = result.getOutput(); String output = result.getOutput();
assertThat(output, containsString("JAVA_ADD_OPENS already set in environment; overriding default settings with values: -Dfoo=bar")); assertThat(output, containsString("JAVA_ADD_OPENS already set in environment; overriding default settings"));
assertThat(output, not(containsString("--add-opens"))); assertThat(output, not(containsString("--add-opens")));
assertThat(output, matchesPattern("(?s).*Using JAVA_OPTS: " + DEFAULT_OPTS + " -Dfoo=bar.*")); assertThat(output, matchesPattern("(?s).*Using JAVA_OPTS: " + DEFAULT_OPTS + " -Dfoo=bar.*"));
} }