mas-cli 10.0.2__py3-none-any.whl → 10.0.3__py3-none-any.whl

mas/cli/__init__.py

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

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/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/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/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/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>")
 

mas/cli/templates/ibm-mas-tekton.yaml

@@ -108,7 +108,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - appconnect
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -226,7 +226,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - arcgis
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -296,7 +296,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cert_manager
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -359,7 +359,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - common_services
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -454,7 +454,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -569,7 +569,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -689,7 +689,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -806,7 +806,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -912,7 +912,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1234,7 +1234,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - db2
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1337,7 +1337,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - eck
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -1426,7 +1426,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - gencfg_workspace
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1478,7 +1478,7 @@ spec:
 
   steps:
     - name: grafana
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -1612,7 +1612,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ibm_catalogs
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -1719,7 +1719,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -1961,7 +1961,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1988,7 +1988,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -2093,7 +2093,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -2287,7 +2287,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - mongodb
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -2330,7 +2330,7 @@ spec:
         - $(params.base_output_dir)
         - --extra-namespaces
         - selenium
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -2447,7 +2447,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - nvidia_gpu
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -2526,7 +2526,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_deprovision
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/ocp-verify-all.yaml
@@ -2558,7 +2558,7 @@ spec:
     # Verify Cluster
     # -------------------------------------------------------------------------
     - name: ocp-verify-cluster
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -2600,7 +2600,7 @@ spec:
     # Verify Catalogs
     # -------------------------------------------------------------------------
     - name: ocp-verify-catalogs
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -2642,7 +2642,7 @@ spec:
     # Verify Subscriptions
     # -------------------------------------------------------------------------
     - name: ocp-verify-subscriptions
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -2684,7 +2684,7 @@ spec:
     # Verify Workloads
     # -------------------------------------------------------------------------
     - name: ocp-verify-workloads
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -2726,7 +2726,7 @@ spec:
     # Verify Catalogs - Ingress TLS
     # -------------------------------------------------------------------------
     - name: ocp-verify-ingress
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -2852,7 +2852,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_verify
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -2920,7 +2920,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocs
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -3101,7 +3101,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - sls
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -3476,12 +3476,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_config
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set CONFIGMAP_KEY=pending and wait for it to be changed to "approved"
     - name: app-cfg-post-verify
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -3682,7 +3682,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_install
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -3771,7 +3771,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_rollback
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -3834,7 +3834,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_uninstall
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -3909,7 +3909,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_upgrade
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -4010,7 +4010,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_verify
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -4153,7 +4153,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_certs
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -4220,7 +4220,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_config
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -4291,7 +4291,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_manage
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -4481,7 +4481,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_dns
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -4661,7 +4661,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_install
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -4749,7 +4749,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_rollback
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -4814,7 +4814,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_uninstall
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -4884,7 +4884,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_upgrade
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -4946,12 +4946,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_verify
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-suite-verify exists then set CONFIGMAP_KEY=pending and wait for it to be changed to "approved"
     - name: suite-post-verify
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -5080,7 +5080,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - turbonomic
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -5161,7 +5161,7 @@ spec:
     # IBM User Data Services (UDS)
     # -------------------------------------------------------------------------
     - name: uds
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -5224,7 +5224,7 @@ spec:
     # IBM Data Reporter Operator (DRO)
     # -------------------------------------------------------------------------
     - name: dro
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -5310,7 +5310,7 @@ spec:
 
   steps:
     - name: update-configmap
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       command:
         - /opt/app-root/src/update-configmap.sh
       env:
@@ -5372,7 +5372,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -5436,7 +5436,7 @@ spec:
 
   steps:
     - name: wait
-      image: quay.io/ibmmas/cli:10.0.2
+      image: quay.io/ibmmas/cli:10.0.3
       command:
         - /opt/app-root/src/wait-for-tekton.sh
       env:

{mas_cli-10.0.2.data → mas_cli-10.0.3.data}/scripts/mas-install

@@ -46,23 +46,23 @@ from mas.devops.tekton import installOpenShiftPipelines, updateTektonDefinitions
 
 logger = logging.getLogger(__name__)
 
+
 class App(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGeneratorMixin):
     def validateCatalogSource(self):
         catalogsAPI = self.dynamicClient.resources.get(api_version="operators.coreos.com/v1alpha1", kind="CatalogSource")
         try:
             catalog = catalogsAPI.get(name="ibm-operator-catalog", namespace="openshift-marketplace")
             catalogDisplayName = catalog.spec.displayName
-            catalogImage = catalog.spec.image
 
             m = re.match(r".+(?P<catalogId>v[89]-(?P<catalogVersion>[0-9]+)-amd64)", catalogDisplayName)
             if m:
                 # catalogId = v8-yymmdd-amd64
                 # catalogVersion = yymmdd
                 catalogId = m.group("catalogId")
-                catalogVersion = m.group("catalogVersion")
             elif re.match(r".+v8-amd64", catalogDisplayName):
                 catalogId = "v8-amd64"
-                catalogVersion = "v8-amd64"
+            else:
+                self.fatalError(f"IBM Maximo Operator Catalog is already installed on this cluster. However, it is not possible to identify its version. If you wish to install a new MAS instance using the {self.getParam('mas_catalog_version')} catalog please first run 'mas update' to switch to this catalog, this will ensure the appropriate actions are performed as part of the catalog update")
 
             if catalogId != self.getParam("mas_catalog_version"):
                 self.fatalError(f"IBM Maximo Operator Catalog {catalogId} is already installed on this cluster, if you wish to install a new MAS instance using the {self.getParam('mas_catalog_version')} catalog please first run 'mas update' to switch to this catalog, this will ensure the appropriate actions are performed as part of the catalog update")
@@ -109,7 +109,7 @@ class App(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGenerator
                     exit(1)
 
     def configICR(self):
-        if self.args.dev_mode:
+        if self.devMode:
             self.setParam("mas_icr_cp", "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local")
             self.setParam("mas_icr_cpopen", "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/cpopen")
             self.setParam("sls_icr_cpopen", "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/cpopen")
@@ -121,7 +121,7 @@ class App(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGenerator
     def configICRCredentials(self):
         self.printH1("Configure IBM Container Registry")
         self.promptForString("IBM entitlement key", "ibm_entitlement_key", isPassword=True)
-        if self.args.dev_mode:
+        if self.devMode:
             self.promptForString("Artifactory username", "artifactory_username", isPassword=True)
             self.promptForString("Artifactory token", "artifactory_token", isPassword=True)
 
@@ -132,9 +132,9 @@ class App(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGenerator
 
     def configCatalog(self):
         self.printH1("IBM Maximo Operator Catalog Selection")
-        if self.args.dev_mode:
+        if self.devMode:
             self.promptForString("Select catalog source", "mas_catalog_version", default="v9-master-amd64")
-            self.promptForString("Select channel", "mas_channel", default="9.0.x-dev")
+            self.promptForString("Select channel", "mas_channel", default="9.1.x-dev")
         else:
             print(tabulate(self.installOptions, headers="keys", tablefmt="simple_grid"))
             catalogSelection = self.promptForInt("Select catalog and release", default=1)
@@ -199,7 +199,7 @@ class App(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGenerator
             " - Must start with a lowercase letter",
             " - Must end with a lowercase letter or a number"
         ])
-        self.promptForString("Instance ID", "mas_instance_id", validator=InstanceIDFormatValidator(), default="dev1")
+        self.promptForString("Instance ID", "mas_instance_id", validator=InstanceIDFormatValidator())
         self.printDescription([
             "",
             "Workspace ID restrictions:",
@@ -207,13 +207,13 @@ class App(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGenerator
             " - Must only use lowercase letters and numbers",
             " - Must start with a lowercase letter"
         ])
-        self.promptForString("Workspace ID", "mas_workspace_id", validator=WorkspaceIDFormatValidator(), default="ws1")
+        self.promptForString("Workspace ID", "mas_workspace_id", validator=WorkspaceIDFormatValidator())
         self.printDescription([
             "",
             "Workspace display name restrictions:",
             " - Must be 3-300 characters long"
         ])
-        self.promptForString("Workspace name", "mas_workspace_name", validator=WorkspaceNameFormatValidator(), default="My Workspace")
+        self.promptForString("Workspace name", "mas_workspace_name", validator=WorkspaceNameFormatValidator())
 
         self.configOperationMode()
         self.configCATrust()
@@ -513,8 +513,9 @@ class App(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGenerator
 
         # Catalog
         self.configCatalog()
-        self.validateCatalogSource()
-        self.licensePrompt()
+        if not self.devMode:
+            self.validateCatalogSource()
+            self.licensePrompt()
 
         # SNO & Storage Classes
         self.configSNO()
@@ -772,19 +773,28 @@ class App(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGenerator
                 self.fatalError(f"Unknown option: {key} {value}")
 
         # Once we've processed the inputs, we should validate the catalog source & prompt to accept the license terms
-        self.validateCatalogSource()
-        self.licensePrompt()
+        if not self.devMode:
+            self.validateCatalogSource()
+            self.licensePrompt()
 
     def install(self, args):
         """
         Install MAS instance
         """
+        # We use the presence of --mas-instance-id to determine whether
+        # the CLI is being started in interactive mode or not
         instanceId = args.mas_instance_id
+
+        # Properties for arguments that control the behavior of the CLI
         self.noConfirm = args.no_confirm
         self.waitForPVC = not args.no_wait_for_pvc
         self.licenseAccepted = args.accept_license
+        self.devMode = args.dev_mode
 
+        # Store all args
         self.args = args
+
+        # Initialize the dictionary that will hold the parameters we pass to the PipelineRun
         self.params = dict()
 
         # These flags work for setting params in both interactive and non-interactive modes

{mas_cli-10.0.2.dist-info → mas_cli-10.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mas-cli
-Version: 10.0.2
+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.2.dist-info → mas_cli-10.0.3.dist-info}/RECORD

@@ -1,18 +1,18 @@
-mas/cli/__init__.py,sha256=OcUv_utZ5qbE4a-mn1Ab1qSEVugcBeUrflAdwSmasUs,491
+mas/cli/__init__.py,sha256=6TJeFps4uhVhYn9GysykL6dGp5U6fzKfKnGlYIlXDzE,491
 mas/cli/cli.py,sha256=DEIMWmIt0dyhmJL2CDWHABRx3AG61LSZr10UBxNbDmY,8355
 mas/cli/displayMixins.py,sha256=Dcr-q02wjGA9Mec2nGqZD42vWKyjqLtmh92s2ZhWHZw,5013
 mas/cli/gencfg.py,sha256=57ik5x73gQBFXPl_8h2byXmV_vhCgxfeSDZk4Wg5-Pw,2102
 mas/cli/validators.py,sha256=5QwiDQn2EIqJABJyDbHGGaSvlkE38IeJ98d1Czz682A,4550
 mas/cli/install/__init__.py,sha256=55HhFzQjZrWuEIYRC5-fyGRpiMmC5g17MZJlH9_w7rk,467
 mas/cli/install/argParser.py,sha256=AEbodAediMlIGHtOE-jlLSKILcqSKCbOix7o2iTI6xY,18766
-mas/cli/install/summarizer.py,sha256=iDdyiYkgGgLeYfl5asDkmGRUXAYGZAMPxF1PIGjF74c,17781
+mas/cli/install/summarizer.py,sha256=e5jPnitbFZJTjJJL0wPlWTSTCoNuBF-9jF08bDfgxy8,17775
 mas/cli/install/settings/__init__.py,sha256=eGdNVHVALUxJlZyGYkBet8LbHvVfa-1UjL_8Zl3d-lY,953
-mas/cli/install/settings/additionalConfigs.py,sha256=ewwZew58q0k5AL3jxz8Uw8KxbM4ZPFZmYn_Sp3PiffM,6840
-mas/cli/install/settings/db2Settings.py,sha256=R5g_Mxiu27ilP1eHikSgvuPsdsCbE660om6bi9i71M4,10716
-mas/cli/install/settings/kafkaSettings.py,sha256=OJ5JRR_6f0PiXNfCJoZdurO2WGjGPBfRUpFdspm37Os,7125
-mas/cli/install/settings/manageSettings.py,sha256=LTink4BKos2s4wVw2J9Z2kGFC5xGhgtFmTtCIXkj5rs,13214
+mas/cli/install/settings/additionalConfigs.py,sha256=YNEISHlFNXnhX1gwFSVG3OBdHsuT9OJ5oZRTC7RqSVI,6800
+mas/cli/install/settings/db2Settings.py,sha256=mR0XL81Talvwvm1bekw0o9VOwV42QkS0jMyp055bx5U,10713
+mas/cli/install/settings/kafkaSettings.py,sha256=bjAji5OZfSBpttiYHKM5B5Lvva8L8PUzi8QSs6opQcE,6997
+mas/cli/install/settings/manageSettings.py,sha256=3HtyR6-DKiKQDFTWnnxAr5OmkfqKwjI4xnBaAcAjOCI,13229
 mas/cli/install/settings/turbonomicSettings.py,sha256=OC-sn6_Z6MAq0kf33OC3c96gqT8FT4P7A51PenPiCXw,1368
-mas/cli/templates/ibm-mas-tekton.yaml,sha256=GMuhGZaty9YtjOCanuECz28zQ2amrdEqdajKgBntmts,335567
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=Trs-lCV8oPkkTqGHRPbo0M64DMJ_wXsipOj9sWrGdC4,335567
 mas/cli/templates/jdbccfg.yml.j2,sha256=cANbwkUkKEPQp-P3_BB_Llbt94457Ciagah2hOdySIM,1644
 mas/cli/templates/pod-templates/best-effort/ibm-data-dictionary-assetdatadictionary.yml,sha256=8VG_FDFcEjWNaAOZTcS58Pe0tWOXC10SJLloNqzEMC8,757
 mas/cli/templates/pod-templates/best-effort/ibm-mas-bascfg.yml,sha256=rkq8c2pVJoskgict9tCZzCchGSE2MBC-dJ47JyMYm7A,1559
@@ -85,10 +85,10 @@ mas/cli/templates/pod-templates/guaranteed/ibm-mas-suite.yml,sha256=aB-buCWUAqD0
 mas/cli/templates/pod-templates/guaranteed/ibm-mas-visualinspection.yml,sha256=NiXBlXKe3j2RvroEcx3kCSuD92G6WB-jcpNAYGAg3T0,1975
 mas/cli/templates/pod-templates/guaranteed/ibm-sls-licenseservice.yml,sha256=CKt1yim4L3ClloVcQDHiXLD8EMvmKXIltmDxJTxNdDs,546
 mas/cli/templates/pod-templates/saas-essentials/ibm-mas-visualinspection.yml,sha256=4skVNh-8HG55ik0O0QG4jAwiQBRxxrPSRaUwllPYZ_I,1270
-mas_cli-10.0.2.data/scripts/mas-install,sha256=JqKAViyFINb782T7s_tqxQSgrkUT9Drn41QMsM8fbSM,46118
-mas_cli-10.0.2.data/scripts/mas-uninstall,sha256=U4eZcs8UHo3K_h4VyQURMJ4P8OoZZKBOvTUSd7vWaQI,13217
-mas_cli-10.0.2.data/scripts/mas-upgrade,sha256=piUrsPtEZR_LWPkK6p1j_mQK3Cg-SNyTTcxGgHGFYqc,6900
-mas_cli-10.0.2.dist-info/METADATA,sha256=6UGcQggFjktSA2f3QI6naQ-cKSym3nE3nISFcqLY6A8,2076
-mas_cli-10.0.2.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-mas_cli-10.0.2.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-10.0.2.dist-info/RECORD,,
+mas_cli-10.0.3.data/scripts/mas-install,sha256=ZYxwFL8QXy9KBSzQayMrp1HWA-zDlUJsI8DKtiP8pWU,46748
+mas_cli-10.0.3.data/scripts/mas-uninstall,sha256=U4eZcs8UHo3K_h4VyQURMJ4P8OoZZKBOvTUSd7vWaQI,13217
+mas_cli-10.0.3.data/scripts/mas-upgrade,sha256=piUrsPtEZR_LWPkK6p1j_mQK3Cg-SNyTTcxGgHGFYqc,6900
+mas_cli-10.0.3.dist-info/METADATA,sha256=pyD7wkYCcalNlJBp27JEKvg1AWuE_fMLXTAR_DCkYpo,2076
+mas_cli-10.0.3.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+mas_cli-10.0.3.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-10.0.3.dist-info/RECORD,,