mas-cli 10.0.6__tar.gz → 10.1.1__tar.gz

{mas_cli-10.0.6 → mas_cli-10.1.1}/PKG-INFO

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

{mas_cli-10.0.6 → mas_cli-10.1.1}/setup.py

@@ -47,9 +47,7 @@ setup(
     packages=find_namespace_packages(where='src'),
     include_package_data=True,
     scripts=[
-        'src/mas-install',
-        'src/mas-upgrade',
-        'src/mas-uninstall'
+        'src/mas-cli'
     ],
     url='https://github.com/ibm-mas/cli',
     license='Eclipse Public License - v1.0',

{mas_cli-10.0.6 → mas_cli-10.1.1}/src/mas/cli/__init__.py

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

{mas_cli-10.0.6 → mas_cli-10.1.1}/src/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-10.0.6 → mas_cli-10.1.1}/src/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/src/mas-install → mas_cli-10.1.1/src/mas/cli/install/app.py

@@ -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-10.0.6 → mas_cli-10.1.1}/src/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",