[java-identity-provider] branch main updated: IDP-2162 Add a "test" option for the plugin installer

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=c5396436537c8499455142382a05198ac6d424fa

The following commit(s) were added to refs/heads/main by this push:
     new c53964365 IDP-2162 Add a "test" option for the plugin installer
c53964365 is described below

commit c5396436537c8499455142382a05198ac6d424fa
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Aug 24 11:15:37 2023 +0100

    IDP-2162 Add a "test" option for the plugin installer
    
    https://shibboleth.atlassian.net/browse/IDP-2162
    
    Introduce a new error code (3) for module mismatches
---
 .../shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
index b3192e0e6..1e7e4d0e9 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
@@ -63,6 +63,9 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
 
     /** Class logger. */
     private Logger log;
+    
+    /** Return code indicating an module mismatch, {@value} . */
+    public static final int RC_MODULE = 3;
 
     /** A Plugin Installer to use. */
     @Nullable private PluginInstaller installer;
@@ -346,7 +349,7 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
     /** List all installed plugins (or just one if provided).
      * @param fullList whether to do full deatils
      * @param pluginId the pluginId or null.
-     * @return {@link AbstractCommandLine#RC_IO} if we hit a module issue, otherwise {@link AbstractCommandLine#RC_OK}  
+     * @return {@link #RC_MODULE} if we hit a module issue, otherwise {@link AbstractCommandLine#RC_OK}  
      */
     private int doList(final boolean fullList, @Nullable final String pluginId) {
         boolean list = false;
@@ -364,7 +367,7 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
                 for (final String module:plugin.getRequiredModules()) {
 					if (!modules.contains(module)) {
 						getLogger().error("Plugin {} requires non-enabled module {}", plugin.getPluginId(), module);
-						result = RC_IO;
+						result = RC_MODULE;
 					}
                 }
                 if (fullList) {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.