mas-cli 11.9.2__py3-none-any.whl → 11.10.0__py3-none-any.whl

mas/cli/update/app.py

@@ -9,7 +9,6 @@
 #
 # *****************************************************************************
 
-import re
 import logging
 import logging.handlers
 from halo import Halo
@@ -22,7 +21,7 @@ from ..validators import StorageClassValidator
 from .argParser import updateArgParser
 
 from mas.devops.ocp import createNamespace, getStorageClasses, getConsoleURL
-from mas.devops.mas import listMasInstances
+from mas.devops.mas import listMasInstances, getCurrentCatalog
 from mas.devops.tekton import preparePipelinesNamespace, installOpenShiftPipelines, updateTektonDefinitions, launchUpdatePipeline
 
 
@@ -205,30 +204,19 @@ class UpdateApp(BaseApp):
                     print()
 
     def reviewCurrentCatalog(self) -> None:
-        catalogsAPI = self.dynamicClient.resources.get(api_version="operators.coreos.com/v1alpha1", kind="CatalogSource")
-        try:
-            catalog = catalogsAPI.get(name="ibm-operator-catalog", namespace="openshift-marketplace")
-            catalogDisplayName = catalog.spec.displayName
-            catalogImage = catalog.spec.image
-
-            m = re.match(r".+(?P<catalogId>v[89]-(?P<catalogVersion>[0-9]+)-amd64)", catalogDisplayName)
-            if m:
-                # catalogId = v8-yymmdd-amd64
-                # catalogVersion = yymmdd
-                self.installedCatalogId = m.group("catalogId")
-            elif re.match(r".+v8-amd64", catalogDisplayName):
-                self.installedCatalogId = "v8-amd64"
-            else:
-                self.installedCatalogId = None
-                self.printWarning("Unable to determine identity & version of currently installed ibm-maximo-operator-catalog")
-
+        catalogInfo = getCurrentCatalog(self.dynamicClient)
+        self.installedCatalogId = None
+        if catalogInfo is None:
+            self.fatalError("Unable to locate existing install of the IBM Maximo Operator Catalog")
+        elif catalogInfo["catalogId"] is None:
+            self.printWarning("Unable to determine identity & version of currently installed ibm-maximo-operator-catalog")
+        else:
+            self.installedCatalogId = catalogInfo["catalogId"]
             self.printH1("Review Installed Catalog")
             self.printDescription([
-                f"The currently installed Maximo Operator Catalog is <u>{catalogDisplayName}</u>",
-                f" <u>{catalogImage}</u>"
+                f"The currently installed Maximo Operator Catalog is <u>{catalogInfo['displayName']}</u>",
+                f" <u>{catalogInfo['image']}</u>"
             ])
-        except NotFoundError as e:
-            self.fatalError("Unable to locate existing install of the IBM Maximo Operator Catalog", e)
 
     def reviewMASInstance(self) -> None:
         self.printH1("Review MAS Instances")

{mas_cli-11.9.2.dist-info → mas_cli-11.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mas-cli
-Version: 11.9.2
+Version: 11.10.0
 Summary: Python Admin CLI for Maximo Application Suite
 Home-page: https://github.com/ibm-mas/cli
 Author: David Parker
@@ -17,17 +17,17 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Communications
 Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: mas-devops >=1.7.1
+Requires-Dist: mas-devops>=1.10.0
 Requires-Dist: halo
-Requires-Dist: prompt-toolkit
+Requires-Dist: prompt_toolkit
 Requires-Dist: openshift
 Requires-Dist: kubernetes
 Requires-Dist: tabulate
 Provides-Extra: dev
-Requires-Dist: build ; extra == 'dev'
-Requires-Dist: flake8 ; extra == 'dev'
-Requires-Dist: pytest ; extra == 'dev'
-Requires-Dist: pyinstaller ; extra == 'dev'
+Requires-Dist: build; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pyinstaller; extra == "dev"
 
 mas.devops
 ----------

{mas_cli-11.9.2.dist-info → mas_cli-11.10.0.dist-info}/RECORD

@@ -1,23 +1,23 @@
-mas/cli/__init__.py,sha256=gGa3ciwWwvnBYNw46UOHW6SGSBs8SyVFifPRbGCWS40,526
-mas/cli/cli.py,sha256=ZWluhUJgUw7d3R6P0s7o2Ae9TfXqb_3J8VGKI7fs_b0,15811
-mas/cli/displayMixins.py,sha256=VVL2kWzPTqNQy63WT-tYIDnYa7SX3w33QX2XjSWVHWk,5636
+mas/cli/__init__.py,sha256=iSdNxT_1K6squ02f99IEWgoPtOyDmCEbnqQAQWidAnI,527
+mas/cli/cli.py,sha256=yrT2ryPZPA2TCYO4aJxjBwnRWThInu1KAmpQbPN6UyE,15830
+mas/cli/displayMixins.py,sha256=rsLWW5s7dcCKv9NdUaGcOsuqC9gUW8B9_AfHBuE5E6U,5954
 mas/cli/gencfg.py,sha256=p38Ss_ooiNHOZTJT8l0YxDaEaPwD4ZXgxEbW-S9YLNY,3311
 mas/cli/validators.py,sha256=vi1pFA8QtqMhqtGk1NlkkNDUrlFCi53kS5wJqFGDgOU,5108
 mas/cli/install/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,508
-mas/cli/install/app.py,sha256=2K8esyvQ-dpDWIhqb5HrTnu6UUYtFaRBb4iKZ-wRiMA,54052
+mas/cli/install/app.py,sha256=AnP3Y_IVgaWAvsE4nBNf-o9eXfXeMz0mJFbhiH38DpY,57783
 mas/cli/install/argBuilder.py,sha256=dATpbY1kojvhr35NixZ11WZD3DzEJAfaAWhaYFLhEnQ,23033
 mas/cli/install/argParser.py,sha256=dt06eSJkZFqzMD0gboMDUBbfIrDnLB3nEowFAs3_Th4,33205
-mas/cli/install/catalogs.py,sha256=44gOkCNFPNAZ1yBAz-h3IvDE1RrW2tv1kMWQVombk9o,4076
+mas/cli/install/catalogs.py,sha256=ki-yYW_Qkfz-cX9MW8cCOK-KuUaPNuw7Jie_bnjvO7M,640
 mas/cli/install/params.py,sha256=niefj7fwDvwDVjCOiRybURk6lNUWliv8IXNCX-mIkZw,4780
 mas/cli/install/summarizer.py,sha256=EW-9lIQQu9a0HWJeDP33socVKqTikkpr74n7uqa6QTs,21050
 mas/cli/install/settings/__init__.py,sha256=RdyBSh-rM0wkuvILVzJ1gxjOtLuQ1mF6QbEL0MyiKIY,1034
-mas/cli/install/settings/additionalConfigs.py,sha256=bTNDizLM7I8qu_PY3yGXupdzxVXSOyT4P_r1TJXgCsk,9402
-mas/cli/install/settings/db2Settings.py,sha256=eLwk4rNpDg4jdnc_FWdwg7hQ4vQ8NyMrTmjxLutE4eA,12969
-mas/cli/install/settings/kafkaSettings.py,sha256=Fe3WKIP-c9g6R9Oa3mfLIjnB6wcIhEdWiHlGyl-gIU0,7217
-mas/cli/install/settings/manageSettings.py,sha256=StTU-CocoDHs3fIVy5RjC5zJ8pLbPIeKIyjCApa52C4,16165
+mas/cli/install/settings/additionalConfigs.py,sha256=QyeVN_y3aXL3GU5RxtfPSgQTon72eSj6_xlwSwJvoMQ,9426
+mas/cli/install/settings/db2Settings.py,sha256=0jWV_Wgvs5X7UcGQGRa3KA6qAZoJsYgP5kxX1yKZsIY,13003
+mas/cli/install/settings/kafkaSettings.py,sha256=oJxFhWQkqPi7Do53tu4oxskGbEL4hroH2129OLom5lU,7241
+mas/cli/install/settings/manageSettings.py,sha256=rBBq3r9AaDS5fLeKbItgLBnsguuZwyNKo80oYBBEB-0,16241
 mas/cli/install/settings/mongodbSettings.py,sha256=mFKL58d7ZxKkPkViUVAQTGhOxPSwAp5l2nhO0QF31qA,2356
-mas/cli/install/settings/turbonomicSettings.py,sha256=4MWrbZmnToeaDsstfJTn2DvUviokCyjlBM-GPQd4a8A,1678
-mas/cli/templates/ibm-mas-tekton.yaml,sha256=RGghyAO6Oo2RXNJOpzU4MjEyPkpdckynTUQINKQf1aE,787668
+mas/cli/install/settings/turbonomicSettings.py,sha256=wRAFV0Rg3Em_ILkLd8xR-a_oglXivnVeF6nVI_73Q9o,1695
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=9rWhxDdvyYzMdKlehY26JD_4eOHHMZus9T4AmTUW63Y,787917
 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
@@ -94,13 +94,13 @@ 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=nR9fdqe_UDSgeht7FTSN6NRmL2FqW1jbPg86e3r7Kcw,37695
+mas/cli/update/app.py,sha256=Fhf6WAcps6OME6ylLEWB5F8mlMx4FO3S0pXVihjYX_s,37136
 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=f1qfvzRdmf7YiYMtVTqKwE5RFVMcUkLGavCIZDuU_7c,5247
 mas/cli/upgrade/argParser.py,sha256=zk629svjIk-hD40Ytc5e5UOLO3xogVrfqSz09S17mWw,1882
-mas_cli-11.9.2.data/scripts/mas-cli,sha256=Es-wSefTBcR3Vs5_kIUHQLfWHxTXVrmIPMFY0hbrxt8,3493
-mas_cli-11.9.2.dist-info/METADATA,sha256=wO8mmBPfFrYE4we-1hM58yzb9vWgVNo2RHGkzvqXlUU,2084
-mas_cli-11.9.2.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-mas_cli-11.9.2.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-11.9.2.dist-info/RECORD,,
+mas_cli-11.10.0.data/scripts/mas-cli,sha256=Es-wSefTBcR3Vs5_kIUHQLfWHxTXVrmIPMFY0hbrxt8,3493
+mas_cli-11.10.0.dist-info/METADATA,sha256=8spG8Foq-KendEUtHJx7dHgOfMYt7xmK_xGF5lXL4fs,2081
+mas_cli-11.10.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mas_cli-11.10.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-11.10.0.dist-info/RECORD,,

{mas_cli-11.9.2.dist-info → mas_cli-11.10.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any