mas-cli 11.13.0__py3-none-any.whl → 12.1.0__py3-none-any.whl

mas/cli/update/app.py

@@ -32,7 +32,7 @@ class UpdateApp(BaseApp):
 
     def update(self, argv):
         """
-        Uninstall MAS instance
+        Update MAS instance
         """
         self.args = updateArgParser.parse_args(args=argv)
         self.noConfirm = self.args.no_confirm

mas/cli/upgrade/app.py

@@ -22,7 +22,7 @@ from ..validators import InstanceIDValidator
 from .argParser import upgradeArgParser
 
 from mas.devops.ocp import createNamespace
-from mas.devops.mas import listMasInstances, verifyMasInstance
+from mas.devops.mas import listMasInstances, getMasChannel
 from mas.devops.tekton import installOpenShiftPipelines, updateTektonDefinitions, launchUpgradePipeline
 
 logger = logging.getLogger(__name__)
@@ -37,6 +37,8 @@ class UpgradeApp(BaseApp):
         instanceId = args.mas_instance_id
         self.noConfirm = args.no_confirm
         self.skipPreCheck = args.skip_pre_check
+        self.licenseAccepted = args.accept_license
+        next_mas_channel = None
 
         if instanceId is None:
             self.printH1("Set Target OpenShift Cluster")
@@ -67,14 +69,31 @@ class UpgradeApp(BaseApp):
             suiteCompleter = WordCompleter(suiteOptions)
             print()
             instanceId = prompt(HTML('<Yellow>Enter MAS instance ID: </Yellow>'), completer=suiteCompleter, validator=InstanceIDValidator(), validate_while_typing=False)
-        else:
-            # Non-interactive mode
-            if not verifyMasInstance(self.dynamicClient, instanceId):
-                print_formatted_text(HTML(f"<Red>Error: MAS instance {instanceId} not found on this cluster</Red>"))
-                sys.exit(1)
+
+        current_mas_channel = getMasChannel(self.dynamicClient, instanceId)
+
+        if current_mas_channel not in self.upgrade_path:
+            self.fatalError(f"No upgrade available, {instanceId} is are already on the latest release {current_mas_channel}")
+
+        next_mas_channel = self.upgrade_path[current_mas_channel]
+
+        if not self.licenseAccepted:
+            self.printH1("License Terms")
+            self.printDescription([
+                "To continue with the upgrade, you must accept the license terms:",
+                self.licenses[next_mas_channel]
+            ])
+
+            if self.noConfirm:
+                self.fatalError("You must accept the license terms with --accept-license when using the --no-confirm flag")
+            else:
+                if not self.yesOrNo("Do you accept the license terms"):
+                    exit(1)
 
         self.printH1("Review Settings")
         print_formatted_text(HTML(f"<LightSlateGrey>Instance ID ..................... {instanceId}</LightSlateGrey>"))
+        print_formatted_text(HTML(f"<LightSlateGrey>Current MAS Channel ............. {current_mas_channel}</LightSlateGrey>"))
+        print_formatted_text(HTML(f"<LightSlateGrey>Next MAS Channel ................ {next_mas_channel}</LightSlateGrey>"))
         print_formatted_text(HTML(f"<LightSlateGrey>Skip Pre-Upgrade Checks ......... {self.skipPreCheck}</LightSlateGrey>"))
 
         if not self.noConfirm:

mas/cli/upgrade/argParser.py

@@ -32,7 +32,6 @@ masArgGroup.add_argument(
     required=False,
     help="The MAS instance ID to be upgraded"
 )
-
 otherArgGroup = upgradeArgParser.add_argument_group('More')
 otherArgGroup.add_argument(
     '--skip-pre-check',
@@ -48,6 +47,12 @@ otherArgGroup.add_argument(
     default=False,
     help="Launch the upgrade without prompting for confirmation",
 )
+otherArgGroup.add_argument(
+    "--accept-license",
+    action="store_true",
+    default=False,
+    help="Accept all license terms without prompting"
+)
 otherArgGroup.add_argument(
     '-h', "--help",
     action='help',

{mas_cli-11.13.0.dist-info → mas_cli-12.1.0.dist-info}/METADATA

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

{mas_cli-11.13.0.dist-info → mas_cli-12.1.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
-mas/cli/__init__.py,sha256=KN7hN_ElmkhPd2DcaNQaEzT92q_1s1qiOhNTH4AU8ps,527
-mas/cli/cli.py,sha256=vj3WeC7qoYtF7rxDQcHw3J2KTP0Q3yEqVN4b_PAOojA,16181
+mas/cli/__init__.py,sha256=WYSU0MV45wJvR2Cf4OZj_ri1t50MpWfvDrWdQM1McsI,526
+mas/cli/cli.py,sha256=0ZAuvGjjcxyV8svC-bsUvBVZBfNLA_cmUwjPWU0J_0g,17484
 mas/cli/displayMixins.py,sha256=e3lAx1DIOwsriDcNI0M2JyP1jeLOZKvId6sPrvWLyqs,5984
 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=UuYiqLz_rt3y8Co-UOuF7x4a8aQP35X0UjtyawIWzFA,58857
+mas/cli/install/app.py,sha256=fZQLKQYfvinBlnyMt8PQi7Qt4nIn8Atb247bNYT_9r4,55758
 mas/cli/install/argBuilder.py,sha256=dATpbY1kojvhr35NixZ11WZD3DzEJAfaAWhaYFLhEnQ,23033
 mas/cli/install/argParser.py,sha256=dt06eSJkZFqzMD0gboMDUBbfIrDnLB3nEowFAs3_Th4,33205
-mas/cli/install/catalogs.py,sha256=pqV-nlW-N5OdDVNk-dl3hU6XExC6oppZQHfC9KTA0ro,694
+mas/cli/install/catalogs.py,sha256=ivwWYa8eyfchOAaYxEHNTNsIevosw6Z9EQQ0iHcA3sU,697
 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
@@ -17,7 +17,7 @@ mas/cli/install/settings/kafkaSettings.py,sha256=oJxFhWQkqPi7Do53tu4oxskGbEL4hro
 mas/cli/install/settings/manageSettings.py,sha256=rBBq3r9AaDS5fLeKbItgLBnsguuZwyNKo80oYBBEB-0,16241
 mas/cli/install/settings/mongodbSettings.py,sha256=UVt8vMLNpgyewlcymSystIhICnHsd0uoM9qpgezVjGg,2567
 mas/cli/install/settings/turbonomicSettings.py,sha256=wRAFV0Rg3Em_ILkLd8xR-a_oglXivnVeF6nVI_73Q9o,1695
-mas/cli/templates/ibm-mas-tekton.yaml,sha256=BlUCANpN2s-h0JPMW5BCVH3tGY-SS3xn7ba04nH6SCU,793642
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=WRCMHV-1nCKFlcgP93syRxtuvAvvJr03fD8N5dCh3vs,797296
 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=DZAljUA9sJwhtVv5ocudHYI2lCKR5m4Df3tEdlnH-iA,37229
+mas/cli/update/app.py,sha256=onkB2Gn9aJooMQB0AKrGvjN1B7yhajWTGTRdBRiM4I8,37226
 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.13.0.data/scripts/mas-cli,sha256=Es-wSefTBcR3Vs5_kIUHQLfWHxTXVrmIPMFY0hbrxt8,3493
-mas_cli-11.13.0.dist-info/METADATA,sha256=slnwXcHo3w-k3XOiwhNYWjz-sek2pE0sPn5dBOlrrPM,2081
-mas_cli-11.13.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mas_cli-11.13.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-11.13.0.dist-info/RECORD,,
+mas/cli/upgrade/app.py,sha256=xSM5r-3tE3ohphHvUSsXqRMvnxNFSoy_8-jlQLjLEno,6180
+mas/cli/upgrade/argParser.py,sha256=pqzNDSHy6l13JunHWQLyOI-NFnDGDoVJ_HM07FLYJSc,2033
+mas_cli-12.1.0.data/scripts/mas-cli,sha256=Es-wSefTBcR3Vs5_kIUHQLfWHxTXVrmIPMFY0hbrxt8,3493
+mas_cli-12.1.0.dist-info/METADATA,sha256=UQUNyyzKoA5SrTtn785A_tY3RY6-NDOqKIRMbMn6iGc,2080
+mas_cli-12.1.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mas_cli-12.1.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-12.1.0.dist-info/RECORD,,