Rename sso feature exclusion flag

OpenLiberty · Sep 14, 2023 · 4c0ad3d · 4c0ad3d
1 parent 5624863
commit 4c0ad3d
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -80,12 +80,12 @@ Refer to [Repository and proxy modifications](https://openliberty.io/docs/ref/co
 
 This section describes the optional enterprise functionality that can be enabled via the Dockerfile during `build` time, by setting particular build-arguments (`ARG`) and calling `RUN configure.sh`.  Each of these options trigger the inclusion/exclusion of specific configuration via XML snippets (except for `VERBOSE`), described below:
 
+* `EXCLUDE_CONFIG_SSO_FEATURES`
+  *  Description: When set to `true` the `sso_features.xml` config will be excluded from feature installation (see [SECURITY.md](/SECURITY.md) for usage).
+  *  XML Snippet Location: [sso-features.xml](/releases/latest/kernel-slim/helpers/build/configuration_snippets/sso-features.xml)
 * `HZ_SESSION_CACHE`
   *  Description: Enable the persistence of HTTP sessions using JCache by adding the `sessionCache-1.0` feature.
   *  XML Snippet Location: [hazelcast-sessioncache.xml](/releases/latest/kernel-slim/helpers/build/configuration_snippets/hazelcast-sessioncache.xml)
-* `SKIP_SSO_FEATURE_INSTALL`
-  *  Description: Disable the install of `appSecurity-2.0` and `socialLogin-1.0` when `SEC_SSO_PROVIDERS` is set. (see [SECURITY.md](/SECURITY.md) for usage.)
-  *  XML Snippet Location: [sso-features.xml](/releases/latest/kernel-slim/helpers/build/configuration_snippets/sso-features.xml)
 * `TLS` (`SSL` is deprecated)
   *  Description: Enable Transport Security in Liberty by adding the `transportSecurity-1.0` feature (includes support for SSL).
   *  XML Snippet Location:  [keystore.xml](/releases/latest/kernel-slim/helpers/build/configuration_snippets/keystore.xml).

diff --git a/SECURITY.md b/SECURITY.md
@@ -51,7 +51,7 @@ The following variables configure container security for Single Sign-On using th
   Your configuration is not supported. Update the configuration to use features that support either the Jakarta EE or Java EE programming models, but not both.
   ```
 
-  * To avoid this error, set `ARG SKIP_SSO_FEATURE_INSTALL=true` in your Dockerfile.
+  * To avoid this error, set `ARG EXCLUDE_CONFIG_SSO_FEATURES=true` in your Dockerfile.
 
 ### Configuration needed at image build time or at container deploy time:
 

diff --git a/releases/23.0.0.6/full/helpers/build/configure.sh b/releases/23.0.0.6/full/helpers/build/configure.sh
@@ -86,7 +86,7 @@ function main() {
   fi
 
   if [[ -n "$SEC_SSO_PROVIDERS" ]]; then
-    if [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
+    if [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
       cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
     fi
     parseProviders $SEC_SSO_PROVIDERS

diff --git a/releases/23.0.0.6/kernel-slim/helpers/build/features.sh b/releases/23.0.0.6/kernel-slim/helpers/build/features.sh
@@ -20,7 +20,7 @@ if [ -n "$INFINISPAN_SERVICE_NAME" ] || [ "${HZ_SESSION_CACHE}" == "client" ] ||
 fi
 
 # SSO
-if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
+if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
   cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
 fi
 

diff --git a/releases/23.0.0.9/full/helpers/build/configure.sh b/releases/23.0.0.9/full/helpers/build/configure.sh
@@ -86,7 +86,7 @@ function main() {
   fi
 
   if [[ -n "$SEC_SSO_PROVIDERS" ]]; then
-    if [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
+    if [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
       cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
     fi
     parseProviders $SEC_SSO_PROVIDERS

diff --git a/releases/23.0.0.9/kernel-slim/helpers/build/features.sh b/releases/23.0.0.9/kernel-slim/helpers/build/features.sh
@@ -20,7 +20,7 @@ if [ -n "$INFINISPAN_SERVICE_NAME" ] || [ "${HZ_SESSION_CACHE}" == "client" ] ||
 fi
 
 # SSO
-if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
+if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
   cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
 fi
 

diff --git a/releases/latest/beta/helpers/build/configure.sh b/releases/latest/beta/helpers/build/configure.sh
@@ -86,7 +86,7 @@ function main() {
   fi
 
   if [[ -n "$SEC_SSO_PROVIDERS" ]]; then
-    if [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
+    if [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
       cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
     fi
     parseProviders $SEC_SSO_PROVIDERS

diff --git a/releases/latest/full/helpers/build/configure.sh b/releases/latest/full/helpers/build/configure.sh
@@ -86,7 +86,7 @@ function main() {
   fi
 
   if [[ -n "$SEC_SSO_PROVIDERS" ]]; then
-    if [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
+    if [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
       cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
     fi
     parseProviders $SEC_SSO_PROVIDERS

diff --git a/releases/latest/kernel-slim/helpers/build/features.sh b/releases/latest/kernel-slim/helpers/build/features.sh
@@ -20,7 +20,7 @@ if [ -n "$INFINISPAN_SERVICE_NAME" ] || [ "${HZ_SESSION_CACHE}" == "client" ] ||
 fi
 
 # SSO
-if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
+if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
   cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
 fi