mas-cli 15.4.0__py3-none-any.whl → 15.6.0__py3-none-any.whl

mas/cli/update/app.py

@@ -11,6 +11,7 @@
 
 import logging
 import logging.handlers
+from typing import Callable
 from halo import Halo
 from prompt_toolkit import print_formatted_text, HTML
 
@@ -21,7 +22,7 @@ from ..validators import StorageClassValidator
 from .argParser import updateArgParser
 
 from mas.devops.ocp import createNamespace, getStorageClasses, getConsoleURL
-from mas.devops.mas import listMasInstances, getCurrentCatalog
+from mas.devops.mas import listMasInstances, listAiServiceInstances, getCurrentCatalog
 from mas.devops.tekton import preparePipelinesNamespace, installOpenShiftPipelines, updateTektonDefinitions, launchUpdatePipeline
 
 
@@ -94,7 +95,10 @@ class UpdateApp(BaseApp):
         # deprecated MaximoApplicationSuite ImageContentSourcePolicy instead of the new ImageDigestMirrorSet
         self.isAirgap()
         self.reviewCurrentCatalog()
-        self.reviewMASInstance()
+        isMasInstalled = self.reviewMASInstance()
+        isAiServiceInstalled = self.reviewAiServiceInstance()
+        if not isMasInstalled and not isAiServiceInstalled:
+            self.fatalError(["No MAS or AI Service instances were detected on the cluster => nothing to update! See log file for details"])
 
         if self.args.mas_catalog_version is None:
             # Interactive mode
@@ -228,15 +232,23 @@ class UpdateApp(BaseApp):
                 f" <u>{catalogInfo['image']}</u>"
             ])
 
-    def reviewMASInstance(self) -> None:
-        self.printH1("Review MAS Instances")
-        self.printDescription(["The following MAS intances are installed on the target cluster and will be affected by the catalog update:"])
+    def reviewMASInstance(self) -> bool:
+        return self.reviewInstances(listMasInstances, 'MAS', 'Suite.core.mas.ibm.com/v1')
+
+    def reviewAiServiceInstance(self) -> bool:
+        return self.reviewInstances(listAiServiceInstances, 'AI Service', 'AIServiceApp.aiservice.ibm.com/v1')
+
+    def reviewInstances(self, getInstances: Callable, name: str, kind: str) -> bool:
+        self.printH1(f"Review {name} Instances")
         try:
-            suites = listMasInstances(self.dynamicClient)
-            for suite in suites:
-                self.printDescription([f"- <u>{suite['metadata']['name']}</u> v{suite['status']['versions']['reconciled']}"])
+            instances = getInstances(self.dynamicClient)
+            self.printDescription([f"The following {name} instances are installed on the target cluster and will be affected by the catalog update:"])
+            for instance in instances:
+                self.printDescription([f"- <u>{instance['metadata']['name']}</u> v{instance['status']['versions']['reconciled']}"])
+            return True
         except ResourceNotFoundError:
-            self.fatalError("No MAS instances were detected on the cluster (Suite.core.mas.ibm.com/v1 API is not available).  See log file for details")
+            self.printDescription([f"No {name} instances were detected on the cluster ({kind} API is not available)"])
+            return False
 
     def chooseCatalog(self) -> None:
         self.printH1("Select IBM Maximo Operator Catalog Version")

mas/cli/validators.py

@@ -151,6 +151,24 @@ class JsonValidator(Validator):
             raise (ValidationError(message='Enter a valid JSON', cursor_position=len(inputJson)))
 
 
+class LanguageValidator(Validator):
+    def __init__(self, _language_list):
+        """
+        This function was created to give context of the array that will
+        be validated
+        """
+        self._language_list = _language_list
+
+    def validate(self, document):
+        """
+        Validate if an input it's outside of an list
+        """
+        languages = document.text
+        for language in languages.split(","):
+            if language.upper() not in self._language_list:
+                raise (ValidationError(message='Language not supported. Please select value(s) from the list', cursor_position=len(languages)))
+
+
 class BucketPrefixValidator(Validator):
     def validate(self, document):
         """

{mas_cli-15.4.0.dist-info → mas_cli-15.6.0.dist-info}/METADATA

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

{mas_cli-15.4.0.dist-info → mas_cli-15.6.0.dist-info}/RECORD

@@ -1,30 +1,30 @@
-mas/cli/__init__.py,sha256=j5gTptbFChwynOmhMQP6gl7ZZl9c6aCl8bS0iHbY8Zw,526
-mas/cli/cli.py,sha256=TvAP_69oZVoTuUIW1vMtaH9GFmLqC9GP-XaJHlLgOzU,18932
-mas/cli/displayMixins.py,sha256=e3lAx1DIOwsriDcNI0M2JyP1jeLOZKvId6sPrvWLyqs,5984
+mas/cli/__init__.py,sha256=NrdybHpjopT6bb3DvpYs1lU1RphtuE5Lg_8sOnTkCi0,526
+mas/cli/cli.py,sha256=HhAOLkz8BseG01jTgIyWQlemrMvg6_XvZDwHbYVjtlQ,19221
+mas/cli/displayMixins.py,sha256=o61M4Jdi7hXk7aopIfShT9oTh1lrrRd_GgfKu4QvgUM,6056
 mas/cli/gencfg.py,sha256=kgbYihOcqGADK8XnrfcEoBawaY1qSGKuVNW1unACOnU,4433
-mas/cli/validators.py,sha256=YBxkKOHO0d-EK61nUflVOd0-Mxmjuq_nbPYWyKD0VKc,5844
+mas/cli/validators.py,sha256=-QbWyHJI5g9l_PVQBtnKrk4y8b8K0AKoKqtnO6EFqnI,6481
 mas/cli/aiservice/install/__init__.py,sha256=Af-TjB2oIy3bM-Rt3YNeJ_2ndsZZU7azqFkT5um7XQY,515
-mas/cli/aiservice/install/app.py,sha256=Q_dGHKp2rFIrO0jNHynRAm9nU6o5eDPT71yyWJAyuv4,42676
+mas/cli/aiservice/install/app.py,sha256=R2WVPXm1cbNpEZSclJ974_enpy8Y4owkWlXLbvx0iNo,42757
 mas/cli/aiservice/install/argBuilder.py,sha256=ItOMJmXxT5h3Hpcpc24UwN7lbeVHIRNACpkyu8tumAo,9259
 mas/cli/aiservice/install/argParser.py,sha256=EM0Kj1gb7zamtaN4q50wDK-jioNfbN5gxtMbsWd616Q,13941
 mas/cli/aiservice/install/params.py,sha256=E6cAbpbqADJ6jn7CRnoJXjWDhmOStPclfWNmmS_n2PM,2290
 mas/cli/aiservice/install/summarizer.py,sha256=WO0SR8H1mFBN8mn17eoq1tNf7mvNjlgVSu1Lx0fAfp8,6008
 mas/cli/install/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,508
-mas/cli/install/app.py,sha256=tDsLlv_p8mm1Jls3t8p1XmHfJFpgjENd9GXfkL0kzrs,69941
+mas/cli/install/app.py,sha256=_sp45oE4VgnrnEx75SFxGqWucvUM5sFBM5AhogWJXls,69999
 mas/cli/install/argBuilder.py,sha256=lco77lRujd7uK2enc8urcR7MXXuqSUY_o2U045SyRVA,29072
 mas/cli/install/argParser.py,sha256=sOa0Irmt1azaSal24wk4aFgDoYeUFvh2HzzKYOLClFQ,36271
 mas/cli/install/catalogs.py,sha256=RzDAyHifYn37dokRJtOH9UbArZllQmpl4GficvG9-1I,862
-mas/cli/install/params.py,sha256=GWJHkMCMCGB9WdlYBhOrY2GxU-hfIlA-r8MdHZyEISY,4993
+mas/cli/install/params.py,sha256=bUJzf2V3oJhsIH9-OUp0BOfzD-ycxh3HWaIKL7DlU2Q,4919
 mas/cli/install/summarizer.py,sha256=svii5I_If3bhTMatzgfDngtG5BC-MJAHLPdPrnN1tGI,22640
 mas/cli/install/settings/__init__.py,sha256=RdyBSh-rM0wkuvILVzJ1gxjOtLuQ1mF6QbEL0MyiKIY,1034
 mas/cli/install/settings/additionalConfigs.py,sha256=hFN7OIiPmmAoo8h_5JiMLtW9r30zK1mMKuPqPpFf1mc,10187
 mas/cli/install/settings/db2Settings.py,sha256=zFw1wiZTGFLdUsQUKY0l5dWne4ZXQhKuksSO0Q_86AM,16825
 mas/cli/install/settings/kafkaSettings.py,sha256=r1uK-IApqB9IQiSNt_8sP0wa4FPJcXU_qnadhElEOuI,7241
-mas/cli/install/settings/manageSettings.py,sha256=796r5Gyub07cPn8q65kh_h-KjFRVCHeQNq0ADiehWf8,16244
+mas/cli/install/settings/manageSettings.py,sha256=VEMOkFoyJot29Sc8DrTg2ytZiM6Ga5gTeVftoW-yuIU,16878
 mas/cli/install/settings/mongodbSettings.py,sha256=aZdQHpeMwLVznrJWAkJsZu2Ok9t4Dkra2RGa_uKJHaY,2604
 mas/cli/install/settings/turbonomicSettings.py,sha256=ul4eWf53b1NCzJTFsEPX6DWM23YUlWILYBygplqXYlU,1631
 mas/cli/templates/facilities-configs.yml.j2,sha256=Er4UwxUl1Y3rtjIPMExVM8EXNcbesMusgLcRV050B1s,774
-mas/cli/templates/ibm-mas-tekton.yaml,sha256=1R8k16JhOMsRNAXrfGKVgQ-zsJ4W5IT1EyQmyj56hkM,1563093
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=6VO-Oz19EhNLHfYXDCUEdSWEQbf0NYBhfL_oVPH55lM,1580876
 mas/cli/templates/jdbccfg.yml.j2,sha256=cANbwkUkKEPQp-P3_BB_Llbt94457Ciagah2hOdySIM,1644
 mas/cli/templates/suite_mongocfg.yml.j2,sha256=WrgJUfGyvfaRIHjY5VR_zLZ5irTpV5khKNq76ejIxKU,1606
 mas/cli/templates/pod-templates/best-effort/ibm-data-dictionary-assetdatadictionary.yml,sha256=8VG_FDFcEjWNaAOZTcS58Pe0tWOXC10SJLloNqzEMC8,757
@@ -101,14 +101,14 @@ mas/cli/uninstall/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc
 mas/cli/uninstall/app.py,sha256=uPJy3z-1Yt66MSFdZz1Qh8MjA97ZrQmjSgTx-Gqua9I,10047
 mas/cli/uninstall/argParser.py,sha256=VVG4myUvFOtg98L6HAzpgGg7s5c-vub_UMZPGuNQko4,3452
 mas/cli/update/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,508
-mas/cli/update/app.py,sha256=wEJx7eyHlhM70uoa8iccKAF7T2MHQ33laxQ40Y-vziE,39559
+mas/cli/update/app.py,sha256=xRodxuqcd840w952MDseoIptnbNoXV_9nK957AnEYAs,40264
 mas/cli/update/argParser.py,sha256=oOIXzB_rsI2p3og_5X5SFt_g7LURyEdLxZeiGCKq1nU,4711
 mas/cli/upgrade/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,508
 mas/cli/upgrade/app.py,sha256=ZaT8tGrFfIsZM2dkvoYBy89EiqQ0ZKgEfhbMYdf0UEc,8873
 mas/cli/upgrade/argParser.py,sha256=5JxAcbwKjFKCKnbucCxg7Xacdhjphb9nRORfsgB1h_0,2196
 mas/cli/upgrade/settings/__init__.py,sha256=QI2CUsj-NXBU1qrPOsOk4MbeWnfNq0UOF3rYYc_1l2A,775
-mas_cli-15.4.0.data/scripts/mas-cli,sha256=ijL4Ecg_2fRtdrQ8Mk28qsi6o3O6KRIAUM8BUry5cPs,3621
-mas_cli-15.4.0.dist-info/METADATA,sha256=TxxsdJ4tBElD35MxIB5th-TXp2dPOlrG00M7Jn-P6_I,2258
-mas_cli-15.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mas_cli-15.4.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-15.4.0.dist-info/RECORD,,
+mas_cli-15.6.0.data/scripts/mas-cli,sha256=ijL4Ecg_2fRtdrQ8Mk28qsi6o3O6KRIAUM8BUry5cPs,3621
+mas_cli-15.6.0.dist-info/METADATA,sha256=Oele7mhioSLLfbGn5SX2kkst51CCNhr9-wxcqCA9qBQ,2258
+mas_cli-15.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mas_cli-15.6.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-15.6.0.dist-info/RECORD,,