mas-cli 10.1.1__py3-none-any.whl → 10.2.0__py3-none-any.whl

mas/cli/__init__.py

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

mas/cli/cli.py

@@ -75,9 +75,13 @@ class BaseApp(PrintMixin, PromptMixin):
         self.templatesDir = path.join(path.abspath(path.dirname(__file__)), "templates")
         self.tektonDefsPath = path.join(self.templatesDir, "ibm-mas-tekton.yaml")
 
-        # These dicts will hold the additional-configs and pod-templates secrets
+        # Initialize the dictionary that will hold the parameters we pass to a PipelineRun
+        self.params = dict()
+
+        # These dicts will hold the additional-configs, pod-templates and manual certificates secrets
         self.additionalConfigsSecret = None
         self.podTemplatesSecret = None
+        self.certsSecret = None
 
         self._isSNO = None
 
@@ -124,7 +128,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:
-            self.fatalError("Could not find kubectl on the path, see <u>https://kubernetes.io/docs/tasks/tools/#kubectl</u> for installation instructions")
+            self.fatalError("Could not find kubectl on the path, see <DarkGoldenRod><u>https://kubernetes.io/docs/tasks/tools/#kubectl</u></DarkGoldenRod> for installation instructions")
 
     def getCompatibleVersions(self, coreChannel: str, appId: str) -> list:
         if coreChannel in self.compatibilityMatrix:
@@ -136,10 +140,10 @@ class BaseApp(PrintMixin, PromptMixin):
         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>"))
+            print_formatted_text(HTML(f"<Red>Fatal Exception: {message.replace(' & ', ' &amp; ')}: {exception}</Red>\n"))
         else:
             logger.error(message)
-            print_formatted_text(HTML(f"<Red>Fatal Error: {message.replace(' & ', ' &amp; ')}</Red>"))
+            print_formatted_text(HTML(f"<Red>Fatal Error: {message.replace(' & ', ' &amp; ')}</Red>\n"))
         exit(1)
 
     def isSNO(self):

mas/cli/displayMixins.py

@@ -45,6 +45,15 @@ class PrintMixin():
         content[len(content) - 1] = f"{content[len(content) - 1]}</{DESCRIPTIONCOLOR}>"
         print_formatted_text(HTML("\n".join(content)))
 
+    def printHighlight(self, message: str) -> None:
+        if isinstance(message, list):
+            message = "\n".join(message)
+
+        print_formatted_text(HTML(f"<MediumTurquoise>{message.replace(' & ', ' &amp; ')}</MediumTurquoise>"))
+
+    def printWarning(self, message):
+        print_formatted_text(HTML(f"<Red>Warning: {message.replace(' & ', ' &amp; ')}</Red>"))
+
     def printSummary(self, title: str, value: str) -> None:
         titleLength = len(title)
         message = f"{title} {'.' * (40 - titleLength)} {value}"

mas/cli/install/app.py

@@ -284,6 +284,11 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 self.setParam("dns_provider", "")
                 self.setParam("mas_domain", "")
                 self.setParam("mas_cluster_issuer", "")
+            self.manualCerts = self.yesOrNo("Configure manual certificates")
+            self.setParam("mas_manual_cert_mgmt", self.manualCerts)
+            if self.getParam("mas_manual_cert_mgmt"):
+                self.manualCertsDir = self.promptForDir("Enter the path containing the manual certificates", mustExist=True)
+                self.setParam("mas_manual_cert_dir", self.manualCertsDir)
 
     def configDNSAndCertsCloudflare(self):
         # User has chosen to set up DNS integration with Cloudflare
@@ -301,8 +306,8 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         ])
         certIssuer = self.promptForInt("Certificate issuer")
         certIssuerOptions = [
-            f"${self.getParam('mas_instance_id')}-cloudflare-le-prod",
-            f"${self.getParam('mas_instance_id')}-cloudflare-le-stg",
+            f"{self.getParam('mas_instance_id')}-cloudflare-le-prod",
+            f"{self.getParam('mas_instance_id')}-cloudflare-le-stg",
             ""
         ]
         self.setParam("mas_cluster_issuer", certIssuerOptions[certIssuer-1])
@@ -322,8 +327,8 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         ])
         certIssuer = self.promptForInt("Certificate issuer")
         certIssuerOptions = [
-            f"${self.getParam('mas_instance_id')}-cis-le-prod",
-            f"${self.getParam('mas_instance_id')}-cis-le-stg",
+            f"{self.getParam('mas_instance_id')}-cis-le-prod",
+            f"{self.getParam('mas_instance_id')}-cis-le-stg",
             ""
         ]
         self.setParam("mas_cluster_issuer", certIssuerOptions[certIssuer-1])
@@ -764,6 +769,13 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             elif key in ["accept_license", "dev_mode", "skip_pre_check", "no_confirm", "no_wait_for_pvc", "help"]:
                 pass
 
+            elif key == "manual_certificates":
+                if value is not None:
+                    self.setParam("mas_manual_cert_mgmt", True)
+                    self.setParam("mas_manual_cert_dir", value)
+                else:
+                    self.setParam("mas_manual_cert_mgmt", False)
+
             # Fail if there's any arguments we don't know how to handle
             else:
                 print(f"Unknown option: {key} {value}")
@@ -793,9 +805,6 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         # Store all args
         self.args = args
 
-        # Initialize the dictionary that will hold the parameters we pass to the PipelineRun
-        self.params = dict()
-
         # These flags work for setting params in both interactive and non-interactive modes
         if args.skip_pre_check:
             self.setParam("skip_pre_check", "true")
@@ -819,7 +828,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 "catalog": "v9-240625-amd64",
                 "release": "8.11.x",
                 "core": "8.11.12",
-                "assist": "8.8.4",
+                "assist": "N/A",
                 "iot": "8.8.10",
                 "manage": "8.7.9",
                 "monitor": "8.11.8",
@@ -832,12 +841,12 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 "catalog": "v9-240625-amd64",
                 "release": "8.10.x",
                 "core": "8.10.15",
-                "assist": "8.7.5",
+                "assist": "N/A",
                 "iot": "8.7.14",
                 "manage": "8.6.15",
                 "monitor": "8.10.11",
                 "optimizer": "8.4.7",
-                "predict": "8.8.2",
+                "predict": "N/A",
                 "inspection": "8.8.4"
             },
             {
@@ -845,7 +854,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 "catalog": "v8-240528-amd64",
                 "release": "8.11.x",
                 "core": "8.11.11",
-                "assist": "8.8.3",
+                "assist": "N/A",
                 "iot": "8.8.9",
                 "manage": "8.7.8",
                 "monitor": "8.11.7",
@@ -858,12 +867,12 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                 "catalog": "v8-240528-amd64",
                 "release": "8.10.x",
                 "core": "8.10.14",
-                "assist": "8.7.4",
+                "assist": "N/A",
                 "iot": "8.7.13",
                 "manage": "8.6.14",
                 "monitor": "8.10.10",
                 "optimizer": "8.4.6",
-                "predict": "8.8.2",
+                "predict": "N/A",
                 "inspection": "8.8.4"
             }
         ]
@@ -902,9 +911,10 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         entitlementFileBaseName = path.basename(self.slsLicenseFileLocal)
         self.setParam("sls_entitlement_file", f"/workspace/entitlement/{entitlementFileBaseName}")
 
-        # Set up the secrets for additional configs and podtemplates
+        # Set up the secrets for additional configs, podtemplates and manual certificates
         self.additionalConfigs()
         self.podTemplates()
+        self.manualCertificates()
 
         # Show a summary of the installation configuration
         self.displayInstallSummary()
@@ -945,7 +955,8 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                     instanceId=self.getParam("mas_instance_id"),
                     slsLicenseFile=self.slsLicenseFileLocal,
                     additionalConfigs=self.additionalConfigsSecret,
-                    podTemplates=self.podTemplatesSecret
+                    podTemplates=self.podTemplatesSecret,
+                    certs=self.certsSecret
                 )
                 h.stop_and_persist(symbol=self.successIcon, text=f"Namespace is ready ({pipelinesNamespace})")