mas-cli 21.0.0__tar.gz → 21.2.0__tar.gz

{mas_cli-21.0.0/src/mas_cli.egg-info → mas_cli-21.2.0}/PKG-INFO

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

{mas_cli-21.0.0 → mas_cli-21.2.0}/src/mas/cli/__init__.py

@@ -10,4 +10,4 @@
 
 from .cli import BaseApp  # noqa: F401
 
-__version__ = "21.0.0"  # Python module compatible semver
+__version__ = "21.2.0"  # Python module compatible semver

{mas_cli-21.0.0 → mas_cli-21.2.0}/src/mas/cli/cli.py

@@ -120,7 +120,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version: str = "21.0.0"
+        self.version: str = "21.2.0"
         self.h1count: int = 0
         self.h2count: int = 0
 

{mas_cli-21.0.0 → mas_cli-21.2.0}/src/mas/cli/install/app.py

@@ -2150,6 +2150,36 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             if not hasKafkaConfig:
                 self.fatalError("--iot-channel requires Kafka configuration. Provide Kafka install arguments such as --kafka-provider, or supply a BYO Kafka config file named kafka-<mas-instance-id>-system.yaml using --additional-configs")
 
+        # Validate Kafka requirements for CIVIL installation in non-interactive mode
+        isCivilEnabled = self.installManage and "civil=" in self.getParam("mas_appws_components")
+        if isCivilEnabled:
+            manageChannel = self.getParam("mas_app_channel_manage")
+            if manageChannel and isVersionEqualOrAfter('9.2.0', manageChannel):
+                kafkaAction = self.getParam("kafka_action_system")
+                hasKafkaConfig = kafkaAction in ["install", "byo"]
+                if not hasKafkaConfig:
+                    # Warn user but give option to proceed (Civil will work, but Defect Detection won't)
+                    print_formatted_text(HTML("<Yellow>⚠ Warning: Kafka Configuration Required</Yellow>"))
+                    print_formatted_text(HTML(
+                        f"<LightSlateGrey>Installing Manage {manageChannel} with Civil Infrastructure component "
+                        "requires Kafka configuration. Civil versions >= 9.2.0 require a shared system-scope Kafka instance.</LightSlateGrey>"
+                    ))
+                    print_formatted_text(HTML(
+                        "<LightSlateGrey>Without Kafka, the Defect Detection functionality will not work.</LightSlateGrey>"
+                    ))
+                    print()
+
+                    if self.noConfirm:
+                        # In non-interactive mode, log warning and proceed
+                        logger.warning(
+                            f"Installing Manage {manageChannel} with Civil component without Kafka configuration. "
+                            "Defect Detection functionality will not work."
+                        )
+                    else:
+                        # In interactive mode, ask user if they want to proceed
+                        if not self.yesOrNo("Do you want to proceed with the installation without Kafka? (Defect Detection functionality will not work)"):
+                            self.fatalError("Installation cancelled. Please configure Kafka before installing.")
+
     @logMethodCall
     def install(self, argv):
         """

{mas_cli-21.0.0 → mas_cli-21.2.0}/src/mas/cli/install/settings/kafkaSettings.py

@@ -11,6 +11,7 @@
 from typing import TYPE_CHECKING, Dict, List, NoReturn
 from os import path
 from prompt_toolkit import print_formatted_text
+from mas.devops.utils import isVersionEqualOrAfter
 
 
 if TYPE_CHECKING:
@@ -23,6 +24,7 @@ class KafkaSettingsMixin():
         # Attributes from BaseApp and other mixins
         params: Dict[str, str]
         installIoT: bool
+        installManage: bool
         showAdvancedOptions: bool
         localConfigDir: str | None
 
@@ -71,14 +73,49 @@ class KafkaSettingsMixin():
         def selectLocalConfigDir(self) -> None:
             ...
 
+    def _requiresKafkaIoT(self) -> bool:
+        return self.installIoT
+
+    def _requiresKafkaCivil(self) -> bool:
+        isCivilEnabled = self.installManage and "civil=" in self.getParam("mas_appws_components")
+        if isCivilEnabled:
+            manageChannel = self.getParam("mas_app_channel_manage")
+            if manageChannel and isVersionEqualOrAfter('9.2.0', manageChannel):
+                return True
+        return False
+
+    def _getKafkaRequirements(self) -> List[str]:
+        requirements = []
+        if self._requiresKafkaIoT():
+            requirements.append("Maximo IoT")
+        if self._requiresKafkaCivil():
+            requirements.append("Manage Civil Infrastructure (9.2+) Defect Detection")
+        return requirements
+
     def configKafka(self) -> None:
-        if self.installIoT:
+        requirements = self._getKafkaRequirements()
+
+        if requirements:
             self.printH1("Configure Kafka")
-            self.printDescription([
-                "Maximo IoT requires a shared system-scope Kafka instance",
+
+            # Build description based on what requires Kafka
+            hasIoT = self._requiresKafkaIoT()
+            hasCivil = self._requiresKafkaCivil()
+
+            description = []
+            if hasIoT and hasCivil:
+                description.append("Maximo IoT and Manage Civil Infrastructure (9.2+) Defect Detection require a shared system-scope Kafka instance")
+            elif hasIoT:
+                description.append("Maximo IoT requires a shared system-scope Kafka instance")
+            elif hasCivil:
+                description.append("Manage Civil Infrastructure (9.2+) Defect Detection functionality requires a shared system-scope Kafka instance")
+
+            description.extend([
                 "Supported Kafka providers: Strimzi, Red Hat AMQ Streams, IBM Cloud Event Streams and AWS MSK",
                 "You may also choose to configure MAS to use an existing Kafka instance by providing a pre-existing configuration file"
             ])
+
+            self.printDescription(description)
             if self.yesOrNo("Create system Kafka instance using one of the supported providers"):
                 self.setParam("kafka_action_system", "install")