mas-cli 11.5.0__tar.gz → 11.7.0__tar.gz

{mas_cli-11.5.0 → mas_cli-11.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mas-cli
-Version: 11.5.0
+Version: 11.7.0
 Summary: Python Admin CLI for Maximo Application Suite
 Home-page: https://github.com/ibm-mas/cli
 Author: David Parker
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Communications
 Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: mas-devops
+Requires-Dist: mas-devops>=1.7.0
 Requires-Dist: halo
 Requires-Dist: prompt_toolkit
 Requires-Dist: openshift

{mas_cli-11.5.0 → mas_cli-11.7.0}/setup.py

@@ -58,12 +58,12 @@ setup(
     description='Python Admin CLI for Maximo Application Suite',
     long_description=long_description,
     install_requires=[
-        'mas-devops',     # EPL
-        'halo',           # MIT License
-        'prompt_toolkit',  # BSD License
-        'openshift',      # Apache Software License
-        'kubernetes',     # Apache Software License
-        'tabulate'        # MIT License
+        'mas-devops >= 1.7.0',  # EPL
+        'halo',                 # MIT License
+        'prompt_toolkit',       # BSD License
+        'openshift',            # Apache Software License
+        'kubernetes',           # Apache Software License
+        'tabulate'              # MIT License
     ],
     extras_require={
         'dev': [

{mas_cli-11.5.0 → mas_cli-11.7.0}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "11.5.0"  # Python module compatible semver
+__version__ = "11.7.0"  # Python module compatible semver

{mas_cli-11.5.0 → mas_cli-11.7.0}/src/mas/cli/cli.py

@@ -28,7 +28,7 @@ from openshift.dynamic.exceptions import NotFoundError
 from prompt_toolkit import prompt, print_formatted_text, HTML
 
 from mas.devops.mas import isAirgapInstall
-from mas.devops.ocp import connect, isSNO
+from mas.devops.ocp import connect, isSNO, getNodes
 
 from .displayMixins import PrintMixin, PromptMixin
 
@@ -50,7 +50,7 @@ def getHelpFormatter(formatter=RawTextHelpFormatter, w=160, h=50):
         formatter(None, **kwargs)
         return lambda prog: formatter(prog, **kwargs)
     except TypeError:
-        logger.warn("argparse help formatter failed, falling back.")
+        logger.warning("argparse help formatter failed, falling back.")
         return formatter
 
 
@@ -89,6 +89,15 @@ def runCmd(cmdArray, timeout=630):
             return RunCmdResult(127, 'TimeoutExpired', str(e))
 
 
+def logMethodCall(func):
+    def wrapper(self, *args, **kwargs):
+        logger.debug(f">>> BaseApp.{func.__name__}")
+        result = func(self, *args, **kwargs)
+        logger.debug(f"<<< BaseApp.{func.__name__}")
+        return result
+    return wrapper
+
+
 class BaseApp(PrintMixin, PromptMixin):
     def __init__(self):
         # Set up a log formatter
@@ -105,9 +114,10 @@ class BaseApp(PrintMixin, PromptMixin):
         rootLogger = logging.getLogger()
         rootLogger.addHandler(ch)
         rootLogger.setLevel(logging.DEBUG)
+        logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version = "11.5.0"
+        self.version = "11.7.0"
         self.h1count = 0
         self.h2count = 0
 
@@ -129,6 +139,9 @@ class BaseApp(PrintMixin, PromptMixin):
 
         self._isSNO = None
 
+        # Until we connect to the cluster we don't know what architecture it's worker nodes are
+        self.architecture = None
+
         self.compatibilityMatrix = {
             "9.0.x": {
                 "assist": ["9.0.x", "8.8.x"],
@@ -137,7 +150,8 @@ class BaseApp(PrintMixin, PromptMixin):
                 "monitor": ["9.0.x", "8.11.x"],
                 "optimizer": ["9.0.x", "8.5.x"],
                 "predict": ["9.0.x", "8.9.x"],
-                "visualinspection": ["9.0.x", "8.9.x"]
+                "visualinspection": ["9.0.x", "8.9.x"],
+                "aibroker": ["9.0.x"]
             },
             "8.11.x": {
                 "assist": ["8.8.x", "8.7.x"],
@@ -174,6 +188,7 @@ class BaseApp(PrintMixin, PromptMixin):
         if which("kubectl") is None:
             self.fatalError("Could not find kubectl on the path, see <DarkGoldenRod><u>https://kubernetes.io/docs/tasks/tools/#kubectl</u></DarkGoldenRod> for installation instructions")
 
+    @logMethodCall
     def createTektonFileWithDigest(self) -> None:
         if path.exists(self.tektonDefsWithDigestPath):
             logger.debug(f"We have already generated {self.tektonDefsWithDigestPath}")
@@ -216,12 +231,14 @@ class BaseApp(PrintMixin, PromptMixin):
 
             self.tektonDefsPath = self.tektonDefsWithDigestPath
 
+    @logMethodCall
     def getCompatibleVersions(self, coreChannel: str, appId: str) -> list:
         if coreChannel in self.compatibilityMatrix:
             return self.compatibilityMatrix[coreChannel][appId]
         else:
             return []
 
+    @logMethodCall
     def fatalError(self, message: str, exception: Exception = None) -> None:
         if exception is not None:
             logger.error(message)
@@ -232,6 +249,7 @@ class BaseApp(PrintMixin, PromptMixin):
             print_formatted_text(HTML(f"<Red>Fatal Error: {message.replace(' & ', ' &amp; ')}</Red>\n"))
         exit(1)
 
+    @logMethodCall
     def isSNO(self):
         if self._isSNO is None:
             self._isSNO = isSNO(self.dynamicClient)
@@ -256,6 +274,7 @@ class BaseApp(PrintMixin, PromptMixin):
         else:
             return self.reloadDynamicClient()
 
+    @logMethodCall
     def reloadDynamicClient(self):
         """
         Configure the Kubernetes API Client using the active context in kubeconfig
@@ -277,6 +296,7 @@ class BaseApp(PrintMixin, PromptMixin):
             logger.exception(e, stack_info=True)
             return None
 
+    @logMethodCall
     def connect(self):
         promptForNewServer = False
         self.reloadDynamicClient()
@@ -288,7 +308,7 @@ class BaseApp(PrintMixin, PromptMixin):
                 print()
                 if not self.noConfirm:
                     # We are already connected to a cluster, but prompt the user if they want to use this connection
-                    promptForNewServer = not self.yesOrNo("Proceed with this cluster?")
+                    promptForNewServer = not self.yesOrNo("Proceed with this cluster")
             except Exception as e:
                 # We are already connected to a cluster, but the connection is not valid so prompt for connection details
                 logger.debug("Failed looking up OpenShift Console route to verify connection")
@@ -309,6 +329,24 @@ class BaseApp(PrintMixin, PromptMixin):
                 print_formatted_text(HTML("<Red>Unable to connect to cluster.  See log file for details</Red>"))
                 exit(1)
 
+        # Now that we are connected, inspect the architecture of the OpenShift cluster
+        self.lookupTargetArchitecture()
+
+    @logMethodCall
+    def lookupTargetArchitecture(self, architecture: str = None) -> None:
+        logger.debug("Looking up worker node architecture")
+        if architecture is not None:
+            self.architecture = architecture
+            logger.debug(f"Target architecture (overridden): {self.architecture}")
+        else:
+            nodes = getNodes(self.dynamicClient)
+            self.architecture = nodes[0]["status"]["nodeInfo"]["architecture"]
+            logger.debug(f"Target architecture: {self.architecture}")
+
+        if self.architecture not in ["amd64", "s390x"]:
+            self.fatalError(f"Unsupported worker node architecture: {self.architecture}")
+
+    @logMethodCall
     def initializeApprovalConfigMap(self, namespace: str, id: str, key: str = None, maxRetries: int = 100, delay: int = 300, ignoreFailure: bool = True) -> None:
         """
         Set key = None if you don't want approval workflow enabled

{mas_cli-11.5.0 → mas_cli-11.7.0}/src/mas/cli/gencfg.py

@@ -10,17 +10,11 @@
 
 from os import path
 from jinja2 import Template
+from base64 import b64encode
 
 
 class ConfigGeneratorMixin():
-    def generateJDBCCfg(
-            self,
-            instanceId: str,
-            scope: str,
-            destination: str,
-            appId: str = "",
-            workspaceId: str = "") -> None:
-
+    def generateJDBCCfg(self, instanceId: str, scope: str, destination: str, appId: str = "", workspaceId: str = "") -> None:
         templateFile = path.join(self.templatesDir, "jdbccfg.yml.j2")
         with open(templateFile) as tFile:
             template = Template(tFile.read())
@@ -64,3 +58,33 @@ class ConfigGeneratorMixin():
         with open(destination, 'w') as f:
             f.write(cfg)
             f.write('\n')
+
+    def generateMongoCfg(self, instanceId: str, destination: str) -> None:
+        templateFile = path.join(self.templatesDir, "suite_mongocfg.yml.j2")
+
+        with open(templateFile) as tFile:
+            template = Template(tFile.read())
+
+        name = self.promptForString("Configuration Display Name")
+        hosts = self.promptForString("MongoDb Hosts (comma-separated list)")
+
+        username = self.promptForString("MongoDb Username")
+        password = self.promptForString("MongoDb Password", isPassword=True)
+        encoded_username = b64encode(username.encode('ascii')).decode("ascii")
+        encoded_password = b64encode(password.encode('ascii')).decode("ascii")
+        sslCertFile = self.promptForFile("Path to certificate file")
+        with open(sslCertFile) as cFile:
+            certLocalFileContent = cFile.read()
+
+        cfg = template.render(
+            mas_instance_id=instanceId,
+            cfg_display_name=name,
+            mongodb_hosts=hosts,
+            mongodb_admin_username=encoded_username,
+            mongodb_admin_password=encoded_password,
+            mongodb_ca_pem_local_file=certLocalFileContent
+        )
+
+        with open(destination, 'w') as f:
+            f.write(cfg)
+            f.write('\n')