mas-cli 10.0.5__py3-none-any.whl → 10.0.6__py3-none-any.whl

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "10.0.5"
+__version__ = "10.0.6"

mas/cli/displayMixins.py

@@ -10,6 +10,7 @@
 
 from os import path, getenv
 from prompt_toolkit import prompt, print_formatted_text, HTML
+from prompt_toolkit.completion import WordCompleter
 from prompt_toolkit.validation import Validator
 
 from .validators import YesNoValidator, FileExistsValidator, DirectoryExistsValidator
@@ -71,11 +72,11 @@ class PromptMixin():
             self.params[param] = "true" if responseAsBool else "false"
         return responseAsBool
 
-    def promptForString(self, message: str, param: str=None, default: str="", isPassword: bool=False, validator: Validator=None) -> str:
+    def promptForString(self, message: str, param: str=None, default: str="", isPassword: bool=False, validator: Validator=None, completer: WordCompleter=None) -> str:
         if param is not None and default == "":
             default = getenv(param.upper(), default="")
 
-        response = prompt(masPromptValue(message), is_password=isPassword, default=default, 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
         return response

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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1478,7 +1478,7 @@ spec:
 
   steps:
     - name: grafana
-      image: quay.io/ibmmas/cli:10.0.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1988,7 +1988,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:10.0.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       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.5
+      image: quay.io/ibmmas/cli:10.0.6
       command:
         - /opt/app-root/src/wait-for-tekton.sh
       env:

{mas_cli-10.0.5.data → mas_cli-10.0.6.data}/scripts/mas-uninstall

@@ -13,18 +13,24 @@ import argparse
 import sys
 import logging
 import logging.handlers
-from prompt_toolkit import prompt, print_formatted_text, HTML
+from halo import Halo
+from prompt_toolkit import print_formatted_text, HTML
 from prompt_toolkit.completion import WordCompleter
 
-from halo import Halo
+from jinja2.exceptions import TemplateNotFound
+from urllib3.exceptions import MaxRetryError
+from openshift.dynamic.exceptions import NotFoundError, ResourceNotFoundError
+from kubeconfig.exceptions import KubectlCommandError
+from kubernetes.client.exceptions import ApiException
 
 from mas.cli import __version__ as packageVersion
 from mas.cli.cli import BaseApp, getHelpFormatter
-from mas.cli.validators import InstanceIDValidator, YesNoValidator
+from mas.cli.validators import InstanceIDValidator
+
 from mas.devops.ocp import createNamespace
 from mas.devops.mas import listMasInstances, verifyMasInstance
 from mas.devops.tekton import installOpenShiftPipelines, updateTektonDefinitions, launchUninstallPipeline
-from openshift.dynamic.exceptions import NotFoundError
+
 
 logger = logging.getLogger(__name__)
 
@@ -61,25 +67,35 @@ class App(BaseApp):
             logger.debug("MAS instance ID is set, so we assume already connected to the desired OCP")
 
         if self.dynamicClient is None:
-            print_formatted_text(HTML("<Red>Error: The Kubernetes dynamic Client is not available.  See log file for details</Red>"))
-            sys.exit(1)
+            self.fatalError("The Kubernetes dynamic Client is not available.  See log file for details")
 
         if instanceId is None:
             # Interactive mode
             self.printH1("Instance Selection")
-            print_formatted_text(HTML("<LightSlateGrey>Select a MAS instance to uninstall from the list below:</LightSlateGrey>"))
-            suites = listMasInstances(self.dynamicClient)
+            self.printDescription(["Select a MAS instance to uninstall from the list below:"])
+
             suiteOptions = []
-            for suite in suites:
-                print_formatted_text(HTML(f"- <u>{suite['metadata']['name']}</u> v{suite['status']['versions']['reconciled']}"))
-                suiteOptions.append(suite['metadata']['name'])
+            try:
+                suites = listMasInstances(self.dynamicClient)
+                for suite in suites:
+                    self.printDescription([f"- <u>{suite['metadata']['name']}</u> v{suite['status']['versions']['reconciled']}"])
+                    suiteOptions.append(suite['metadata']['name'])
+            except ResourceNotFoundError as e:
+                self.fatalError("No MAS instances were detected on the cluster (Suite.core.mas.ibm.com/v1 API is not available).  See log file for details")
+
+            if len(suiteOptions) == 0:
+                self.fatalError("No MAS instances were detected on the cluster (No instances of Suite.core.mas.ibm.com/v1 found).  See log file for details")
 
             suiteCompleter = WordCompleter(suiteOptions)
             print()
-            instanceId = prompt(HTML(f'<Yellow>Enter MAS instance ID: </Yellow>'), completer=suiteCompleter, validator=InstanceIDValidator(), validate_while_typing=False)
+            instanceId = self.promptForString("MAS instance ID", completer=suiteCompleter, validator=InstanceIDValidator())
 
             self.printH1("Uninstall MAS Dependencies")
-            uninstallCertManager = prompt(HTML(f'<Yellow>Uninstall Certificate Manager? </Yellow>'), validator=YesNoValidator()) in ["y", "yes"]
+            self.printDescription([
+                "If you choose to uninstall Certificate Manager, all other options will be automatically set to uninstall",
+                "Other workload on the cluster may be dependant on the Certificate Manager installation, so proceed with caution when choosing 'Yes'"
+            ])
+            uninstallCertManager = self.yesOrNo("Uninstall Certificate Manager")
             if uninstallCertManager:
                 # If you choose to uninstall Cert-Manager, everything will be uninstalled
                 uninstallGrafana = True
@@ -89,30 +105,30 @@ class App(BaseApp):
                 uninstallMongoDb = True
                 uninstallSLS = True
             else:
-                uninstallMongoDb = prompt(HTML(f'<Yellow>Uninstall MongoDb? </Yellow>'), validator=YesNoValidator()) in ["y", "yes"]
+                self.printDescription(["If you choose to uninstall MongoDb, IBM Suite License Service will be automatically set to uninstall as well"])
+                uninstallMongoDb = self.yesOrNo("Uninstall MongoDb")
                 if uninstallMongoDb:
                     # If you are removing MongoDb then SLS needs to be uninstalled too
                     uninstallSLS = True
                 else:
-                    uninstallSLS = prompt(HTML(f'<Yellow>Uninstall IBM Suite Licensing Service? </Yellow>'), validator=YesNoValidator()) in ["y", "yes"]
+                    uninstallSLS = self.yesOrNo("Uninstall IBM Suite Licensing Service")
 
-                uninstallGrafana = prompt(HTML(f'<Yellow>Uninstall Grafana? </Yellow>'), validator=YesNoValidator()) in ["y", "yes"]
-                uninstallIBMCatalog = prompt(HTML(f'<Yellow>Uninstall IBM Catalog Source? </Yellow>'), validator=YesNoValidator()) in ["y", "yes"]
+                uninstallGrafana = self.yesOrNo("Uninstall Grafana")
+                self.printDescription(["If you choose to uninstall the IBM Operator Catalog, IBM Common Services, IBM User Data Services, &amp; IBM Suite License Service will be automatically set to uninstall as well"])
+                uninstallIBMCatalog = self.yesOrNo("Uninstall IBM operator Catalog")
                 if uninstallIBMCatalog:
                     # If you choose to uninstall IBM Operator Catalog, everything from the catalog will be uninstalled
                     uninstallCommonServices = True
                     uninstallUDS = True
-                    uninstallMongoDb = True
                     uninstallSLS = True
                 else:
-                    uninstallCommonServices = prompt(HTML(f'<Yellow>Uninstall IBM Common Services? </Yellow>'), validator=YesNoValidator()) in ["y", "yes"]
-                    uninstallUDS = prompt(HTML(f'<Yellow>Uninstall IBM User Data Services? </Yellow>'), validator=YesNoValidator()) in ["y", "yes"]
+                    uninstallCommonServices = self.yesOrNo("Uninstall IBM Common Services")
+                    uninstallUDS = self.yesOrNo("Uninstall IBM User Data Services")
 
         else:
             # Non-interactive mode
             if not verifyMasInstance(self.dynamicClient, instanceId):
-                print_formatted_text(HTML(f"<Red>Error: MAS Instance {instanceId} not found on this cluster</Red>"))
-                sys.exit(1)
+                self.fatalError(f"MAS Instance {instanceId} not found on this cluster</Red>")
 
         # Default to Red Hat Cert-Manager, and check if IBM cert-manager is installed
         certManagerProvider="redhat"
@@ -131,20 +147,20 @@ class App(BaseApp):
             # ibm cert manager not found, proceed with default redhat.
 
         self.printH1("Review Settings")
-        print_formatted_text(HTML(f"<LightSlateGrey>Instance ID ..................... {instanceId}</LightSlateGrey>"))
-        print_formatted_text(HTML(f"<LightSlateGrey>Uninstall Cert-Manager .......... {uninstallCertManager} ({certManagerProvider})</LightSlateGrey>"))
-        print_formatted_text(HTML(f"<LightSlateGrey>Uninstall Grafana ............... {uninstallGrafana}</LightSlateGrey>"))
-        print_formatted_text(HTML(f"<LightSlateGrey>Uninstall IBM Operator Catalog .. {uninstallIBMCatalog}</LightSlateGrey>"))
-        print_formatted_text(HTML(f"<LightSlateGrey>Uninstall IBM Common Services ... {uninstallCommonServices}</LightSlateGrey>"))
-        print_formatted_text(HTML(f"<LightSlateGrey>Uninstall UDS ................... {uninstallUDS}</LightSlateGrey>"))
-        print_formatted_text(HTML(f"<LightSlateGrey>Uninstall MongoDb ............... {uninstallMongoDb}</LightSlateGrey>"))
-        print_formatted_text(HTML(f"<LightSlateGrey>Uninstall SLS ................... {uninstallSLS}</LightSlateGrey>"))
+        self.printSummary("Instance ID", instanceId)
+        self.printSummary("Uninstall Cert-Manager", f"{uninstallCertManager} ({certManagerProvider})")
+        self.printSummary("Uninstall Grafana", uninstallGrafana)
+        self.printSummary("Uninstall IBM Operator Catalog", uninstallIBMCatalog)
+        self.printSummary("Uninstall IBM Common Services", uninstallCommonServices)
+        self.printSummary("Uninstall UDS", uninstallUDS)
+        self.printSummary("Uninstall MongoDb", uninstallMongoDb)
+        self.printSummary("Uninstall SLS", uninstallSLS)
 
         if not self.noConfirm:
             print()
-            continueWithUninstall = prompt(HTML(f'<Yellow>Proceed with these settings?</Yellow> '), validator=YesNoValidator(), validate_while_typing=False)
+            continueWithUninstall = self.yesOrNo("Proceed with these settings")
 
-        if self.noConfirm or continueWithUninstall in ["y", "yes"]:
+        if self.noConfirm or continueWithUninstall:
             self.printH1("Launch uninstall")
             pipelinesNamespace = f"mas-{instanceId}-pipelines"
 
@@ -160,7 +176,7 @@ class App(BaseApp):
                 updateTektonDefinitions(pipelinesNamespace, self.tektonDefsPath)
                 h.stop_and_persist(symbol=self.successIcon, text=f"Latest Tekton definitions are installed (v{self.version})")
 
-            with Halo(text='Submitting PipelineRun for {instanceId} uninstall', spinner=self.spinner) as h:
+            with Halo(text=f'Submitting PipelineRun for {instanceId} uninstall', spinner=self.spinner) as h:
                 pipelineURL = launchUninstallPipeline(
                     dynClient = self.dynamicClient,
                     instanceId = instanceId,
@@ -282,3 +298,15 @@ if __name__ == '__main__':
         app.uninstall(args)
     except KeyboardInterrupt as e:
         pass
+    except ApiException as e:
+        logger.exception(e, stack_info=True)
+        app.fatalError(message=f"An error occured communicating with the target server: {e.reason} ({e.status})")
+    except MaxRetryError as e:
+        logger.exception(e, stack_info=True)
+        app.fatalError(message="Unable to connect to API server", exception=e)
+    except TemplateNotFound as e:
+        logger.exception(e, stack_info=True)
+        app.fatalError("Could not find template", exception=e)
+    except KubectlCommandError as e:
+        logger.exception(e, stack_info=True)
+        app.fatalError("Could not execute kubectl command", exception=e)

{mas_cli-10.0.5.dist-info → mas_cli-10.0.6.dist-info}/METADATA

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

{mas_cli-10.0.5.dist-info → mas_cli-10.0.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
-mas/cli/__init__.py,sha256=-DVgjebGXVy-3F51xwssmiVp5V0TLDLXO40qf2kKqd4,491
+mas/cli/__init__.py,sha256=KnkdBDbj89We8mdN3boGZ4riEJyDiPWb8CnO-RBY4j0,491
 mas/cli/cli.py,sha256=mo2z24YRNw13-vQ2QkiixIPTxB81TtadsvLx5iCbka4,8512
-mas/cli/displayMixins.py,sha256=Dcr-q02wjGA9Mec2nGqZD42vWKyjqLtmh92s2ZhWHZw,5013
+mas/cli/displayMixins.py,sha256=aIpqoedzKJfaaE8C8FlEvxfWTVahL261rjzPZhdT5q8,5117
 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
@@ -12,7 +12,7 @@ mas/cli/install/settings/db2Settings.py,sha256=mR0XL81Talvwvm1bekw0o9VOwV42QkS0j
 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=b9vOapnSwbYNp__0clGpJx5NTOgw8US2_Bgm7pjp4P8,335567
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=Hf5bgNP3VHBocWeqp-BISf5o7w8VzfxuJoqMdiSODnw,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.5.data/scripts/mas-install,sha256=Nk2VhyFJ3q8T9_jQnVAEc1CdlJ-G2LMkLkSpeD-iRNs,46763
-mas_cli-10.0.5.data/scripts/mas-uninstall,sha256=U4eZcs8UHo3K_h4VyQURMJ4P8OoZZKBOvTUSd7vWaQI,13217
-mas_cli-10.0.5.data/scripts/mas-upgrade,sha256=zo8qwVtb5I_37qLlRixQiKGXGUj34Ue-4k-GKliXp7Y,6914
-mas_cli-10.0.5.dist-info/METADATA,sha256=uWTjI3m5kUZppebHfsJ6vWrKp72s5Cap7vNwXAROJPI,2076
-mas_cli-10.0.5.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-mas_cli-10.0.5.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-10.0.5.dist-info/RECORD,,
+mas_cli-10.0.6.data/scripts/mas-install,sha256=Nk2VhyFJ3q8T9_jQnVAEc1CdlJ-G2LMkLkSpeD-iRNs,46763
+mas_cli-10.0.6.data/scripts/mas-uninstall,sha256=BWjphJmzndnfZH1fSmsPkyypSngOso2qp5lT5_YT98g,13960
+mas_cli-10.0.6.data/scripts/mas-upgrade,sha256=zo8qwVtb5I_37qLlRixQiKGXGUj34Ue-4k-GKliXp7Y,6914
+mas_cli-10.0.6.dist-info/METADATA,sha256=7bAyhSVRi5eIQvFeG3Ei6iDQlAQhW0SGIIWJyf7Nv00,2076
+mas_cli-10.0.6.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+mas_cli-10.0.6.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-10.0.6.dist-info/RECORD,,