mas-cli 10.4.2__tar.gz → 10.4.4__tar.gz

{mas_cli-10.4.2 → mas_cli-10.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mas-cli
-Version: 10.4.2
+Version: 10.4.4
 Summary: Python Admin CLI for Maximo Application Suite
 Home-page: https://github.com/ibm-mas/cli
 Author: David Parker

{mas_cli-10.4.2 → mas_cli-10.4.4}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "10.4.2"
+__version__ = "10.4.4"

{mas_cli-10.4.2 → mas_cli-10.4.4}/src/mas/cli/displayMixins.py

@@ -77,6 +77,7 @@ class PromptMixin():
     def yesOrNo(self, message: str, param: str=None) -> bool:
         response = prompt(masPromptYesOrNo(message), validator=YesNoValidator(), validate_while_typing=False)
         responseAsBool = response.lower() in ["y", "yes"]
+
         if param is not None:
             self.params[param] = "true" if responseAsBool else "false"
         return responseAsBool
@@ -107,7 +108,9 @@ class PromptMixin():
         # List indices are 0 origin, so we need to subtract 1 from the selection made to arrive at the correct value
         self.setParam(param, options[selection-1])
 
-    def promptForFile(self, message: str, mustExist: bool=True, default: str="") -> None:
+    def promptForFile(self, message: str, mustExist: bool=True, default: str="", envVar: str="") -> None:
+        if default == "" and envVar != "":
+            default = getenv(envVar, "")
         if mustExist:
             return prompt(masPromptValue(message), validator=FileExistsValidator(), validate_while_typing=False, default=default)
         else:

{mas_cli-10.4.2 → mas_cli-10.4.4}/src/mas/cli/install/app.py

@@ -150,7 +150,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
 
     def configSLS(self) -> None:
         self.printH1("Configure Product License")
-        self.slsLicenseFileLocal = self.promptForFile("License file", mustExist=True)
+        self.slsLicenseFileLocal = self.promptForFile("License file", mustExist=True, envVar="SLS_LICENSE_FILE_LOCAL")
         self.promptForString("Contact e-mail address", "uds_contact_email")
         self.promptForString("Contact first name", "uds_contact_firstname")
         self.promptForString("Contact last name", "uds_contact_lastname")
@@ -202,16 +202,22 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             "Many aspects of Maximo Application Suite's Single Sign-On (SSO) can be customized:",
             " - Idle session automatic logout timer",
             " - Session, access token, and refresh token timeouts",
-            " - Default identity provider (IDP), and seamless login"
+            " - Default identity provider (IDP), and seamless login",
+            " - Brower cookie properties"
         ])
-        sso_response = self.yesOrNo("Configure SSO properties")
-        if sso_response:
-            self.promptForInt("Enter the idle timeout (in seconds)", "idle_timeout", default=1800)
-            self.promptForString("Enter the IDP session timeout (e.g., '12h' for 12 hours)", "idp_session_timeout", validator=TimeoutFormatValidator(), default="12h")
-            self.promptForString("Enter the access token timeout (e.g., '30m' for 30 minutes)", "access_token_timeout", validator=TimeoutFormatValidator(), default="30m")
-            self.promptForString("Enter the refresh token timeout (e.g., '12h' for 12 hours)", "refresh_token_timeout", validator=TimeoutFormatValidator(), default="12h")
-            self.promptForString("Enter the default Identity Provider (IDP)", "default_idp", default="local")
-            self.yesOrNo("Enable seamless login?", param="seamless_login")
+        if self.yesOrNo("Configure SSO properties"):
+            self.promptForInt("Idle session logout timer (seconds)", "idle_timeout")
+            self.promptForString("Session timeout (e.g. '12h' for 12 hours)", "idp_session_timeout", validator=TimeoutFormatValidator())
+            self.promptForString("Access token timeout (e.g. '30m' for 30 minutes)", "access_token_timeout", validator=TimeoutFormatValidator())
+            self.promptForString("Refresh token timeout (e.g. '12h' for 12 hours)", "refresh_token_timeout", validator=TimeoutFormatValidator())
+            self.promptForString("Default Identity Provider", "default_idp")
+
+            self.promptForString("SSO cookie name", "sso_cookie_name")
+            self.yesOrNo("Enable seamless login", "seamless_login")
+            self.yesOrNo("Allow default SSO cookie name", "allow_default_sso_cookie_name")
+            self.yesOrNo("Use only custom cookie name", "use_only_custom_cookie_name")
+            self.yesOrNo("Disable LDAP cookie", "disable_ldap_cookie")
+            self.yesOrNo("Allow custom cache key", "allow_custom_cache_key")
 
     def configMAS(self):
         self.printH1("Configure MAS Instance")

{mas_cli-10.4.2 → mas_cli-10.4.4}/src/mas/cli/install/settings/manageSettings.py

@@ -8,6 +8,9 @@
 #
 # *****************************************************************************
 
+import logging
+logger = logging.getLogger(__name__)
+
 class ManageSettingsMixin():
 
     def arcgisSettings(self) -> None:
@@ -82,6 +85,7 @@ class ManageSettingsMixin():
             if self.yesOrNo(" - Tririga"): self.params["mas_appws_components"] += ",tririga=latest"
             if self.yesOrNo(" - Utilities"): self.params["mas_appws_components"] += ",utilities=latest"
             if self.yesOrNo(" - Workday Applications"): self.params["mas_appws_components"] += ",workday=latest"
+            logger.debug(f"Generated mas_appws_components = {self.params['mas_appws_components']}")
 
             if ",icd=" in self.params["mas_appws_components"]:
                 self.printH2("Maximo IT License Terms")
@@ -97,7 +101,6 @@ class ManageSettingsMixin():
         self.printH2("Maximo Manage Settings - Database")
         self.printDescription(["Customise the schema, tablespace, indexspace, and encryption settings used by Manage"])
 
-        self.params["mas_appws_components"] = "base=latest,health=latest"
         if self.yesOrNo("Customize database settings"):
             self.promptForString("Schema", "mas_app_settings_db2_schema", default="maximo")
             self.promptForString("Tablespace", "mas_app_settings_db2_tablespace", default="MAXDATA")