mas-cli 10.3.2__py3-none-any.whl → 10.4.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of mas-cli might be problematic. Click here for more details.
- mas/cli/__init__.py +1 -1
- mas/cli/cli.py +36 -1
- mas/cli/install/app.py +92 -2
- mas/cli/install/argParser.py +63 -2
- mas/cli/templates/ibm-mas-tekton.yaml +164 -631
- mas/cli/validators.py +10 -0
- {mas_cli-10.3.2.data → mas_cli-10.4.1.data}/scripts/mas-cli +1 -1
- {mas_cli-10.3.2.dist-info → mas_cli-10.4.1.dist-info}/METADATA +1 -1
- {mas_cli-10.3.2.dist-info → mas_cli-10.4.1.dist-info}/RECORD +11 -11
- {mas_cli-10.3.2.dist-info → mas_cli-10.4.1.dist-info}/WHEEL +1 -1
- {mas_cli-10.3.2.dist-info → mas_cli-10.4.1.dist-info}/top_level.txt +0 -0
mas/cli/validators.py
CHANGED
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
# *****************************************************************************
|
|
10
10
|
|
|
11
11
|
from re import match
|
|
12
|
+
import re
|
|
12
13
|
from os import path
|
|
13
14
|
|
|
14
15
|
# Use of the openshift client rather than the kubernetes client allows us access to "apply"
|
|
@@ -47,6 +48,15 @@ class WorkspaceIDFormatValidator(Validator):
|
|
|
47
48
|
if not match(r"^[a-z][a-z0-9]{2,11}$", instanceId):
|
|
48
49
|
raise ValidationError(message='Workspace ID does not meet the requirements', cursor_position=len(instanceId))
|
|
49
50
|
|
|
51
|
+
class TimeoutFormatValidator(Validator):
|
|
52
|
+
def validate(self, document):
|
|
53
|
+
"""
|
|
54
|
+
Validate that a MAS instance ID exists on the target cluster
|
|
55
|
+
"""
|
|
56
|
+
string_to_validate = document.text
|
|
57
|
+
if not match(r'^([0-9]+)([hm])$', string_to_validate):
|
|
58
|
+
message = f"Error: Your input: {string_to_validate} does not meet the required pattern. Please use it in hours or minutes format (e.g., 12h, 12m)."
|
|
59
|
+
raise ValidationError(message=message, cursor_position=len(string_to_validate))
|
|
50
60
|
|
|
51
61
|
class WorkspaceNameFormatValidator(Validator):
|
|
52
62
|
def validate(self, document):
|
|
@@ -72,7 +72,7 @@ if __name__ == '__main__':
|
|
|
72
72
|
except KeyboardInterrupt as e:
|
|
73
73
|
pass
|
|
74
74
|
except ApiException as e:
|
|
75
|
-
app.fatalError(message=f"An error occured communicating with the target server: {e.reason} ({e.status})")
|
|
75
|
+
app.fatalError(message=f"An error occured communicating with the target server: {e.reason} ({e.status})", exception=e)
|
|
76
76
|
except MaxRetryError as e:
|
|
77
77
|
app.fatalError(message="Unable to connect to API server", exception=e)
|
|
78
78
|
except TemplateNotFound as e:
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
mas/cli/__init__.py,sha256=
|
|
2
|
-
mas/cli/cli.py,sha256=
|
|
1
|
+
mas/cli/__init__.py,sha256=towoiXOAgRhiiHxms-HILMK_3j1bzGblLA8sg5Ip-R4,491
|
|
2
|
+
mas/cli/cli.py,sha256=vBEBcDulbl652CBBw66AMCB2KMiZKsXXYHTNLRLr5R0,10287
|
|
3
3
|
mas/cli/displayMixins.py,sha256=nyfZP9xqrg9L0mPPxLF7nbWvpp59wo0aDHupDX2UKdQ,5493
|
|
4
4
|
mas/cli/gencfg.py,sha256=57ik5x73gQBFXPl_8h2byXmV_vhCgxfeSDZk4Wg5-Pw,2102
|
|
5
|
-
mas/cli/validators.py,sha256=
|
|
5
|
+
mas/cli/validators.py,sha256=gKqLLQPvgcmIKE1OJjLNO2F34ECRXSlHJvFE-QxadIc,5086
|
|
6
6
|
mas/cli/install/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY,494
|
|
7
|
-
mas/cli/install/app.py,sha256=
|
|
8
|
-
mas/cli/install/argParser.py,sha256=
|
|
7
|
+
mas/cli/install/app.py,sha256=GvV7C13WhlcQEzoQ1OhiJu-Bkk5h3dPAbFRxnxlsv-Y,51265
|
|
8
|
+
mas/cli/install/argParser.py,sha256=FEmCUrRwaE5e-AHkpsQmgMpo6ta-nLYXTtuofVxsmMg,25381
|
|
9
9
|
mas/cli/install/summarizer.py,sha256=ydOnkiRmj3nPPcE9ZHNxHDMMgii_VYHKnyXV4JbVQ7s,18046
|
|
10
10
|
mas/cli/install/settings/__init__.py,sha256=eGdNVHVALUxJlZyGYkBet8LbHvVfa-1UjL_8Zl3d-lY,953
|
|
11
11
|
mas/cli/install/settings/additionalConfigs.py,sha256=-qn25IExNGDJ_VLTH1EmgPrFrIE3JFZ3MMb0RlTzVOg,9651
|
|
@@ -13,7 +13,7 @@ mas/cli/install/settings/db2Settings.py,sha256=mR0XL81Talvwvm1bekw0o9VOwV42QkS0j
|
|
|
13
13
|
mas/cli/install/settings/kafkaSettings.py,sha256=bjAji5OZfSBpttiYHKM5B5Lvva8L8PUzi8QSs6opQcE,6997
|
|
14
14
|
mas/cli/install/settings/manageSettings.py,sha256=3HtyR6-DKiKQDFTWnnxAr5OmkfqKwjI4xnBaAcAjOCI,13229
|
|
15
15
|
mas/cli/install/settings/turbonomicSettings.py,sha256=OC-sn6_Z6MAq0kf33OC3c96gqT8FT4P7A51PenPiCXw,1368
|
|
16
|
-
mas/cli/templates/ibm-mas-tekton.yaml,sha256=
|
|
16
|
+
mas/cli/templates/ibm-mas-tekton.yaml,sha256=SMdeepXtMPHdeQlB0ZLv3FexNmWi8kh-PMymevpdGQo,720769
|
|
17
17
|
mas/cli/templates/jdbccfg.yml.j2,sha256=cANbwkUkKEPQp-P3_BB_Llbt94457Ciagah2hOdySIM,1644
|
|
18
18
|
mas/cli/templates/pod-templates/best-effort/ibm-data-dictionary-assetdatadictionary.yml,sha256=8VG_FDFcEjWNaAOZTcS58Pe0tWOXC10SJLloNqzEMC8,757
|
|
19
19
|
mas/cli/templates/pod-templates/best-effort/ibm-mas-bascfg.yml,sha256=rkq8c2pVJoskgict9tCZzCchGSE2MBC-dJ47JyMYm7A,1559
|
|
@@ -94,8 +94,8 @@ mas/cli/update/argParser.py,sha256=k9-2i6KRvU4gxkiHJTgtjh1IkDaaLzgisrZe6-JORJA,3
|
|
|
94
94
|
mas/cli/upgrade/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY,494
|
|
95
95
|
mas/cli/upgrade/app.py,sha256=lxMZYlO_sybzbOuZ4D7R0OCjGqnMg3MF1h2vSVZ1YmE,5328
|
|
96
96
|
mas/cli/upgrade/argParser.py,sha256=jl8SU0mXDMAkpfqXaKE4MPNUmVoD0LSsvMUSJjU1dbQ,1881
|
|
97
|
-
mas_cli-10.
|
|
98
|
-
mas_cli-10.
|
|
99
|
-
mas_cli-10.
|
|
100
|
-
mas_cli-10.
|
|
101
|
-
mas_cli-10.
|
|
97
|
+
mas_cli-10.4.1.data/scripts/mas-cli,sha256=sEPYV6KUzcq4ukiTM4tMLsYKv-d9Ms0aJI9Uhjg_G9Y,3436
|
|
98
|
+
mas_cli-10.4.1.dist-info/METADATA,sha256=sOeaWgPNvcDOE4rg8NE_ri7w2skJrDdq2RFF2lW6jRk,2076
|
|
99
|
+
mas_cli-10.4.1.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
|
|
100
|
+
mas_cli-10.4.1.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
|
|
101
|
+
mas_cli-10.4.1.dist-info/RECORD,,
|
|
File without changes
|