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

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "11.9.0"  # Python module compatible semver
+__version__ = "11.9.2"  # Python module compatible semver

mas/cli/cli.py

@@ -117,7 +117,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version = "11.9.0"
+        self.version = "11.9.2"
         self.h1count = 0
         self.h2count = 0
 

mas/cli/install/app.py

@@ -625,8 +625,8 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             self.configCP4D()
             self.promptForString("COS Provider [ibm/ocs]", "cos_type")
             if self.getParam("cos_type") == "ibm":
-                self.promptForString("IBM Cloud API Key", "ibmcloud_apikey", isPassword=True)
-                self.promptForString("IBM Cloud Resource Group", "ibmcos_resourcegroup")
+                self.promptForString("IBM Cloud API Key", "cos_apikey", isPassword=True)
+                self.promptForString("IBM Cloud Resource Group", "cos_resourcegroup")
 
     @logMethodCall
     def chooseInstallFlavour(self) -> None:
@@ -774,7 +774,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             elif key == "additional_configs":
                 self.localConfigDir = value
                 # If there is a file named mongodb-system.yaml we will use this as a BYO MongoDB datasource
-                if path.exists(path.join(self.localConfigDir, "mongodb-system.yaml")):
+                if self.localConfigDir is not None and path.exists(path.join(self.localConfigDir, "mongodb-system.yaml")):
                     self.setParam("mongodb_action", "byo")
                     self.setParam("sls_mongodb_cfg_file", "/workspace/additional-configs/mongodb-system.yaml")
 

mas/cli/install/argBuilder.py

@@ -226,10 +226,10 @@ class installArgBuilderMixin():
 
         # IBM Db2 Universal Operator
         # -----------------------------------------------------------------------------
-        if self.getParam('db2_system') == "install" or self.getParam('db2_manage') == "install":
-            if self.getParam('db2_system') == "install":
+        if self.getParam('db2_action_system') == "install" or self.getParam('db2_action_manage') == "install":
+            if self.getParam('db2_action_system') == "install":
                 command += f"  --db2-system{newline}"
-            if self.getParam('db2_manage') == "install":
+            if self.getParam('db2_action_manage') == "install":
                 command += f"  --db2-manage{newline}"
 
             if self.getParam('db2_channel') != "":
@@ -317,8 +317,10 @@ class installArgBuilderMixin():
         # -----------------------------------------------------------------------------
         if self.getParam('cos_type') != "":
             command += f"  --cos \"{self.getParam('cos_type')}\""
-            if self.getParam('ibmcos_resourcegroup') != "":
+            if self.getParam('cos_resourcegroup') != "":
                 command += f" --cos-resourcegroup \"{self.getParam('cos_resourcegroup')}\""
+            if self.getParam('cos_apikey') != "":
+                command += f" --cos-apikey \"{self.getParam('cos_apikey')}\""
             command += newline
 
         # Turbonomic Integration

mas/cli/install/argParser.py

@@ -917,10 +917,16 @@ cosArgGroup.add_argument(
 )
 cosArgGroup.add_argument(
     "--cos-resourcegroup",
-    dest="ibmcos_resourcegroup",
+    dest="cos_resourcegroup",
     required=False,
     help="When using IBM COS, set the resource group where the instance will run"
 )
+cosArgGroup.add_argument(
+    "--cos-apikey",
+    dest="cos_apikey",
+    required=False,
+    help="When using IBM COS, set COS priviledged apikey for IBM Cloud"
+)
 
 # Turbonomic Integration
 # -----------------------------------------------------------------------------

mas/cli/install/params.py

@@ -113,7 +113,8 @@ optionalParams = [
     "eventstreams_instance_location",
     # COS
     "cos_type",
-    "ibmcos_resourcegroup",
+    "cos_resourcegroup",
+    "cos_apikey",
     # ECK
     "eck_action",
     "eck_enable_logstash",

mas/cli/install/summarizer.py

@@ -274,8 +274,8 @@ class InstallSummarizerMixin():
         self.printH2("Cloud Object Storage")
         if self.getParam("cos_type") != "":
             self.printParamSummary("Type", "cos_type")
-            if self.getParam("ibmcos_resourcegroup") != "":
-                self.printParamSummary("Resource Group", "ibmcos_resourcegroup")
+            if self.getParam("cos_resourcegroup") != "":
+                self.printParamSummary("Resource Group", "cos_resourcegroup")
         else:
             self.printSummary("Type", "None")