mas-cli 10.0.1__tar.gz → 10.0.3__tar.gz

{mas_cli-10.0.1 → mas_cli-10.0.3}/PKG-INFO

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

{mas_cli-10.0.1 → mas_cli-10.0.3}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "10.0.1"
+__version__ = "10.0.3"

{mas_cli-10.0.1 → mas_cli-10.0.3}/src/mas/cli/install/settings/additionalConfigs.py

@@ -67,8 +67,7 @@ class AdditionalConfigsMixin():
             self.printDescription([
                 "The CLI supports two pod template profiles out of the box that allow you to reconfigure MAS for either a guaranteed or best effort QoS level",
                 "For more information about the Kubernetes quality of service (QoS) levels, see https://kubernetes.io/docs/concepts/workloads/pods/pod-qos/",
-                "You may also choose to use your own customized pod template definitions",
-                ""
+                "You may also choose to use your own customized pod template definitions"
             ])
 
             if not self.yesOrNo("Use pod templates"):
@@ -79,8 +78,7 @@ class AdditionalConfigsMixin():
                 "",
                 "1. Guaranteed QoS",
                 "2. Best Effort QoS",
-                "3. Custom",
-                ""
+                "3. Custom"
             ])
 
             podTemplateChoice = self.promptForInt("Select pod templates profile")

{mas_cli-10.0.1 → mas_cli-10.0.3}/src/mas/cli/install/settings/db2Settings.py

@@ -104,7 +104,7 @@ class Db2SettingsMixin():
                         "  1. DB2 Warehouse (Default option)",
                         "  2. DB2 Online Transactional Processing (OLTP)"
                     ])
-                    self.promptForListSelect(message="Select the Manage dedicated DB2 instance type", options=["db2wh", "db2oltp"], param="db2oltp", default="db2wh")
+                    self.promptForListSelect(message="Select the Manage dedicated DB2 instance type", options=["db2wh", "db2oltp"], param="db2_type", default="1")
                 else:
                     workspaceId = self.getParam("mas_workspace_id")
                     self.setParam("db2_action_manage", "byo")

{mas_cli-10.0.1 → mas_cli-10.0.3}/src/mas/cli/install/settings/kafkaSettings.py

@@ -18,8 +18,7 @@ class KafkaSettingsMixin():
             self.printDescription([
                 "Maximo IoT requires a shared system-scope Kafka instance",
                 "Supported Kafka providers: Strimzi, Red Hat AMQ Streams, IBM Cloud Event Streams and AWS MSK",
-                "You may also choose to configure MAS to use an existing Kafka instance by providing a pre-existing configuration file",
-                ""
+                "You may also choose to configure MAS to use an existing Kafka instance by providing a pre-existing configuration file"
             ])
             if self.yesOrNo("Create system Kafka instance using one of the supported providers"):
                 self.setParam("kafka_action_system", "install")
@@ -30,8 +29,7 @@ class KafkaSettingsMixin():
                     "  1. Strimzi (opensource)",
                     "  2. Red Hat AMQ Streams (requires a separate license)",
                     "  3. IBM Cloud Event Streams (paid IBM Cloud service)",
-                    "  4. AWS MSK (paid AWS service)",
-                    ""
+                    "  4. AWS MSK (paid AWS service)"
                 ])
                 self.promptForListSelect("Select Kafka provider", ["strimzi", "redhat", "ibm", "aws"], "kafka_provider")
 
@@ -41,8 +39,7 @@ class KafkaSettingsMixin():
                         "Strimzi: Cluster Version",
                         "The version of the Strimzi operator available on your cluster will determine the supported versions of Kafka that can be deployed.",
                         " - If you are using the latest available operator catalog then the default version below can be accepted",
-                        " - If you are using older operator catalogs (e.g. in a disconnected install) you should confirm the supported versions in your OperatorHub",
-                        ""
+                        " - If you are using older operator catalogs (e.g. in a disconnected install) you should confirm the supported versions in your OperatorHub"
                     ])
                     self.promptForString("Install namespace", "kafka_namespace", default="strimzi")
                     self.promptForString("Kafka version", "kafka_version", default="3.7.0")
@@ -53,8 +50,7 @@ class KafkaSettingsMixin():
                         "Red Hat AMQ Streams: Cluster Version",
                         "The version of the Red Hat AMQ Streams operator available on your cluster will determine the supported versions of Kafka that can be deployed.",
                         " - If you are using the latest available operator catalog then the default version below can be accepted",
-                        " - If you are using older operator catalogs (e.g. in a disconnected install) you should confirm the supported versions in your OperatorHub",
-                        ""
+                        " - If you are using older operator catalogs (e.g. in a disconnected install) you should confirm the supported versions in your OperatorHub"
                     ])
                     self.promptForString("Install namespace", "kafka_namespace", default="amq-streams")
                     self.promptForString("Kafka version", "kafka_version", default="3.5.0")
@@ -72,8 +68,7 @@ class KafkaSettingsMixin():
                         "While provisioning the AWS MSK instance, you will be required to provide the AWS Virtual Private Cloud ID and subnet details",
                         "where your instance will be deployed to properly configure inbound and outbound connectivity.",
                         "You should be able to find these information inside your VPC and subnet configurations in the target AWS account.",
-                        "For more details about AWS subnet/CIDR configuration, refer: https://docs.aws.amazon.com/vpc/latest/userguide/subnet-sizing.html",
-                        ""
+                        "For more details about AWS subnet/CIDR configuration, refer: https://docs.aws.amazon.com/vpc/latest/userguide/subnet-sizing.html"
                     ])
                     self.promptForString("AWS Access Key ID", "aws_access_key_id", isPassword=True)
                     self.promptForString("AWS Secret Access Key" "aws_secret_access_key", isPassword=True)

{mas_cli-10.0.1 → mas_cli-10.0.3}/src/mas/cli/install/settings/manageSettings.py

@@ -104,10 +104,10 @@ class ManageSettingsMixin():
             self.promptForString("Indexspace", "mas_app_settings_db2_indexspace", default="MAXINDEX")
 
             if self.yesOrNo("Customize database encryption settings"):
-                self.promptForString("MXE_SECURITY_CRYPTO_KEY", "mxe_security_crypto_key")
-                self.promptForString("MXE_SECURITY_CRYPTOX_KEY", "mxe_security_cryptox_key")
-                self.promptForString("MXE_SECURITY_OLD_CRYPTO_KEY", "mxe_security_old_crypto_key")
-                self.promptForString("MXE_SECURITY_OLD_CRYPTOX_KEY", "mxe_security_old_cryptox_key")
+                self.promptForString("MXE_SECURITY_CRYPTO_KEY", "mas_app_settings_crypto_key")
+                self.promptForString("MXE_SECURITY_CRYPTOX_KEY", "mas_app_settings_cryptox_key")
+                self.promptForString("MXE_SECURITY_OLD_CRYPTO_KEY", "mas_app_settings_old_crypto_key")
+                self.promptForString("MXE_SECURITY_OLD_CRYPTOX_KEY", "mas_app_settings_old_cryptox_key")
                 self.yesOrNo("Override database encryption secrets with provided keys", "mas_app_settings_override_encryption_secrets_flag")
 
     def manageSettingsServerBundleConfig(self) -> None:
@@ -166,7 +166,7 @@ class ManageSettingsMixin():
                 self.promptForString("Password", "mas_app_settings_customization_archive_password", isPassword=True)
 
     def manageSettingsDemodata(self) -> None:
-        self.yesOrNo("Create demo data", "masp_app_settings_demodata")
+        self.yesOrNo("Create demo data", "mas_app_settings_demodata")
 
     def manageSettingsTimezone(self) -> None:
         self.promptForString("Manage server timezone", "mas_app_settings_server_timezone", default="GMT")

{mas_cli-10.0.1 → mas_cli-10.0.3}/src/mas/cli/install/summarizer.py

@@ -36,7 +36,7 @@ class InstallSummarizerMixin():
     def icrSummary(self) -> None:
         self.printH2("IBM Container Registry Credentials")
         self.printSummary("IBM Entitlement Key", f"{self.params['ibm_entitlement_key'][0:8]}<snip>")
-        if self.args.dev_mode:
+        if self.devMode:
             self.printSummary("Artifactory Username", self.params['artifactory_username'])
             self.printSummary("Artifactory Token", f"{self.params['artifactory_token'][0:8]}<snip>")