mas-cli 15.5.0__tar.gz → 15.6.1__tar.gz

{mas_cli-15.5.0 → mas_cli-15.6.1}/PKG-INFO

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

{mas_cli-15.5.0 → mas_cli-15.6.1}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "15.5.0"  # Python module compatible semver
+__version__ = "15.6.1"  # Python module compatible semver

{mas_cli-15.5.0 → mas_cli-15.6.1}/src/mas/cli/aiservice/install/app.py

@@ -24,6 +24,7 @@ from tabulate import tabulate
 from halo import Halo
 
 from ...cli import BaseApp
+from ...gencfg import ConfigGeneratorMixin
 from .argBuilder import aiServiceInstallArgBuilderMixin
 from .argParser import aiServiceinstallArgParser
 from .summarizer import aiServiceInstallSummarizerMixin
@@ -74,7 +75,7 @@ def logMethodCall(func):
     return wrapper
 
 
-class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceInstallSummarizerMixin, MongoDbSettingsMixin, Db2SettingsMixin, AdditionalConfigsMixin):
+class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceInstallSummarizerMixin, MongoDbSettingsMixin, Db2SettingsMixin, AdditionalConfigsMixin, ConfigGeneratorMixin):
     @logMethodCall
     def processCatalogChoice(self) -> list:
         self.catalogDigest = self.chosenCatalog["catalog_digest"]
@@ -759,8 +760,8 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
             for storageClass in getStorageClasses(self.dynamicClient):
                 print_formatted_text(HTML(f"<LightSlateGrey>  - {storageClass.metadata.name}</LightSlateGrey>"))
 
-            self.params["storage_class_rwo"] = prompt(HTML('<Yellow>ReadWriteOnce (RWO) storage class</Yellow> '), validator=StorageClassValidator(), validate_while_typing=False)
-            self.params["storage_class_rwx"] = prompt(HTML('<Yellow>ReadWriteMany (RWX) storage class</Yellow> '), validator=StorageClassValidator(), validate_while_typing=False)
+            self.params["storage_class_rwo"] = prompt(message=HTML('<Yellow>ReadWriteOnce (RWO) storage class</Yellow> '), validator=StorageClassValidator(), validate_while_typing=False)
+            self.params["storage_class_rwx"] = prompt(message=HTML('<Yellow>ReadWriteMany (RWX) storage class</Yellow> '), validator=StorageClassValidator(), validate_while_typing=False)
 
         # Configure storage class for pipeline PVC
         # We prefer to use ReadWriteMany, but we can cope with ReadWriteOnce if necessary

{mas_cli-15.5.0 → mas_cli-15.6.1}/src/mas/cli/cli.py

@@ -21,7 +21,8 @@ import json
 
 # Use of the openshift client rather than the kubernetes client allows us access to "apply"
 from kubernetes import config
-from kubernetes.client import api_client, Configuration
+from kubernetes.client.api_client import ApiClient
+from kubernetes.client import Configuration
 from openshift.dynamic import DynamicClient
 from openshift.dynamic.exceptions import NotFoundError
 
@@ -117,7 +118,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version = "15.5.0"
+        self.version = "15.6.1"
         self.h1count = 0
         self.h2count = 0
 
@@ -337,11 +338,11 @@ class BaseApp(PrintMixin, PromptMixin):
             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._apiClient = ApiClient(configuration=k8s_config)
                 self._dynClient = DynamicClient(self._apiClient)
             else:
                 config.load_kube_config()
-                self._apiClient = api_client.ApiClient()
+                self._apiClient = ApiClient()
                 self._dynClient = DynamicClient(self._apiClient)
             return self._dynClient
         except Exception as e:
@@ -430,3 +431,9 @@ class BaseApp(PrintMixin, PromptMixin):
         if enabled:
             logger.debug(f"Enabling approval workflow for {id} with {maxRetries} max retries on a {delay}s delay ({'ignoring failures' if ignoreFailure else 'abort on failure'})")
             cmAPI.create(body=configMap, namespace=namespace)
+
+    @logMethodCall
+    def selectLocalConfigDir(self) -> None:
+        if self.localConfigDir is None:
+            # You need to tell us where the configuration file can be found
+            self.localConfigDir = self.promptForDir("Select Local configuration directory")

{mas_cli-15.5.0 → mas_cli-15.6.1}/src/mas/cli/displayMixins.py

@@ -79,7 +79,7 @@ def masPromptValue(message):
 
 class PromptMixin():
     def yesOrNo(self, message: str, param: str = None) -> bool:
-        response = prompt(masPromptYesOrNo(message), validator=YesNoValidator(), validate_while_typing=False)
+        response = prompt(message=masPromptYesOrNo(message), validator=YesNoValidator(), validate_while_typing=False)
         responseAsBool = response.lower() in ["y", "yes"]
 
         if param is not None:
@@ -92,9 +92,9 @@ class PromptMixin():
 
         if completer is not None:
             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)
+            response = promptSession.prompt(message=masPromptValue(message), is_password=isPassword, default=default, completer=completer, validator=validator, validate_while_typing=False, pre_run=promptSession.default_buffer.start_completion)
         else:
-            response = prompt(masPromptValue(message), is_password=isPassword, default=default, completer=completer, validator=validator, validate_while_typing=False)
+            response = prompt(message=masPromptValue(message), is_password=isPassword, default=default, completer=completer, validator=validator, validate_while_typing=False)
 
         if param is not None:
             self.params[param] = response
@@ -105,9 +105,9 @@ class PromptMixin():
             default = getenv(param.upper(), default=None)
 
         if default is None:
-            response = int(prompt(masPromptValue(message)))
+            response = int(prompt(message=masPromptValue(message)))
         else:
-            response = int(prompt(masPromptValue(message), default=str(default)))
+            response = int(prompt(message=masPromptValue(message), default=str(default)))
         if param is not None:
             self.params[param] = str(response)
         return response
@@ -121,12 +121,12 @@ class PromptMixin():
         if default == "" and envVar != "":
             default = getenv(envVar, "")
         if mustExist:
-            return prompt(masPromptValue(message), validator=FileExistsValidator(), validate_while_typing=False, default=default)
+            return prompt(message=masPromptValue(message), validator=FileExistsValidator(), validate_while_typing=False, default=default)
         else:
-            return prompt(masPromptValue(message), default=default)
+            return prompt(message=masPromptValue(message), default=default)
 
     def promptForDir(self, message: str, mustExist: bool = True, default: str = "") -> None:
         if mustExist:
-            return prompt(masPromptValue(message), validator=DirectoryExistsValidator(), validate_while_typing=False, default=default)
+            return prompt(message=masPromptValue(message), validator=DirectoryExistsValidator(), validate_while_typing=False, default=default)
         else:
-            return prompt(masPromptValue(message), default=default)
+            return prompt(message=masPromptValue(message), default=default)

{mas_cli-15.5.0 → mas_cli-15.6.1}/src/mas/cli/install/app.py

@@ -325,12 +325,6 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         if self.showAdvancedOptions:
             self.promptForString("IBM Data Reporter Operator (DRO) Namespace", "dro_namespace", default="redhat-marketplace")
 
-    @logMethodCall
-    def selectLocalConfigDir(self) -> None:
-        if self.localConfigDir is None:
-            # You need to tell us where the configuration file can be found
-            self.localConfigDir = self.promptForDir("Select Local configuration directory")
-
     @logMethodCall
     def configGrafana(self) -> None:
         if self.architecture == "s390x" or self.architecture == "ppc64le":
@@ -1055,6 +1049,12 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                     self.setParam(key, value)
                     if value in ["jms", "snojms"]:
                         self.setParam("mas_app_settings_persistent_volumes_flag", "true")
+            elif key == "mas_app_settings_base_lang":
+                if value is not None and value != "":
+                    self.setParam(key, value.upper())
+            elif key == "mas_app_settings_secondary_langs":
+                if value is not None and value != "":
+                    self.setParam(key, value.upper())
 
             # MongoDB
             elif key == "mongodb_namespace":

{mas_cli-15.5.0 → mas_cli-15.6.1}/src/mas/cli/install/catalogs.py

@@ -9,18 +9,19 @@
 # *****************************************************************************
 supportedCatalogs = {
     "amd64": [
+        "v9-250902-amd64",
         "v9-250828-amd64",
         "v9-250731-amd64",
         "v9-250624-amd64",
-        "v9-250501-amd64",
     ],
     "s390x": [
+        "v9-250902-s390x",
         "v9-250828-s390x",
         "v9-250731-s390x",
         "v9-250624-s390x",
-        "v9-250501-s390x",
     ],
     "ppc64le": [
+        "v9-250902-ppc64le",
         "v9-250828-ppc64le",
         "v9-250731-ppc64le",
         "v9-250624-ppc64le",

{mas_cli-15.5.0 → mas_cli-15.6.1}/src/mas/cli/install/params.py

@@ -53,8 +53,6 @@ optionalParams = [
     "mas_app_settings_old_crypto_key",
     "mas_app_settings_old_cryptox_key",
     "mas_app_settings_override_encryption_secrets_flag",
-    "mas_app_settings_base_lang",
-    "mas_app_settings_secondary_langs",
     "mas_app_settings_server_timezone",
     "mas_appws_bindings_jdbc_manage",
     "mas_appws_components",

{mas_cli-15.5.0 → mas_cli-15.6.1}/src/mas/cli/install/settings/manageSettings.py

@@ -8,6 +8,8 @@
 #
 # *****************************************************************************
 
+from prompt_toolkit.completion import WordCompleter
+from mas.cli.validators import LanguageValidator
 import logging
 logger = logging.getLogger(__name__)
 
@@ -226,15 +228,18 @@ class ManageSettingsMixin():
         self.printDescription([
             f"Define the base language for Maximo {self.manageAppName}"
         ])
-        self.promptForString("Base language", "mas_app_settings_base_lang", default="EN")
+        baseLanguage = self.promptForString("Base language", validator=LanguageValidator(self.supportedLanguages), completer=WordCompleter(self.supportedLanguages))
+
+        self.setParam("mas_app_settings_base_lang", baseLanguage.upper())
 
         self.printDescription([
-            f"Define the additional languages to be configured in Maximo {self.manageAppName}. provide a comma-separated list of supported languages codes, for example: 'JA,DE,AR'",
+            f"Define the additional languages to be configured in Maximo {self.manageAppName}. Provide a comma-separated list of the supported languages indexes, for example: 'DA,EN,ZH-TW'",
             "A complete list of available language codes is available online:",
             "    <Orange><u>https://www.ibm.com/docs/en/mas-cd/mhmpmh-and-p-u/continuous-delivery?topic=deploy-language-support</u></Orange>"
         ])
 
-        self.promptForString("Secondary languages", "mas_app_settings_secondary_langs")
+        secondaryLanguages = self.promptForString("Secondary language", validator=LanguageValidator(self.supportedLanguages), completer=WordCompleter(self.supportedLanguages))
+        self.setParam("mas_app_settings_secondary_langs", secondaryLanguages.upper())
 
     def manageSettingsCP4D(self) -> None:
         if self.getParam("mas_app_channel_manage") in ["8.7.x", "9.0.x"] and self.showAdvancedOptions:
@@ -250,6 +255,7 @@ class ManageSettingsMixin():
 
     def manageSettingsOther(self) -> None:
         self.printH2(f"Maximo {self.manageAppName} Settings - Other")
+        self.supportedLanguages = ["AR", "CS", "DA", "DE", "EN", "ES", "FI", "FR", "HE", "HR", "HU", "IT", "JA", "KO", "NL", "NO", "PL", "PT-BR", "RU", "SK", "SL", "SV", "TR", "UK", "ZH-CN", "ZH-TW"]
         if self.isManageFoundation:
             self.printDescription([
                 "Configure additional settings:",