Only show non-hidden options in --help-all for options where supportlevel is not SUPPORTED

Closes #13385
This commit is contained in:
Dominik Guhr 2022-07-28 10:34:01 +02:00 committed by Pedro Igor
parent 7e925bfbff
commit 10e3c797a3
8 changed files with 1 additions and 43 deletions

View file

@ -50,7 +50,6 @@ public class StorageOptions {
.description(String.format("Sets the default storage mechanism for all areas. Possible values are: %s.", storageAreas())) .description(String.format("Sets the default storage mechanism for all areas. Possible values are: %s.", storageAreas()))
.expectedValues(StorageType.values()) .expectedValues(StorageType.values())
.defaultValue(Optional.empty()) .defaultValue(Optional.empty())
.hidden()
.buildTime(true) .buildTime(true)
.build(); .build();
@ -170,7 +169,6 @@ public class StorageOptions {
public static final Option<String> STORAGE_DEPLOYMENT_STATE_RESOURCES_VERSION_SEED = new OptionBuilder<>("storage-deployment-state-version-seed", String.class) public static final Option<String> STORAGE_DEPLOYMENT_STATE_RESOURCES_VERSION_SEED = new OptionBuilder<>("storage-deployment-state-version-seed", String.class)
.category(OptionCategory.STORAGE) .category(OptionCategory.STORAGE)
.description("Secret that serves as a seed to mask the version number of Keycloak in URLs. Need to be identical across all servers in the cluster. Will default to a random number generated when starting the server which is secure but will lead to problems when a loadbalancer without sticky sessions is used or nodes are restarted.") .description("Secret that serves as a seed to mask the version number of Keycloak in URLs. Need to be identical across all servers in the cluster. Will default to a random number generated when starting the server which is secure but will lead to problems when a loadbalancer without sticky sessions is used or nodes are restarted.")
.hidden()
.buildTime(false) .buildTime(false)
.build(); .build();
@ -321,25 +319,21 @@ public class StorageOptions {
public static final Option<String> STORAGE_HOTROD_HOST = new OptionBuilder<>("storage-hotrod-host", String.class) public static final Option<String> STORAGE_HOTROD_HOST = new OptionBuilder<>("storage-hotrod-host", String.class)
.category(OptionCategory.STORAGE) .category(OptionCategory.STORAGE)
.description("Sets the host of the Infinispan server.") .description("Sets the host of the Infinispan server.")
.hidden()
.build(); .build();
public static final Option<Integer> STORAGE_HOTROD_PORT = new OptionBuilder<>("storage-hotrod-port", Integer.class) public static final Option<Integer> STORAGE_HOTROD_PORT = new OptionBuilder<>("storage-hotrod-port", Integer.class)
.category(OptionCategory.STORAGE) .category(OptionCategory.STORAGE)
.description("Sets the port of the Infinispan server.") .description("Sets the port of the Infinispan server.")
.hidden()
.build(); .build();
public static final Option<String> STORAGE_HOTROD_USERNAME = new OptionBuilder<>("storage-hotrod-username", String.class) public static final Option<String> STORAGE_HOTROD_USERNAME = new OptionBuilder<>("storage-hotrod-username", String.class)
.category(OptionCategory.STORAGE) .category(OptionCategory.STORAGE)
.description("Sets the username of the Infinispan user.") .description("Sets the username of the Infinispan user.")
.hidden()
.build(); .build();
public static final Option<String> STORAGE_HOTROD_PASSWORD = new OptionBuilder<>("storage-hotrod-password", String.class) public static final Option<String> STORAGE_HOTROD_PASSWORD = new OptionBuilder<>("storage-hotrod-password", String.class)
.category(OptionCategory.STORAGE) .category(OptionCategory.STORAGE)
.description("Sets the password of the Infinispan user.") .description("Sets the password of the Infinispan user.")
.hidden()
.build(); .build();
public static final Option<Boolean> STORAGE_HOTROD_CACHE_CONFIGURE = new OptionBuilder<>("storage-hotrod-cache-configure", Boolean.class) public static final Option<Boolean> STORAGE_HOTROD_CACHE_CONFIGURE = new OptionBuilder<>("storage-hotrod-cache-configure", Boolean.class)

View file

@ -169,7 +169,7 @@ public final class Help extends CommandLine.Help {
if (isUnsupportedOption) { if (isUnsupportedOption) {
// unsupported options removed from help if all options are not requested // unsupported options removed from help if all options are not requested
return allOptions; return !option.hidden() && allOptions;
} }
return !option.hidden(); return !option.hidden();

View file

@ -79,12 +79,6 @@ Storage (Experimental):
Will default to a random number generated when starting the server which is Will default to a random number generated when starting the server which is
secure but will lead to problems when a loadbalancer without sticky sessions secure but will lead to problems when a loadbalancer without sticky sessions
is used or nodes are restarted. is used or nodes are restarted.
--storage-hotrod-cache-configure <true|false>
Experimental: When set to true, Keycloak will create and configure Infinispan
caches on startup. Default: true.
--storage-hotrod-cache-reindex <[cache1,cache2,...]|all>
Experimental: List of cache names that should be indexed on Keycloak startup.
Defaulting to `all` which means all caches are reindexed. Default: all.
--storage-hotrod-host <host> --storage-hotrod-host <host>
Experimental: Sets the host of the Infinispan server. Experimental: Sets the host of the Infinispan server.
--storage-hotrod-password <password> --storage-hotrod-password <password>

View file

@ -79,12 +79,6 @@ Storage (Experimental):
Will default to a random number generated when starting the server which is Will default to a random number generated when starting the server which is
secure but will lead to problems when a loadbalancer without sticky sessions secure but will lead to problems when a loadbalancer without sticky sessions
is used or nodes are restarted. is used or nodes are restarted.
--storage-hotrod-cache-configure <true|false>
Experimental: When set to true, Keycloak will create and configure Infinispan
caches on startup. Default: true.
--storage-hotrod-cache-reindex <[cache1,cache2,...]|all>
Experimental: List of cache names that should be indexed on Keycloak startup.
Defaulting to `all` which means all caches are reindexed. Default: all.
--storage-hotrod-host <host> --storage-hotrod-host <host>
Experimental: Sets the host of the Infinispan server. Experimental: Sets the host of the Infinispan server.
--storage-hotrod-password <password> --storage-hotrod-password <password>

View file

@ -85,12 +85,6 @@ Storage (Experimental):
Will default to a random number generated when starting the server which is Will default to a random number generated when starting the server which is
secure but will lead to problems when a loadbalancer without sticky sessions secure but will lead to problems when a loadbalancer without sticky sessions
is used or nodes are restarted. is used or nodes are restarted.
--storage-hotrod-cache-configure <true|false>
Experimental: When set to true, Keycloak will create and configure Infinispan
caches on startup. Default: true.
--storage-hotrod-cache-reindex <[cache1,cache2,...]|all>
Experimental: List of cache names that should be indexed on Keycloak startup.
Defaulting to `all` which means all caches are reindexed. Default: all.
--storage-hotrod-host <host> --storage-hotrod-host <host>
Experimental: Sets the host of the Infinispan server. Experimental: Sets the host of the Infinispan server.
--storage-hotrod-password <password> --storage-hotrod-password <password>

View file

@ -85,12 +85,6 @@ Storage (Experimental):
Will default to a random number generated when starting the server which is Will default to a random number generated when starting the server which is
secure but will lead to problems when a loadbalancer without sticky sessions secure but will lead to problems when a loadbalancer without sticky sessions
is used or nodes are restarted. is used or nodes are restarted.
--storage-hotrod-cache-configure <true|false>
Experimental: When set to true, Keycloak will create and configure Infinispan
caches on startup. Default: true.
--storage-hotrod-cache-reindex <[cache1,cache2,...]|all>
Experimental: List of cache names that should be indexed on Keycloak startup.
Defaulting to `all` which means all caches are reindexed. Default: all.
--storage-hotrod-host <host> --storage-hotrod-host <host>
Experimental: Sets the host of the Infinispan server. Experimental: Sets the host of the Infinispan server.
--storage-hotrod-password <password> --storage-hotrod-password <password>

View file

@ -28,12 +28,6 @@ Storage (Experimental):
Will default to a random number generated when starting the server which is Will default to a random number generated when starting the server which is
secure but will lead to problems when a loadbalancer without sticky sessions secure but will lead to problems when a loadbalancer without sticky sessions
is used or nodes are restarted. is used or nodes are restarted.
--storage-hotrod-cache-configure <true|false>
Experimental: When set to true, Keycloak will create and configure Infinispan
caches on startup. Default: true.
--storage-hotrod-cache-reindex <[cache1,cache2,...]|all>
Experimental: List of cache names that should be indexed on Keycloak startup.
Defaulting to `all` which means all caches are reindexed. Default: all.
--storage-hotrod-host <host> --storage-hotrod-host <host>
Experimental: Sets the host of the Infinispan server. Experimental: Sets the host of the Infinispan server.
--storage-hotrod-password <password> --storage-hotrod-password <password>

View file

@ -28,12 +28,6 @@ Storage (Experimental):
Will default to a random number generated when starting the server which is Will default to a random number generated when starting the server which is
secure but will lead to problems when a loadbalancer without sticky sessions secure but will lead to problems when a loadbalancer without sticky sessions
is used or nodes are restarted. is used or nodes are restarted.
--storage-hotrod-cache-configure <true|false>
Experimental: When set to true, Keycloak will create and configure Infinispan
caches on startup. Default: true.
--storage-hotrod-cache-reindex <[cache1,cache2,...]|all>
Experimental: List of cache names that should be indexed on Keycloak startup.
Defaulting to `all` which means all caches are reindexed. Default: all.
--storage-hotrod-host <host> --storage-hotrod-host <host>
Experimental: Sets the host of the Infinispan server. Experimental: Sets the host of the Infinispan server.
--storage-hotrod-password <password> --storage-hotrod-password <password>