mas-cli 10.4.3__tar.gz → 10.4.5__tar.gz

{mas_cli-10.4.3 → mas_cli-10.4.5}/PKG-INFO

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

{mas_cli-10.4.3 → mas_cli-10.4.5}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "10.4.3"
+__version__ = "10.4.5"

{mas_cli-10.4.3 → mas_cli-10.4.5}/src/mas/cli/cli.py

@@ -13,13 +13,13 @@ import urllib3
 
 from argparse import RawTextHelpFormatter
 from shutil import which
-from os import path
+from os import path, environ
 from sys import exit
 
 # Use of the openshift client rather than the kubernetes client allows us access to "apply"
-from openshift import dynamic
 from kubernetes import config
-from kubernetes.client import api_client
+from kubernetes.client import api_client, Configuration
+from openshift.dynamic import DynamicClient
 from openshift.dynamic.exceptions import NotFoundError
 
 from prompt_toolkit import prompt, print_formatted_text, HTML
@@ -177,13 +177,19 @@ class BaseApp(PrintMixin, PromptMixin):
         """
         logger.debug("Reloading Kubernetes Client Configuration")
         try:
-            config.load_kube_config()
-            self._dynClient = dynamic.DynamicClient(
-                api_client.ApiClient(configuration=config.load_kube_config())
-            )
+            if "KUBERNETES_SERVICE_HOST" in environ:
+                config.load_incluster_config()
+                k8s_config = Configuration.get_default_copy()
+                self._apiClient = api_client.ApiClient(configuration=k8s_config)
+                self._dynClient = DynamicClient(self._apiClient)
+            else:
+                config.load_kube_config()
+                self._apiClient = api_client.ApiClient()
+                self._dynClient = DynamicClient(self._apiClient)
             return self._dynClient
         except Exception as e:
             logger.warning(f"Error: Unable to connect to OpenShift Container Platform: {e}")
+            logger.exception(e, stack_info=True)
             return None
 
     def connect(self):
@@ -212,7 +218,8 @@ class BaseApp(PrintMixin, PromptMixin):
             # Prompt for new connection properties
             server = prompt(HTML('<Yellow>Server URL:</Yellow> '), placeholder="https://...")
             token = prompt(HTML('<Yellow>Login Token:</Yellow> '), is_password=True, placeholder="sha256~...")
-            connect(server, token)
+            skipVerify = self.yesOrNo('Disable TLS Verify')
+            connect(server, token, skipVerify)
             self.reloadDynamicClient()
             if self._dynClient is None:
                 print_formatted_text(HTML("<Red>Unable to connect to cluster.  See log file for details</Red>"))

{mas_cli-10.4.3 → mas_cli-10.4.5}/src/mas/cli/displayMixins.py

@@ -108,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.3 → mas_cli-10.4.5}/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")

{mas_cli-10.4.3 → mas_cli-10.4.5}/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")