Address review comments vol. 04

Signed-off-by: Václav Muzikář <[email protected]>
vmuzikar · Dec 11, 2023 · ffe8a0c · ffe8a0c
1 parent e91a93d
commit ffe8a0c
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Picocli.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Picocli.java
@@ -333,7 +333,7 @@ public static void validateNonCliConfig(List<String> cliArgs, AbstractCommand ab
                         }
                     }
                     if (!metadata.getNewOptionsKeys().isEmpty()) {
-                        sb.append(" Consider using ");
+                        sb.append(" Use ");
                         sb.append(String.join(", ", metadata.getNewOptionsKeys()));
                         sb.append(".");
                     }
@@ -655,7 +655,7 @@ private static String getDecoratedOptionDescription(PropertyMapper<?> mapper) {
             }
             if (!deprecatedMetadata.getNewOptionsKeys().isEmpty()) {
                 String s = deprecatedMetadata.getNewOptionsKeys().size() > 1 ? "s" : "";
-                deprecatedDetails.add("Consider non-deprecated option" + s + ": " + String.join(", ", deprecatedMetadata.getNewOptionsKeys()) + ".");
+                deprecatedDetails.add("Use the following option" + s + " instead: " + String.join(", ", deprecatedMetadata.getNewOptionsKeys()) + ".");
             }
 
             transformedDesc.insert(0, "@|bold DEPRECATED.|@ ");

diff --git a/...oak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt b/...oak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt
@@ -188,7 +188,7 @@ Proxy:
 
 --proxy <mode>       DEPRECATED. The proxy address forwarding mode if the server is behind a
                        reverse proxy. Possible values are: none, edge, reencrypt, passthrough.
-                       Default: none. Consider non-deprecated option: proxy-headers.
+                       Default: none. Use the following option instead: proxy-headers.
 --proxy-headers <headers>
                      The proxy headers that should be accepted by the server. Misconfiguration
                        might leave the server exposed to security vulnerabilities. Takes precedence

diff --git a/.../it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt b/.../it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt
@@ -174,7 +174,7 @@ Proxy:
 
 --proxy <mode>       DEPRECATED. The proxy address forwarding mode if the server is behind a
                        reverse proxy. Possible values are: none, edge, reencrypt, passthrough.
-                       Default: none. Consider non-deprecated option: proxy-headers.
+                       Default: none. Use the following option instead: proxy-headers.
 --proxy-headers <headers>
                      The proxy headers that should be accepted by the server. Misconfiguration
                        might leave the server exposed to security vulnerabilities. Takes precedence

diff --git a/.../it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt b/.../it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt
@@ -188,7 +188,7 @@ Proxy:
 
 --proxy <mode>       DEPRECATED. The proxy address forwarding mode if the server is behind a
                        reverse proxy. Possible values are: none, edge, reencrypt, passthrough.
-                       Default: none. Consider non-deprecated option: proxy-headers.
+                       Default: none. Use the following option instead: proxy-headers.
 --proxy-headers <headers>
                      The proxy headers that should be accepted by the server. Misconfiguration
                        might leave the server exposed to security vulnerabilities. Takes precedence

diff --git a/.../cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt b/.../cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt
@@ -174,7 +174,7 @@ Proxy:
 
 --proxy <mode>       DEPRECATED. The proxy address forwarding mode if the server is behind a
                        reverse proxy. Possible values are: none, edge, reencrypt, passthrough.
-                       Default: none. Consider non-deprecated option: proxy-headers.
+                       Default: none. Use the following option instead: proxy-headers.
 --proxy-headers <headers>
                      The proxy headers that should be accepted by the server. Misconfiguration
                        might leave the server exposed to security vulnerabilities. Takes precedence

diff --git a/...ycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt b/...ycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt
@@ -189,7 +189,7 @@ Proxy:
 
 --proxy <mode>       DEPRECATED. The proxy address forwarding mode if the server is behind a
                        reverse proxy. Possible values are: none, edge, reencrypt, passthrough.
-                       Default: none. Consider non-deprecated option: proxy-headers.
+                       Default: none. Use the following option instead: proxy-headers.
 --proxy-headers <headers>
                      The proxy headers that should be accepted by the server. Misconfiguration
                        might leave the server exposed to security vulnerabilities. Takes precedence

diff --git a/...oak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt b/...oak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt
@@ -175,7 +175,7 @@ Proxy:
 
 --proxy <mode>       DEPRECATED. The proxy address forwarding mode if the server is behind a
                        reverse proxy. Possible values are: none, edge, reencrypt, passthrough.
-                       Default: none. Consider non-deprecated option: proxy-headers.
+                       Default: none. Use the following option instead: proxy-headers.
 --proxy-headers <headers>
                      The proxy headers that should be accepted by the server. Misconfiguration
                        might leave the server exposed to security vulnerabilities. Takes precedence

diff --git a/...oak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt b/...oak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt
@@ -189,7 +189,7 @@ Proxy:
 
 --proxy <mode>       DEPRECATED. The proxy address forwarding mode if the server is behind a
                        reverse proxy. Possible values are: none, edge, reencrypt, passthrough.
-                       Default: none. Consider non-deprecated option: proxy-headers.
+                       Default: none. Use the following option instead: proxy-headers.
 --proxy-headers <headers>
                      The proxy headers that should be accepted by the server. Misconfiguration
                        might leave the server exposed to security vulnerabilities. Takes precedence

diff --git a/.../it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt b/.../it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt
@@ -175,7 +175,7 @@ Proxy:
 
 --proxy <mode>       DEPRECATED. The proxy address forwarding mode if the server is behind a
                        reverse proxy. Possible values are: none, edge, reencrypt, passthrough.
-                       Default: none. Consider non-deprecated option: proxy-headers.
+                       Default: none. Use the following option instead: proxy-headers.
 --proxy-headers <headers>
                      The proxy headers that should be accepted by the server. Misconfiguration
                        might leave the server exposed to security vulnerabilities. Takes precedence

diff --git a/.../cli/dist/approvals/cli/help/HelpCommandDistTest.testStartOptimizedHelp.unix.approved.txt b/.../cli/dist/approvals/cli/help/HelpCommandDistTest.testStartOptimizedHelp.unix.approved.txt
@@ -132,7 +132,7 @@ Proxy:
 
 --proxy <mode>       DEPRECATED. The proxy address forwarding mode if the server is behind a
                        reverse proxy. Possible values are: none, edge, reencrypt, passthrough.
-                       Default: none. Consider non-deprecated option: proxy-headers.
+                       Default: none. Use the following option instead: proxy-headers.
 --proxy-headers <headers>
                      The proxy headers that should be accepted by the server. Misconfiguration
                        might leave the server exposed to security vulnerabilities. Takes precedence

diff --git a/...i/dist/approvals/cli/help/HelpCommandDistTest.testStartOptimizedHelp.windows.approved.txt b/...i/dist/approvals/cli/help/HelpCommandDistTest.testStartOptimizedHelp.windows.approved.txt
@@ -116,7 +116,7 @@ Proxy:
 
 --proxy <mode>       DEPRECATED. The proxy address forwarding mode if the server is behind a
                        reverse proxy. Possible values are: none, edge, reencrypt, passthrough.
-                       Default: none. Consider non-deprecated option: proxy-headers.
+                       Default: none. Use the following option instead: proxy-headers.
 --proxy-headers <headers>
                      The proxy headers that should be accepted by the server. Misconfiguration
                        might leave the server exposed to security vulnerabilities. Takes precedence

diff --git a/...i/dist/approvals/cli/help/HelpCommandDistTest.testStartOptimizedHelpAll.unix.approved.txt b/...i/dist/approvals/cli/help/HelpCommandDistTest.testStartOptimizedHelpAll.unix.approved.txt
@@ -132,7 +132,7 @@ Proxy:
 
 --proxy <mode>       DEPRECATED. The proxy address forwarding mode if the server is behind a
                        reverse proxy. Possible values are: none, edge, reencrypt, passthrough.
-                       Default: none. Consider non-deprecated option: proxy-headers.
+                       Default: none. Use the following option instead: proxy-headers.
 --proxy-headers <headers>
                      The proxy headers that should be accepted by the server. Misconfiguration
                        might leave the server exposed to security vulnerabilities. Takes precedence

diff --git a/...ist/approvals/cli/help/HelpCommandDistTest.testStartOptimizedHelpAll.windows.approved.txt b/...ist/approvals/cli/help/HelpCommandDistTest.testStartOptimizedHelpAll.windows.approved.txt
@@ -116,7 +116,7 @@ Proxy:
 
 --proxy <mode>       DEPRECATED. The proxy address forwarding mode if the server is behind a
                        reverse proxy. Possible values are: none, edge, reencrypt, passthrough.
-                       Default: none. Consider non-deprecated option: proxy-headers.
+                       Default: none. Use the following option instead: proxy-headers.
 --proxy-headers <headers>
                      The proxy headers that should be accepted by the server. Misconfiguration
                        might leave the server exposed to security vulnerabilities. Takes precedence