mas-cli 11.10.0__tar.gz → 11.11.0__tar.gz

{mas_cli-11.10.0 → mas_cli-11.11.0}/PKG-INFO

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

{mas_cli-11.10.0 → mas_cli-11.11.0}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "11.10.0"  # Python module compatible semver
+__version__ = "11.11.0"  # Python module compatible semver

{mas_cli-11.10.0 → mas_cli-11.11.0}/src/mas/cli/cli.py

@@ -25,7 +25,7 @@ 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, PromptSession
+from prompt_toolkit import prompt, print_formatted_text, HTML
 
 from mas.devops.mas import isAirgapInstall
 from mas.devops.ocp import connect, isSNO, getNodes
@@ -117,7 +117,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version = "11.10.0"
+        self.version = "11.11.0"
         self.h1count = 0
         self.h2count = 0
 
@@ -173,7 +173,6 @@ class BaseApp(PrintMixin, PromptMixin):
                 "visualinspection": ["8.8.x", "8.7.x"]
             }
         }
-        self.promptSession = PromptSession()
 
         self.spinner = {
             "interval": 80,

{mas_cli-11.10.0 → mas_cli-11.11.0}/src/mas/cli/displayMixins.py

@@ -9,7 +9,7 @@
 # *****************************************************************************
 
 from os import getenv
-from prompt_toolkit import prompt, print_formatted_text, HTML
+from prompt_toolkit import prompt, print_formatted_text, HTML, PromptSession
 from prompt_toolkit.completion import WordCompleter
 from prompt_toolkit.validation import Validator
 
@@ -91,9 +91,10 @@ class PromptMixin():
             default = getenv(param.upper(), default="")
 
         if completer is not None:
-            response = self.promptSession.prompt(masPromptValue(message), is_password=isPassword, default=default, completer=completer, validator=validator, validate_while_typing=False, pre_run=self.promptSession.default_buffer.start_completion)
+            promptSession = PromptSession()
+            response = promptSession.prompt(masPromptValue(message), is_password=isPassword, default=default, completer=completer, validator=validator, validate_while_typing=False, pre_run=promptSession.default_buffer.start_completion)
         else:
-            response = self.promptSession.prompt(masPromptValue(message), is_password=isPassword, default=default, completer=completer, validator=validator, validate_while_typing=False)
+            response = prompt(masPromptValue(message), is_password=isPassword, default=default, completer=completer, validator=validator, validate_while_typing=False)
 
         if param is not None:
             self.params[param] = response

{mas_cli-11.10.0 → mas_cli-11.11.0}/src/mas/cli/install/app.py

@@ -263,8 +263,6 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 catalogCompleter = WordCompleter(self.catalogOptions)
                 catalogSelection = self.promptForString("Select catalog", completer=catalogCompleter)
                 self.setParam("mas_catalog_version", catalogSelection)
-
-                self.chosenCatalog = getCatalog(self.getParam("mas_catalog_version"))
             else:
                 self.printDescription([
                     f"The IBM Maximo Operator Catalog is already installed in this cluster ({catalogInfo['catalogId']}).  If you wish to install MAS using a newer version of the catalog please first update the catalog using mas update."
@@ -342,8 +340,9 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
     @logMethodCall
     def configCP4D(self):
         if self.getParam("mas_catalog_version") in self.catalogOptions:
+            # Note: this will override any version provided by the user (which is intentional!)
             logger.debug(f"Using automatic CP4D product version: {self.getParam('cpd_product_version')}")
-            self.setParam("cpd_product_version", self.catalogInfo["cpd_product_version_default"])
+            self.setParam("cpd_product_version", self.chosenCatalog["cpd_product_version_default"])
         elif self.getParam("cpd_product_version") == "":
             if self.noConfirm:
                 self.fatalError("Cloud Pak for Data version must be set manually, but --no-confirm has been set without setting --cp4d-version")
@@ -970,6 +969,9 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 print(f"Unknown option: {key} {value}")
                 self.fatalError(f"Unknown option: {key} {value}")
 
+        # Load the catalog information
+        self.chosenCatalog = getCatalog(self.getParam("mas_catalog_version"))
+
         # Once we've processed the inputs, we should validate the catalog source & prompt to accept the license terms
         if not self.devMode:
             self.validateCatalogSource()