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

mas/cli/__init__.py

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

mas/cli/cli.py

@@ -124,9 +124,7 @@ class BaseApp(PrintMixin, PromptMixin):
         self.printTitle(f"\nIBM Maximo Application Suite Admin CLI v{self.version}")
         print_formatted_text(HTML("Powered by <DarkGoldenRod><u>https://github.com/ibm-mas/ansible-devops/</u></DarkGoldenRod> and <DarkGoldenRod><u>https://tekton.dev/</u></DarkGoldenRod>\n"))
         if which("kubectl") is None:
-            logger.error("Could not find kubectl on the path")
-            print_formatted_text(HTML("\n<Red>Error: Could not find kubectl on the path, see <u>https://kubernetes.io/docs/tasks/tools/#kubectl</u> for installation instructions</Red>\n"))
-            exit(1)
+            self.fatalError("Could not find kubectl on the path, see <u>https://kubernetes.io/docs/tasks/tools/#kubectl</u> for installation instructions")
 
     def getCompatibleVersions(self, coreChannel: str, appId: str) -> list:
         if coreChannel in self.compatibilityMatrix:
@@ -136,8 +134,11 @@ class BaseApp(PrintMixin, PromptMixin):
 
     def fatalError(self, message: str, exception: Exception=None) -> None:
         if exception is not None:
+            logger.error(message)
+            logger.exception(exception, stack_info=True)
             print_formatted_text(HTML(f"<Red>Fatal Exception: {message.replace(' & ', ' &amp; ')}: {exception}</Red>"))
         else:
+            logger.error(message)
             print_formatted_text(HTML(f"<Red>Fatal Error: {message.replace(' & ', ' &amp; ')}</Red>"))
         exit(1)
 

mas/cli/install/__init__.py

@@ -7,3 +7,5 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # *****************************************************************************
+
+from ..cli import BaseApp

mas_cli-10.0.6.data/scripts/mas-install → mas/cli/install/app.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python
 # *****************************************************************************
 # Copyright (c) 2024 IBM Corporation and other Contributors.
 #
@@ -18,20 +18,16 @@ import re
 from openshift.dynamic.exceptions import NotFoundError
 
 from prompt_toolkit import prompt, print_formatted_text, HTML
-from urllib3.exceptions import MaxRetryError
-from jinja2.exceptions import TemplateNotFound
-from kubeconfig.exceptions import KubectlCommandError
-from kubernetes.client.exceptions import ApiException
 
 from tabulate import tabulate
 
 from halo import Halo
 
-from mas.cli.cli import BaseApp
-from mas.cli.gencfg import ConfigGeneratorMixin
-from mas.cli.install.argParser import installArgParser
-from mas.cli.install.settings import InstallSettingsMixin
-from mas.cli.install.summarizer import InstallSummarizerMixin
+from ..cli import BaseApp
+from ..gencfg import ConfigGeneratorMixin
+from .argParser import installArgParser
+from .settings import InstallSettingsMixin
+from .summarizer import InstallSummarizerMixin
 
 from mas.cli.validators import (
   InstanceIDFormatValidator,
@@ -47,7 +43,7 @@ from mas.devops.tekton import installOpenShiftPipelines, updateTektonDefinitions
 logger = logging.getLogger(__name__)
 
 
-class App(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGeneratorMixin):
+class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGeneratorMixin):
     def validateCatalogSource(self):
         catalogsAPI = self.dynamicClient.resources.get(api_version="operators.coreos.com/v1alpha1", kind="CatalogSource")
         try:
@@ -667,7 +663,7 @@ class App(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGenerator
             "mas_arcgis_channel"
         ]
 
-        for key, value in vars(args).items():
+        for key, value in vars(self.args).items():
             # These fields we just pass straight through to the parameters and fail if they are not set
             if key in requiredParams:
                 if value is None:
@@ -778,10 +774,12 @@ class App(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGenerator
             self.validateCatalogSource()
             self.licensePrompt()
 
-    def install(self, args):
+    def install(self, argv):
         """
         Install MAS instance
         """
+        args = installArgParser.parse_args(args=argv)
+
         # 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
@@ -967,25 +965,3 @@ class App(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGenerator
                 else:
                     h.stop_and_persist(symbol=self.failureIcon, text=f"Failed to submit PipelineRun for {self.getParam('mas_instance_id')} install, see log file for details")
                     print()
-
-
-if __name__ == '__main__':
-    args = installArgParser.parse_args()
-
-    try:
-        app = App()
-        app.install(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/install/argParser.py

@@ -21,7 +21,7 @@ def isValidFile(parser, arg) -> str:
         return arg
 
 installArgParser = argparse.ArgumentParser(
-    prog="mas uninstall",
+    prog="mas install",
     description="\n".join([
         f"IBM Maximo Application Suite Admin CLI v{packageVersion}",
         "Install MAS by configuring and launching the MAS Uninstall Tekton Pipeline.\n",

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

mas/cli/uninstall/__init__.py

@@ -0,0 +1,11 @@
+# *****************************************************************************
+# Copyright (c) 2024 IBM Corporation and other Contributors.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# *****************************************************************************
+
+from ..cli import BaseApp

mas_cli-10.0.6.data/scripts/mas-uninstall → mas/cli/uninstall/app.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python
 # *****************************************************************************
 # Copyright (c) 2024 IBM Corporation and other Contributors.
 #
@@ -9,23 +9,17 @@
 #
 # *****************************************************************************
 
-import argparse
-import sys
 import logging
 import logging.handlers
 from halo import Halo
 from prompt_toolkit import print_formatted_text, HTML
 from prompt_toolkit.completion import WordCompleter
 
-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
+from ..cli import BaseApp
+from ..validators import InstanceIDValidator
+from .argParser import uninstallArgParser
 
 from mas.devops.ocp import createNamespace
 from mas.devops.mas import listMasInstances, verifyMasInstance
@@ -34,12 +28,13 @@ from mas.devops.tekton import installOpenShiftPipelines, updateTektonDefinitions
 
 logger = logging.getLogger(__name__)
 
-class App(BaseApp):
-    def uninstall(self, args):
+class UninstallApp(BaseApp):
+    def uninstall(self, argv):
         """
         Uninstall MAS instance
         """
-        instanceId = args.instance_id
+        args = uninstallArgParser.parse_args(args=argv)
+        instanceId = args.mas_instance_id
         self.noConfirm = args.no_confirm
 
         if args.uninstall_all_deps:
@@ -195,118 +190,3 @@ class App(BaseApp):
                 else:
                     h.stop_and_persist(symbol=self.failureIcon, text=f"Failed to submit PipelineRun for {instanceId} uninstall, see log file for details")
                     print()
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
-        prog='mas uninstall',
-        description="\n".join([
-            f"IBM Maximo Application Suite Admin CLI v{packageVersion}",
-            "Uninstall MAS by configuring and launching the MAS Uninstall Tekton Pipeline.\n",
-            "Interactive Mode:",
-            "Omitting the --instance-id option will trigger an interactive prompt"
-        ]),
-        epilog="Refer to the online documentation for more information: https://ibm-mas.github.io/cli/",
-        formatter_class=getHelpFormatter(),
-        add_help=False
-    )
-
-    masArgGroup = parser.add_argument_group('MAS Instance Selection')
-    masArgGroup.add_argument(
-        '--instance-id',
-        required=False,
-        help="The MAS instance ID to be uninstalled"
-    )
-
-    depsArgGroup = parser.add_argument_group('MAS Dependencies Selection')
-    depsArgGroup.add_argument(
-        '--uninstall-all-deps',
-        required=False,
-        action='store_true',
-        default=False,
-        help="Uninstall all MAS-related dependencies from the target cluster",
-    )
-
-    depsArgGroup.add_argument(
-        '--uninstall-cert-manager',
-        required=False,
-        action='store_true',
-        default=False,
-        help="Uninstall Certificate Manager from the target cluster",
-    )
-    depsArgGroup.add_argument(
-        '--uninstall-common-services',
-        required=False,
-        action='store_true',
-        default=False,
-        help="Uninstall IBM Common Services from the target cluster",
-    )
-    depsArgGroup.add_argument(
-        '--uninstall-grafana',
-        required=False,
-        action='store_true',
-        default=False,
-        help="Uninstall Grafana from the target cluster",
-    )
-    depsArgGroup.add_argument(
-        '--uninstall-ibm-catalog',
-        required=False,
-        action='store_true',
-        default=False,
-        help="Uninstall the IBM Maximo Operator Catalog Source (ibm-operator-catalog) from the target cluster",
-    )
-    depsArgGroup.add_argument(
-        '--uninstall-mongodb',
-        required=False,
-        action='store_true',
-        default=False,
-        help="Uninstall MongoDb from the target cluster",
-    )
-    depsArgGroup.add_argument(
-        '--uninstall-sls',
-        required=False,
-        action='store_true',
-        default=False,
-        help="Uninstall IBM Suite License Service from the target cluster",
-    )
-    depsArgGroup.add_argument(
-        '--uninstall-uds',
-        required=False,
-        action='store_true',
-        default=False,
-        help="Uninstall IBM User Data Services from the target cluster",
-    )
-
-    otherArgGroup = parser.add_argument_group('More')
-    otherArgGroup.add_argument(
-        '--no-confirm',
-        required=False,
-        action='store_true',
-        default=False,
-        help="Launch the upgrade without prompting for confirmation",
-    )
-    otherArgGroup.add_argument(
-        '-h', "--help",
-        action='help',
-        default=False,
-        help="Show this help message and exit",
-    )
-
-    args = parser.parse_args()
-
-    try:
-        app = App()
-        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/uninstall/argParser.py

@@ -0,0 +1,108 @@
+# *****************************************************************************
+# Copyright (c) 2024 IBM Corporation and other Contributors.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# *****************************************************************************
+
+import argparse
+
+from .. import __version__ as packageVersion
+from ..cli import getHelpFormatter
+
+uninstallArgParser = argparse.ArgumentParser(
+    prog='mas uninstall',
+    description="\n".join([
+        f"IBM Maximo Application Suite Admin CLI v{packageVersion}",
+        "Uninstall MAS by configuring and launching the MAS Uninstall Tekton Pipeline.\n",
+        "Interactive Mode:",
+        "Omitting the --instance-id option will trigger an interactive prompt"
+    ]),
+    epilog="Refer to the online documentation for more information: https://ibm-mas.github.io/cli/",
+    formatter_class=getHelpFormatter(),
+    add_help=False
+)
+
+masArgGroup = uninstallArgParser.add_argument_group('MAS Instance Selection')
+masArgGroup.add_argument(
+    '--mas-instance-id',
+    required=False,
+    help="The MAS instance ID to be uninstalled"
+)
+
+depsArgGroup = uninstallArgParser.add_argument_group('MAS Dependencies Selection')
+depsArgGroup.add_argument(
+    '--uninstall-all-deps',
+    required=False,
+    action='store_true',
+    default=False,
+    help="Uninstall all MAS-related dependencies from the target cluster",
+)
+
+depsArgGroup.add_argument(
+    '--uninstall-cert-manager',
+    required=False,
+    action='store_true',
+    default=False,
+    help="Uninstall Certificate Manager from the target cluster",
+)
+depsArgGroup.add_argument(
+    '--uninstall-common-services',
+    required=False,
+    action='store_true',
+    default=False,
+    help="Uninstall IBM Common Services from the target cluster",
+)
+depsArgGroup.add_argument(
+    '--uninstall-grafana',
+    required=False,
+    action='store_true',
+    default=False,
+    help="Uninstall Grafana from the target cluster",
+)
+depsArgGroup.add_argument(
+    '--uninstall-ibm-catalog',
+    required=False,
+    action='store_true',
+    default=False,
+    help="Uninstall the IBM Maximo Operator Catalog Source (ibm-operator-catalog) from the target cluster",
+)
+depsArgGroup.add_argument(
+    '--uninstall-mongodb',
+    required=False,
+    action='store_true',
+    default=False,
+    help="Uninstall MongoDb from the target cluster",
+)
+depsArgGroup.add_argument(
+    '--uninstall-sls',
+    required=False,
+    action='store_true',
+    default=False,
+    help="Uninstall IBM Suite License Service from the target cluster",
+)
+depsArgGroup.add_argument(
+    '--uninstall-uds',
+    required=False,
+    action='store_true',
+    default=False,
+    help="Uninstall IBM User Data Services from the target cluster",
+)
+
+otherArgGroup = uninstallArgParser.add_argument_group('More')
+otherArgGroup.add_argument(
+    '--no-confirm',
+    required=False,
+    action='store_true',
+    default=False,
+    help="Launch the upgrade without prompting for confirmation",
+)
+otherArgGroup.add_argument(
+    '-h', "--help",
+    action='help',
+    default=False,
+    help="Show this help message and exit",
+)

mas/cli/upgrade/__init__.py

@@ -0,0 +1,11 @@
+# *****************************************************************************
+# Copyright (c) 2024 IBM Corporation and other Contributors.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# *****************************************************************************
+
+from ..cli import BaseApp

mas_cli-10.0.6.data/scripts/mas-upgrade → mas/cli/upgrade/app.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python
 # *****************************************************************************
 # Copyright (c) 2024 IBM Corporation and other Contributors.
 #
@@ -9,7 +9,6 @@
 #
 # *****************************************************************************
 
-import argparse
 import sys
 import logging
 import logging.handlers
@@ -18,21 +17,25 @@ from prompt_toolkit.completion import WordCompleter
 
 from halo import Halo
 
-from mas.cli import __version__ as packageVersion
-from mas.cli.cli import BaseApp, getHelpFormatter
-from mas.cli.validators import InstanceIDValidator, YesNoValidator
+from ..cli import BaseApp, getHelpFormatter
+from ..validators import InstanceIDValidator, YesNoValidator
+from .argParser import upgradeArgParser
+
 from mas.devops.ocp import createNamespace
 from mas.devops.mas import listMasInstances, verifyMasInstance
 from mas.devops.tekton import installOpenShiftPipelines, updateTektonDefinitions, launchUpgradePipeline
 
 logger = logging.getLogger(__name__)
 
-class App(BaseApp):
-    def upgrade(self, instanceId, skipPreCheck, noConfirm):
+class UpgradeApp(BaseApp):
+    def upgrade(self, argv):
         """
         Upgrade MAS instance
         """
-        self.noConfirm = noConfirm
+        args = upgradeArgParser.parse_args(args=argv)
+        instanceId = args.mas_instance_id
+        self.noConfirm = args.no_confirm
+        self.skipPreCheck = args.skip_pre_check
 
         if instanceId is None:
             self.printH1("Set Target OpenShift Cluster")
@@ -71,7 +74,7 @@ class App(BaseApp):
 
         self.printH1("Review Settings")
         print_formatted_text(HTML(f"<LightSlateGrey>Instance ID ..................... {instanceId}</LightSlateGrey>"))
-        print_formatted_text(HTML(f"<LightSlateGrey>Skip Pre-Upgrade Checks ......... {skipPreCheck}</LightSlateGrey>"))
+        print_formatted_text(HTML(f"<LightSlateGrey>Skip Pre-Upgrade Checks ......... {self.skipPreCheck}</LightSlateGrey>"))
 
         if not self.noConfirm:
             print()
@@ -94,65 +97,10 @@ class App(BaseApp):
                 h.stop_and_persist(symbol=self.successIcon, text=f"Latest Tekton definitions are installed (v{self.version})")
 
             with Halo(text='Submitting PipelineRun for {instanceId} upgrade', spinner=self.spinner) as h:
-                pipelineURL = launchUpgradePipeline(self.dynamicClient, instanceId, skipPreCheck)
+                pipelineURL = launchUpgradePipeline(self.dynamicClient, instanceId, self.skipPreCheck)
                 if pipelineURL is not None:
                     h.stop_and_persist(symbol=self.successIcon, text=f"PipelineRun for {instanceId} upgrade submitted")
                     print_formatted_text(HTML(f"\nView progress:\n  <Cyan><u>{pipelineURL}</u></Cyan>\n"))
                 else:
                     h.stop_and_persist(symbol=self.failureIcon, text=f"Failed to submit PipelineRun for {instanceId} upgrade, see log file for details")
                     print()
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
-        prog='mas upgrade',
-        description="\n".join([
-            f"IBM Maximo Application Suite Admin CLI v{packageVersion}",
-            "Upgrade MAS by configuring and launching the MAS Upgrade Tekton Pipeline.\n",
-            "Interactive Mode:",
-            "Omitting the --instance-id option will trigger an interactive prompt"
-        ]),
-        epilog="Refer to the online documentation for more information: https://ibm-mas.github.io/cli/",
-        formatter_class=getHelpFormatter(),
-        add_help=False
-    )
-
-    masArgGroup = parser.add_argument_group('MAS Instance Selection')
-    masArgGroup.add_argument(
-        '--instance-id',
-        required=False,
-        help="The MAS instance ID to be upgraded"
-    )
-
-    otherArgGroup = parser.add_argument_group('More')
-    otherArgGroup.add_argument(
-        '--skip-pre-check',
-        required=False,
-        action='store_true',
-        default=False,
-        help="Disable the 'pre-upgrade-check' and 'post-upgrade-verify' tasks in the upgrade pipeline"
-    )
-    otherArgGroup.add_argument(
-        '--no-confirm',
-        required=False,
-        action='store_true',
-        default=False,
-        help="Launch the upgrade without prompting for confirmation",
-    )
-    otherArgGroup.add_argument(
-        '-h', "--help",
-        action='help',
-        default=False,
-        help="Show this help message and exit",
-    )
-
-    args = parser.parse_args()
-
-    try:
-        app = App()
-        app.upgrade(
-            args.instance_id,
-            args.skip_pre_check,
-            args.no_confirm
-        )
-    except KeyboardInterrupt as e:
-        pass

mas/cli/upgrade/argParser.py

@@ -0,0 +1,56 @@
+# *****************************************************************************
+# Copyright (c) 2024 IBM Corporation and other Contributors.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# *****************************************************************************
+
+import argparse
+
+from .. import __version__ as packageVersion
+from ..cli import getHelpFormatter
+
+upgradeArgParser = argparse.ArgumentParser(
+    prog='mas upgrade',
+    description="\n".join([
+        f"IBM Maximo Application Suite Admin CLI v{packageVersion}",
+        "Upgrade MAS by configuring and launching the MAS Upgrade Tekton Pipeline.\n",
+        "Interactive Mode:",
+        "Omitting the --instance-id option will trigger an interactive prompt"
+    ]),
+    epilog="Refer to the online documentation for more information: https://ibm-mas.github.io/cli/",
+    formatter_class=getHelpFormatter(),
+    add_help=False
+)
+
+masArgGroup = upgradeArgParser.add_argument_group('MAS Instance Selection')
+masArgGroup.add_argument(
+    '--mas-instance-id',
+    required=False,
+    help="The MAS instance ID to be upgraded"
+)
+
+otherArgGroup = upgradeArgParser.add_argument_group('More')
+otherArgGroup.add_argument(
+    '--skip-pre-check',
+    required=False,
+    action='store_true',
+    default=False,
+    help="Disable the 'pre-upgrade-check' and 'post-upgrade-verify' tasks in the upgrade pipeline"
+)
+otherArgGroup.add_argument(
+    '--no-confirm',
+    required=False,
+    action='store_true',
+    default=False,
+    help="Launch the upgrade without prompting for confirmation",
+)
+otherArgGroup.add_argument(
+    '-h', "--help",
+    action='help',
+    default=False,
+    help="Show this help message and exit",
+)

mas_cli-10.1.0.data/scripts/mas-cli

@@ -0,0 +1,75 @@
+#!python
+# *****************************************************************************
+# Copyright (c) 2024 IBM Corporation and other Contributors.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# *****************************************************************************
+
+import logging
+import logging.handlers
+from sys import argv
+
+from mas.cli import __version__ as VERSION
+from mas.cli.install.app import InstallApp
+from mas.cli.upgrade.app import UpgradeApp
+from mas.cli.uninstall.app import UninstallApp
+
+from prompt_toolkit import HTML, print_formatted_text
+from urllib3.exceptions import MaxRetryError
+from jinja2.exceptions import TemplateNotFound
+from kubeconfig.exceptions import KubectlCommandError
+from kubernetes.client.exceptions import ApiException
+
+logger = logging.getLogger(__name__)
+
+def usage():
+    print_formatted_text(HTML(""))
+
+    print_formatted_text(HTML(f"\n<u>IBM Maximo Application Suite Admin CLI v{VERSION}</u>"))
+    print_formatted_text(HTML("Powered by <DarkGoldenRod><u>https://github.com/ibm-mas/ansible-devops/</u></DarkGoldenRod> and <DarkGoldenRod><u>https://tekton.dev/</u></DarkGoldenRod>"))
+    print("")
+    print_formatted_text(HTML("Important Notice:\nThis standalone CLI (<ForestGreen>mas-cli</ForestGreen>) is still in beta state, not all functions supported by the <ForestGreen>mas</ForestGreen> function in quay.io/ibmmas/cli are supported yet"))
+    print("")
+    print_formatted_text(HTML(
+        "<b>MAS Management Actions:</b>\n"+
+        " - <ForestGreen>mas-cli install</ForestGreen>   Install a MAS instance\n"+
+        " - <ForestGreen>mas-cli upgrade</ForestGreen>   Upgrade a MAS instance\n"+
+        " - <ForestGreen>mas-cli uninstall</ForestGreen> Uninstall a MAS instance\n"
+    ))
+    print_formatted_text(HTML("For usage information run <ForestGreen>mas-cli [action] --help</ForestGreen>\n"))
+
+if __name__ == '__main__':
+    try:
+        function = argv[1]
+
+        if function == "install":
+            app = InstallApp()
+            app.install(argv[2:])
+        elif function == "uninstall":
+            app = UninstallApp()
+            app.uninstall(argv[2:])
+        elif function == "upgrade":
+            app = UpgradeApp()
+            app.upgrade(argv[2:])
+        elif function in ["-h", "--help"]:
+            usage()
+            exit(0)
+        else:
+            usage()
+            print_formatted_text(HTML(f"<Red>Unknown action: {function}</Red>\n"))
+            exit(1)
+
+    except KeyboardInterrupt as e:
+        pass
+    except ApiException as e:
+        app.fatalError(message=f"An error occured communicating with the target server: {e.reason} ({e.status})")
+    except MaxRetryError as e:
+        app.fatalError(message="Unable to connect to API server", exception=e)
+    except TemplateNotFound as e:
+        app.fatalError("Could not find template", exception=e)
+    except KubectlCommandError as e:
+        app.fatalError("Could not execute kubectl command", exception=e)

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

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

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

@@ -1,10 +1,11 @@
-mas/cli/__init__.py,sha256=KnkdBDbj89We8mdN3boGZ4riEJyDiPWb8CnO-RBY4j0,491
-mas/cli/cli.py,sha256=mo2z24YRNw13-vQ2QkiixIPTxB81TtadsvLx5iCbka4,8512
+mas/cli/__init__.py,sha256=p_AG07T6oWD53gJ4uygQIEx5-nA7w2ZVRlaTArVsMaI,491
+mas/cli/cli.py,sha256=hbeCvE6dKljR3u-C207RPmSGY5H-B4fY3sQrPohABz0,8521
 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
-mas/cli/install/argParser.py,sha256=AEbodAediMlIGHtOE-jlLSKILcqSKCbOix7o2iTI6xY,18766
+mas/cli/install/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY,494
+mas/cli/install/app.py,sha256=JLoouIIIgvxNal7Yw3BWQmH7BTP358lERYXD3YgoyJ8,45771
+mas/cli/install/argParser.py,sha256=1H3eQ_ng-q8XfMVRgmKDBHh0hSYOr0FPjWIVhNUy7DM,18764
 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=YNEISHlFNXnhX1gwFSVG3OBdHsuT9OJ5oZRTC7RqSVI,6800
@@ -12,7 +13,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=Hf5bgNP3VHBocWeqp-BISf5o7w8VzfxuJoqMdiSODnw,335567
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=5j4dHu0k_DRfM2UzJfKFhDnTAGJYObEGbXXIHUI1D3Q,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 +86,14 @@ 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.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,,
+mas/cli/uninstall/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY,494
+mas/cli/uninstall/app.py,sha256=Sbv-xqUUdIOerkSw3pz8wo3u7_KmgmwwRFEB8UP3uFU,9934
+mas/cli/uninstall/argParser.py,sha256=VO6_u8Qv_munelgZMxBw9mdJBwF_9j688b6nUxQD2RM,3298
+mas/cli/upgrade/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY,494
+mas/cli/upgrade/app.py,sha256=lxMZYlO_sybzbOuZ4D7R0OCjGqnMg3MF1h2vSVZ1YmE,5328
+mas/cli/upgrade/argParser.py,sha256=jl8SU0mXDMAkpfqXaKE4MPNUmVoD0LSsvMUSJjU1dbQ,1881
+mas_cli-10.1.0.data/scripts/mas-cli,sha256=txiATjPf7E0yCW-2C7VdRA8HSv_SQ52osZkvt_z_QJc,3166
+mas_cli-10.1.0.dist-info/METADATA,sha256=4Y30bVkxNOeY7-95uaa454mGQXnWqCM033AkOWI_wKE,2076
+mas_cli-10.1.0.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+mas_cli-10.1.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-10.1.0.dist-info/RECORD,,

{mas_cli-10.0.6.dist-info → mas_cli-10.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.2.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any