mas-cli 23.1.0__tar.gz → 23.2.0__tar.gz

{mas_cli-23.1.0/python/src/mas_cli.egg-info → mas_cli-23.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-cli
-Version: 23.1.0
+Version: 23.2.0
 Summary: Python Admin CLI for Maximo Application Suite
 Author-email: David Parker <parkerda@uk.ibm.com>
 License-Expression: EPL-1.0

{mas_cli-23.1.0 → mas_cli-23.2.0}/README.md

@@ -18,4 +18,5 @@ Documentation
 Want to contribute to MAS Command Line Interface?
 --------------------------------------------------------------------------------
 We welcome every Maximo Application Suite users, developers and enthusiasts to contribute to the MAS Command Line Interface while fixing code issues and implementing new automated functionalities.
-You can contribute to this collection by raising [a new issue](https://github.com/ibm-mas/cli/issues) with suggestions on how to make our MAS automation engine even better, or if you want to become a new code contributor, please refer to the [Contributing Guidelines](CONTRIBUTING.md) and learn more about how to get started.
+
+You can contribute to this collection by raising [a new issue](https://github.com/ibm-mas/cli/issues) with suggestions on how to make our MAS automation engine even better, or if you want to become a new code contributor, please refer to the [Contributing Guidelines](CONTRIBUTING.md) and learn more about how to get started.

{mas_cli-23.1.0 → mas_cli-23.2.0}/python/src/mas/cli/__init__.py

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

{mas_cli-23.1.0 → mas_cli-23.2.0}/python/src/mas/cli/cli.py

@@ -126,7 +126,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger("urllib3").setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version: str = "23.1.0"
+        self.version: str = "23.2.0"
         self.h1count: int = 0
         self.h2count: int = 0
 

{mas_cli-23.1.0 → mas_cli-23.2.0}/python/src/mas/cli/install/app.py

@@ -1271,8 +1271,11 @@ class InstallApp(
         if self.installPredict:
             self.configAppChannel("predict")
 
-        # Assist is only installable on MAS 9.0.x due to withdrawal of support for Watson Discovery in our managed dependency stack and the inability of Assist 8.x to support this
-        if isVersionEqualOrAfter("9.0.0", self.getParam("mas_channel")):
+        # Assist is only installable on MAS 9.0.x and 9.1.x
+        # - Not supported before 9.0.0 due to withdrawal of support for Watson Discovery
+        # - Not supported from 9.2.0 onwards
+        mas_channel = self.getParam("mas_channel")
+        if isVersionEqualOrAfter("9.0.0", mas_channel) and not isVersionEqualOrAfter("9.2.0", mas_channel):
             self.installAssist = self.yesOrNo("Install Assist")
             if self.installAssist:
                 self.configAppChannel("assist")
@@ -2210,6 +2213,18 @@ class InstallApp(
             # value = "" means the paramerter was explicitly set to "don't install this application"
             elif key == "assist_channel":
                 if value is not None and value != "":
+                    # Validate that Assist is supported for the selected MAS version
+                    mas_channel = self.getParam("mas_channel")
+                    if isVersionEqualOrAfter("9.2.0", mas_channel):
+                        self.fatalError(
+                            f"Assist is not supported in MAS 9.2 or higher (selected channel: {mas_channel}). "
+                            "Assist is only available for MAS 9.0.x and 9.1.x versions."
+                        )
+                    elif not isVersionEqualOrAfter("9.0.0", mas_channel):
+                        self.fatalError(
+                            f"Assist is not supported in MAS versions before 9.0.0 (selected channel: {mas_channel}). "
+                            "Assist is only available for MAS 9.0.x and 9.1.x versions."
+                        )
                     self.setParam("mas_app_channel_assist", value)
                     self.installAssist = True
             elif key == "iot_channel":

{mas_cli-23.1.0 → mas_cli-23.2.0}/python/src/mas/cli/must_gather/app.py

@@ -301,10 +301,10 @@ class MustGatherApp(BaseApp):
                 ("cluster_resources", ocp.collectClusterResources, outputDir),
                 ("nodes", ocp.collectNodes, outputDir),
                 ("airgap_resources", ocp.collectAirgapResources, self.dynamicClient, outputDir),
-                ("marketplace_resources", ocp.collectMarketplaceResources, outputDir),
             ]
             plan.addGroup("OpenShift Container Platform", ocpTasks)
-            logger.debug("Added OCP collection group with 4 tasks to plan")
+            logger.debug("Added OCP collection group with 3 tasks to plan")
+            ocp.addMarketplaceToCollectionPlan(plan=plan, dynClient=self.dynamicClient, outputDir=outputDir, noLogs=parsedArgs.no_logs)
         else:
             logger.debug("Skipping OCP collection (not in collectors list)")
 

{mas_cli-23.1.0 → mas_cli-23.2.0}/python/src/mas/cli/must_gather/ocp/__init__.py

@@ -13,12 +13,13 @@
 from .cluster import collectClusterResources
 from .nodes import collectNodes
 from .airgap import collectAirgapResources, detectAirgapEnvironment
-from .marketplace import collectMarketplaceResources
+from .marketplace import generateMarketplaceCollectionTasks, addMarketplaceToCollectionPlan
 
 __all__ = [
     "collectClusterResources",
     "collectNodes",
     "collectAirgapResources",
     "detectAirgapEnvironment",
-    "collectMarketplaceResources",
+    "generateMarketplaceCollectionTasks",
+    "addMarketplaceToCollectionPlan",
 ]

mas_cli-23.2.0/python/src/mas/cli/must_gather/ocp/marketplace.py

@@ -0,0 +1,63 @@
+# *****************************************************************************
+# Copyright (c) 2026 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
+#
+# *****************************************************************************
+
+"""OpenShift Marketplace resource collection."""
+
+import logging
+from typing import List, Tuple
+
+from kubernetes.dynamic import DynamicClient
+
+logger = logging.getLogger(__name__)
+
+# CatalogSource is the marketplace-specific custom resource
+_MARKETPLACE_CUSTOM_RESOURCES = [
+    ("operators.coreos.com/v1alpha1", "CatalogSource"),
+]
+
+
+def generateMarketplaceCollectionTasks(dynClient: DynamicClient, outputDir: str, noLogs: bool = False) -> List[Tuple]:
+    """Generate collection tasks for the openshift-marketplace namespace.
+
+    Uses generateNamespaceCollectionTasks to produce the standard set of tasks
+    (pods, pod logs, secrets, configmaps, services, deployments, etc.) plus
+    CatalogSource as a marketplace-specific custom resource.
+
+    Args:
+        dynClient (DynamicClient): Kubernetes Dynamic Client for API access
+        outputDir (str): Base output directory for collected resources
+        noLogs (bool, optional): If True, skip pod log collection. Defaults to False.
+
+    Returns:
+        list: List of task tuples for namespace collection
+    """
+    from mas.cli.must_gather.common.task_generation import generateNamespaceCollectionTasks
+
+    return generateNamespaceCollectionTasks(
+        dynClient=dynClient,
+        namespace="openshift-marketplace",
+        outputDir=outputDir,
+        noLogs=noLogs,
+        customResources=_MARKETPLACE_CUSTOM_RESOURCES,
+    )
+
+
+def addMarketplaceToCollectionPlan(plan, dynClient: DynamicClient, outputDir: str, noLogs: bool = False) -> None:
+    """Add OpenShift Marketplace collection tasks to the collection plan.
+
+    Args:
+        plan (CollectionPlan): Collection plan to add tasks to
+        dynClient (DynamicClient): Kubernetes Dynamic Client for API access
+        outputDir (str): Base output directory for collected resources
+        noLogs (bool, optional): If True, skip pod log collection. Defaults to False.
+    """
+    tasks = generateMarketplaceCollectionTasks(dynClient=dynClient, outputDir=outputDir, noLogs=noLogs)
+    plan.addGroup("OpenShift Marketplace", tasks)
+    logger.debug(f"Added {len(tasks)} marketplace collection tasks to plan")