mas-cli 11.1.3__py3-none-any.whl → 11.2.1__py3-none-any.whl

mas/cli/update/app.py

@@ -52,7 +52,8 @@ class UpdateApp(BaseApp):
                 "kafka_provider",
                 "dro_migration",
                 "dro_storage_class",
-                "dro_namespace"
+                "dro_namespace",
+                "skip_pre_check"
             ]
             for key, value in vars(self.args).items():
                 # These fields we just pass straight through to the parameters and fail if they are not set
@@ -67,7 +68,7 @@ class UpdateApp(BaseApp):
                         self.setParam(key, value)
 
                 # Arguments that we don't need to do anything with
-                elif key in ["skip_pre_check", "no_confirm", "help"]:
+                elif key in [ "no_confirm", "help"]:
                     pass
 
                 # Fail if there's any arguments we don't know how to handle
@@ -166,7 +167,6 @@ class UpdateApp(BaseApp):
                 "Please carefully review your choices above, correcting mistakes now is much easier than after the update has begun"
             ])
             continueWithUpdate = self.yesOrNo("Proceed with these settings")
-
         # Prepare the namespace and launch the installation pipeline
         if self.noConfirm or continueWithUpdate:
             self.createTektonFileWithDigest()
@@ -425,16 +425,20 @@ class UpdateApp(BaseApp):
                     else:
                         h.stop_and_persist(symbol=self.successIcon, text="IBM User Data Services needs to be migrated to IBM Data Reporter Operator")
                         self.showUDSUpdateNotice()
-                        if not self.yesOrNo("Confirm migration from UDS to DRO", "dro_migration"):
-                            # If the user did not approve the update, abort
-                            exit(1)
-                        self.printDescription([
-                            "",
-                            "Select the storage class for DRO to use from the list below:"
-                        ])
-                        for storageClass in getStorageClasses(self.dynamicClient):
-                            print_formatted_text(HTML(f"<LightSlateGrey>  - {storageClass.metadata.name}</LightSlateGrey>"))
-                        self.promptForString("DRO storage class", "dro_storage_class", validator=StorageClassValidator())
+                        if self.getParam("dro_migration") == "true" and self.getParam("dro_storage_class") is None:  
+                            if not self.yesOrNo("Confirm migration from UDS to DRO", "dro_migration"):
+                                # If the user did not approve the update, abort
+                                exit(1)
+                            self.printDescription([
+                                "",
+                                "Select the storage class for DRO to use from the list below:"
+                            ])
+                            for storageClass in getStorageClasses(self.dynamicClient):
+                                print_formatted_text(HTML(f"<LightSlateGrey>  - {storageClass.metadata.name}</LightSlateGrey>"))
+                            self.promptForString("DRO storage class", "dro_storage_class", validator=StorageClassValidator())
+
+                if self.getParam("dro_migration") == "true":
+                    self.setParam("uds_action", "install-dro")
 
             except (ResourceNotFoundError, NotFoundError) as e:
                 # UDS has never been installed on this cluster

{mas_cli-11.1.3.dist-info → mas_cli-11.2.1.dist-info}/METADATA

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

{mas_cli-11.1.3.dist-info → mas_cli-11.2.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-mas/cli/__init__.py,sha256=6dTBeYjDeDOgubPg20pZ6IFN_mD9ynyDtNL0B_1LZPM,526
-mas/cli/cli.py,sha256=o3U2TddKLD68weNi8KBK6L26EywMCNPgEtEMX9qah9s,14563
+mas/cli/__init__.py,sha256=PJb41tKrxyi99cgpG_QiN32t9ZrWGocVH2HeKnfaZjw,526
+mas/cli/cli.py,sha256=wm7Ptd8zC8Uc1ZvIvY7h6lQDgFXjm8S3DNy0zWbKCZ4,14563
 mas/cli/displayMixins.py,sha256=ygDJ8KPLdJpip_JQ4JDPWbvo7ZIdsOZQfQoVnMdAauM,5594
 mas/cli/gencfg.py,sha256=57ik5x73gQBFXPl_8h2byXmV_vhCgxfeSDZk4Wg5-Pw,2102
 mas/cli/validators.py,sha256=vi1pFA8QtqMhqtGk1NlkkNDUrlFCi53kS5wJqFGDgOU,5108
@@ -14,7 +14,7 @@ mas/cli/install/settings/db2Settings.py,sha256=mR0XL81Talvwvm1bekw0o9VOwV42QkS0j
 mas/cli/install/settings/kafkaSettings.py,sha256=bjAji5OZfSBpttiYHKM5B5Lvva8L8PUzi8QSs6opQcE,6997
 mas/cli/install/settings/manageSettings.py,sha256=TSByaLXVF9hRH0hqhX-eBc7dIHrOf4zgviOq2YrjSHc,13658
 mas/cli/install/settings/turbonomicSettings.py,sha256=eqMDocZxJnGEnWh41Yh8rmmVKVR_JnA8qrbfRrFAOaQ,1588
-mas/cli/templates/ibm-mas-tekton.yaml,sha256=VbelyQrey4NcHFuB_ApQobRoPCsbEFun3JyS1l5DAow,711683
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=G289umEXq13RQx_EIC7WsYq9vQrdHpsNqfmAv3izAbA,714707
 mas/cli/templates/jdbccfg.yml.j2,sha256=cANbwkUkKEPQp-P3_BB_Llbt94457Ciagah2hOdySIM,1644
 mas/cli/templates/pod-templates/best-effort/ibm-data-dictionary-assetdatadictionary.yml,sha256=8VG_FDFcEjWNaAOZTcS58Pe0tWOXC10SJLloNqzEMC8,757
 mas/cli/templates/pod-templates/best-effort/ibm-mas-bascfg.yml,sha256=rkq8c2pVJoskgict9tCZzCchGSE2MBC-dJ47JyMYm7A,1559
@@ -90,13 +90,13 @@ mas/cli/uninstall/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY
 mas/cli/uninstall/app.py,sha256=obuGe-czCnXpa7j_N8QC9zZBuD0s3xXmNRUWt-f6omI,9981
 mas/cli/uninstall/argParser.py,sha256=VO6_u8Qv_munelgZMxBw9mdJBwF_9j688b6nUxQD2RM,3298
 mas/cli/update/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY,494
-mas/cli/update/app.py,sha256=uyru88pWiuL6rxx6sCGdZzQD1gGJHdBeKaSneTcH-1s,36704
+mas/cli/update/app.py,sha256=dejW8lJ4zb91Ce1gLMEkj_ninBBwok6Aul8aKn7lNcg,37003
 mas/cli/update/argParser.py,sha256=Xm0qXmMrCZH-ikVYlKVlp7g0cbwCavXDwtwRKZ_t8vQ,3843
 mas/cli/upgrade/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY,494
 mas/cli/upgrade/app.py,sha256=AjRI1uCVfl--edonhUb9ZTrp_QifJTQPp-ORT1S_uO8,5375
 mas/cli/upgrade/argParser.py,sha256=jl8SU0mXDMAkpfqXaKE4MPNUmVoD0LSsvMUSJjU1dbQ,1881
-mas_cli-11.1.3.data/scripts/mas-cli,sha256=sEPYV6KUzcq4ukiTM4tMLsYKv-d9Ms0aJI9Uhjg_G9Y,3436
-mas_cli-11.1.3.dist-info/METADATA,sha256=2SpPoCQoZ2k_6tMqf_l2a6pRGgJk9ve29fDx4Qakqfs,2076
-mas_cli-11.1.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-mas_cli-11.1.3.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-11.1.3.dist-info/RECORD,,
+mas_cli-11.2.1.data/scripts/mas-cli,sha256=sEPYV6KUzcq4ukiTM4tMLsYKv-d9Ms0aJI9Uhjg_G9Y,3436
+mas_cli-11.2.1.dist-info/METADATA,sha256=cgHDVjqqtIjfAqem2OZ0htJAZoGqrFn0UqqZYC-XZu0,2076
+mas_cli-11.2.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+mas_cli-11.2.1.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-11.2.1.dist-info/RECORD,,