mas-cli 10.9.1__py3-none-any.whl → 11.0.0__py3-none-any.whl

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "10.9.1"  # Python module compatible semver
+__version__ = "11.0.0"  # Python module compatible semver

mas/cli/cli.py

@@ -108,7 +108,7 @@ class BaseApp(PrintMixin, PromptMixin):
         rootLogger.setLevel(logging.DEBUG)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version = "10.9.1"
+        self.version = "11.0.0"
         self.h1count = 0
         self.h2count = 0
 

mas/cli/install/app.py

@@ -185,6 +185,10 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         self.printH1("Configure MongoDb")
         self.promptForString("Install namespace", "mongodb_namespace", default="mongoce")
 
+    def configSpecialCharacters(self):
+        self.printH1("Configure special characters for userID and username")
+        self.yesOrNo("Do you want to allow special characters for user IDs and usernames?", "mas_special_characters")
+         
     def configCP4D(self):
         if self.getParam("mas_catalog_version") in ["v9-240625-amd64", "v9-240730-amd64", "v9-240827-amd64"]:
             logger.debug(f"Using automatic CP4D product version: {self.getParam('cpd_product_version')}")
@@ -261,6 +265,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         self.configCATrust()
         self.configDNSAndCerts()
         self.configSSOProperties()
+        self.configSpecialCharacters()
         self.configGuidedTour()
 
     def configCATrust(self) -> None:
@@ -282,6 +287,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         ])
         self.operationalMode = self.promptForInt("Operational Mode", default=1)
 
+    def configAnnotations(self):
         if self.operationalMode == 2:
             self.setParam("mas_annotations", "mas.ibm.com/operationalMode=nonproduction")
 
@@ -745,7 +751,9 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             "install_arcgis",
             "mas_arcgis_channel",
             # Guided Tour
-            "mas_enable_walkme"
+            "mas_enable_walkme",
+            # Special chars
+            "mas_special_characters"
         ]
 
         for key, value in vars(self.args).items():
@@ -780,6 +788,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                     self.operationalMode = 1
                 else:
                     self.operationalMode = 2
+                    self.setParam("mas_annotations", "mas.ibm.com/operationalMode=nonproduction")
 
             elif key == "additional_configs":
                 self.localConfigDir = value
@@ -1076,6 +1085,9 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             self.buildCommand()
         ])
 
+        # Based on the parameters set the annotations correctly
+        self.configAnnotations()
+
         self.displayInstallSummary()
 
         if not self.noConfirm:

mas/cli/install/argBuilder.py

@@ -60,6 +60,9 @@ class installArgBuilderMixin():
         command += f" --mas-workspace-id {self.getParam('mas_workspace_id')}"
         command += f" --mas-workspace-name \"{self.getParam('mas_workspace_name')}\"{newline}"
 
+        if self.getParam('mas_special_characters') == "true":
+            command += f" --allow-special-chars \"{self.getParam('mas_special_characters')}\"{newline}"
+
         # ECK Integration
         # -----------------------------------------------------------------------------
         if self.getParam('eck_action') == "install":

mas/cli/install/argParser.py

@@ -75,7 +75,16 @@ masArgGroup.add_argument(
     required=False,
     help="Subscription channel for the Core Platform"
 )
-
+# MAS Special characters 
+# -----------------------------------------------------------------------------
+masSpecialCharacters = installArgParser.add_argument_group("Mas Special Characters")
+masSpecialCharacters.add_argument(
+    "--allow-special-chars",
+    dest="mas_special_characters",
+    required=False,
+    help="Allow special chars for users username/ID",
+    action="store_true"
+)
 # ECK Integration
 # -----------------------------------------------------------------------------
 eckArgGroup = installArgParser.add_argument_group("ECK Integration")