mas-cli 23.2.0__tar.gz → 23.4.0__tar.gz

{mas_cli-23.2.0/python/src/mas_cli.egg-info → mas_cli-23.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-cli
-Version: 23.2.0
+Version: 23.4.0
 Summary: Python Admin CLI for Maximo Application Suite
 Author-email: David Parker <parkerda@uk.ibm.com>
 License-Expression: EPL-1.0

{mas_cli-23.2.0 → mas_cli-23.4.0}/python/src/mas/cli/__init__.py

@@ -10,4 +10,4 @@
 
 from .cli import BaseApp  # noqa: F401
 
-__version__ = "23.2.0"  # Python module compatible semver
+__version__ = "23.4.0"  # Python module compatible semver

{mas_cli-23.2.0 → mas_cli-23.4.0}/python/src/mas/cli/aiservice/install/app.py

@@ -657,7 +657,7 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         else:
             # Ask for external storage configuration
             self.printDescription(["Configure your external object storage (S3-compatible) connection details:"])
-            self.promptForString("Storage access key", "aiservice_s3_accesskey")
+            self.promptForString("Storage access key", "aiservice_s3_accesskey", isPassword=True)
             self.promptForString("Storage secret key", "aiservice_s3_secretkey", isPassword=True)
             self.promptForString("Storage host", "aiservice_s3_host")
             self.promptForString("Storage port", "aiservice_s3_port")

{mas_cli-23.2.0 → mas_cli-23.4.0}/python/src/mas/cli/cli.py

@@ -126,7 +126,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger("urllib3").setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version: str = "23.2.0"
+        self.version: str = "23.4.0"
         self.h1count: int = 0
         self.h2count: int = 0
 

{mas_cli-23.2.0 → mas_cli-23.4.0}/python/src/mas/cli/displayMixins.py

@@ -27,6 +27,46 @@ SUMMARYCOLOR = "SkyBlue"
 UNDEFINEDPARAMCOLOR = "LightSlateGrey"
 PROMPTCOLOR = "Yellow"
 
+# List of sensitive parameters that should be masked in output
+SENSITIVE_PARAMS = {
+    # IBM Cloud & AWS Credentials
+    "ibmcloud_apikey",
+    "aws_access_key_id",
+    "secret_access_key",
+    "aws_secret_access_key",
+    # Artifactory Credentials
+    "artifactory_username",
+    "artifactory_token",
+    # MAS Credentials
+    "mas_superuser_password",
+    # Logging & Messaging
+    "eck_remote_es_password",
+    "kafka_password",
+    "aws_kafka_user_password",
+    # Manage App Settings
+    "mas_app_settings_customization_archive_password",
+    "mas_app_settings_customization_archive_username",
+    # Manage Encryption Keys
+    "mas_manage_encryptionsecret_crypto_key",
+    "mas_manage_encryptionsecret_cryptox_key",
+    "mas_manage_encryptionsecret_old_crypto_key",
+    "mas_manage_encryptionsecret_old_cryptox_key",
+    # DNS Provider Credentials
+    "cis_apikey",
+    "cloudflare_apitoken",
+    # Storage Credentials
+    "aiservice_s3_accesskey",
+    "aiservice_s3_secretkey",
+    "cos_apikey",
+    # AI Service Credentials
+    "aiservice_watsonxai_apikey",
+    "aiservice_db_username",
+    "aiservice_db_password",
+    # Minio Credentials
+    "minio_root_user",
+    "minio_root_password",
+}
+
 
 class PrintMixin:
     def printTitle(self, message: str) -> None:
@@ -73,8 +113,15 @@ class PrintMixin:
             logger.debug(f'Parameter Summary: {param} = ""')
             self.printSummary(message, f"<{UNDEFINEDPARAMCOLOR}>Default</{UNDEFINEDPARAMCOLOR}>")
         else:
-            logger.debug(f"Parameter Summary: {param} = {self.getParam(param)}")  # type: ignore
-            self.printSummary(message, self.getParam(param))  # type: ignore
+            value = self.getParam(param)  # type: ignore
+            # Mask sensitive parameters
+            if param in SENSITIVE_PARAMS:
+                display_value = "***"
+                logger.debug(f"Parameter Summary: {param} = *** (masked)")
+            else:
+                display_value = value
+                logger.debug(f"Parameter Summary: {param} = {value}")
+            self.printSummary(message, display_value)
 
     def printTable(self, headers: List[str], rows: List[List[str]]) -> None:
         """

{mas_cli-23.2.0 → mas_cli-23.4.0}/python/src/mas/cli/install/app.py

@@ -333,6 +333,7 @@ class InstallApp(
             self.promptForString("Select channel", "mas_channel", default="9.2.x-dev")
         else:
             catalogInfo = getCurrentCatalog(self.dynamicClient)
+            logger.debug(f"Installed catalog lookup result: {catalogInfo}")
 
             if catalogInfo is None:
                 self.printDescription(
@@ -1086,7 +1087,7 @@ class InstallApp(
         # User has chosen to set up DNS integration with Cloudflare
         self.setParam("dns_provider", "cloudflare")
         self.promptForString("Cloudflare e-mail", "cloudflare_email")
-        self.promptForString("Cloudflare API token", "cloudflare_apitoken")
+        self.promptForString("Cloudflare API token", "cloudflare_apitoken", isPassword=True)
         self.promptForString("Cloudflare zone", "cloudflare_zone")
         self.promptForString("Cloudflare subdomain", "cloudflare_subdomain")
 
@@ -1110,7 +1111,7 @@ class InstallApp(
     def configDNSAndCertsCIS(self):
         self.setParam("dns_provider", "cis")
         self.promptForString("CIS e-mail", "cis_email")
-        self.promptForString("CIS API token", "cis_apikey")
+        self.promptForString("CIS API token", "cis_apikey", isPassword=True)
         self.promptForString("CIS CRN", "cis_crn")
         self.promptForString("CIS subdomain", "cis_subdomain")
 
@@ -1815,7 +1816,7 @@ class InstallApp(
             else:
                 # Ask for external storage configuration
                 self.printDescription(["Configure your external object storage (S3-compatible) connection details:"])
-                self.promptForString("Storage access key", "aiservice_s3_accesskey")
+                self.promptForString("Storage access key", "aiservice_s3_accesskey", isPassword=True)
                 self.promptForString("Storage secret key", "aiservice_s3_secretkey", isPassword=True)
                 self.promptForString("Storage host", "aiservice_s3_host")
                 self.promptForString("Storage port", "aiservice_s3_port")

{mas_cli-23.2.0 → mas_cli-23.4.0}/python/src/mas/cli/install/argBuilder.py

@@ -48,6 +48,28 @@ class installArgBuilderMixin:
         if self.getParam("mas_manage_encryptionsecret_old_cryptox_key") != "":
             command += "export OLD_CRYTPOX_KEY=x\n"
 
+        # DNS Provider Credentials
+        if self.getParam("cis_apikey") != "":
+            command += "export CIS_APIKEY=x\n"
+        if self.getParam("cloudflare_apitoken") != "":
+            command += "export CLOUDFLARE_APITOKEN=x\n"
+
+        # Storage Credentials
+        if self.getParam("aiservice_s3_accesskey") != "":
+            command += "export AISERVICE_S3_ACCESSKEY=x\n"
+        if self.getParam("aiservice_s3_secretkey") != "":
+            command += "export AISERVICE_S3_SECRETKEY=x\n"
+        if self.getParam("cos_apikey") != "":
+            command += "export COS_APIKEY=x\n"
+
+        # AI Service Credentials
+        if self.getParam("aiservice_watsonxai_apikey") != "":
+            command += "export AISERVICE_WATSONXAI_APIKEY=x\n"
+        if self.getParam("minio_root_user") != "":
+            command += "export MINIO_ROOT_USER=x\n"
+        if self.getParam("minio_root_password") != "":
+            command += "export MINIO_ROOT_PASSWORD=x\n"
+
         command += f"mas install --mas-catalog-version {self.getParam('mas_catalog_version')}"
 
         if self.getParam("mas_catalog_digest") != "":
@@ -125,13 +147,13 @@ class installArgBuilderMixin:
             command += f"  --domain \"{self.getParam('mas_domain')}\"{newline}"
 
         if self.getParam("dns_provider") == "cis":
-            command += f"  --dns-provider cis --cis-apikey \"{self.getParam('cis_apikey')}\""
+            command += '  --dns-provider cis --cis-apikey "$CIS_APIKEY"'
             command += f" --cis-subdomain \"{self.getParam('cis_subdomain')}\""
             command += f" --cis-crn \"{self.getParam('cis_crn')}\""
             command += f" --cis-email \"{self.getParam('cis_email')}\"{newline}"
 
         if self.getParam("dns_provider") == "cloudflare":
-            command += f"  --dns-provider cloudflare --cloudflare-apitoken \"{self.getParam('cloudflare_apitoken')}\"{newline}"
+            command += f'  --dns-provider cloudflare --cloudflare-apitoken "$CLOUDFLARE_APITOKEN"{newline}'
             command += f"  --cloudflare-email \"{self.getParam('cloudflare_email')}\"{newline}"
             command += f"  --cloudflare-zone \"{self.getParam('cloudflare_zone')}\"{newline}"
             command += f"  --cloudflare-subdomain \"{self.getParam('cloudflare_subdomain')}\"{newline}"
@@ -393,9 +415,9 @@ class installArgBuilderMixin:
                     command += f"  --aiservice-db-ca-cert \"{self.getParam('aiservice_db_ca_cert')}\"{newline}"
 
             if self.getParam("aiservice_s3_accesskey") != "" and self.getParam("minio_root_user") == "":
-                command += f"  --s3-accesskey \"{self.getParam('aiservice_s3_accesskey')}\"{newline}"
+                command += f'  --s3-accesskey "$AISERVICE_S3_ACCESSKEY"{newline}'
             if self.getParam("aiservice_s3_secretkey") != "" and self.getParam("minio_root_user") == "":
-                command += f"  --s3-secretkey \"{self.getParam('aiservice_s3_secretkey')}\"{newline}"
+                command += f'  --s3-secretkey "$AISERVICE_S3_SECRETKEY"{newline}'
             if self.getParam("aiservice_s3_host") != "" and self.getParam("minio_root_user") == "":
                 command += f"  --s3-host \"{self.getParam('aiservice_s3_host')}\"{newline}"
             if self.getParam("aiservice_s3_port") != "" and self.getParam("minio_root_user") == "":
@@ -422,7 +444,7 @@ class installArgBuilderMixin:
                 command += f"  --manage-persistent-volumes{newline}"
 
             if self.getParam("aiservice_watsonxai_apikey") != "":
-                command += f"  --watsonxai-apikey \"{self.getParam('aiservice_watsonxai_apikey')}\"{newline}"
+                command += f'  --watsonxai-apikey "$AISERVICE_WATSONXAI_APIKEY"{newline}'
             if self.getParam("aiservice_watsonxai_url") != "":
                 command += f"  --watsonxai-url \"{self.getParam('aiservice_watsonxai_url')}\"{newline}"
             if self.getParam("aiservice_watsonxai_project_id") != "":
@@ -446,9 +468,9 @@ class installArgBuilderMixin:
 
             if self.getParam("minio_root_user") != "":
                 command += f"  --install-minio {newline}"
-                command += f"  --minio-root-user \"{self.getParam('minio_root_user')}\"{newline}"
+                command += f'  --minio-root-user "$MINIO_ROOT_USER"{newline}'
             if self.getParam("minio_root_password") != "":
-                command += f"  --minio-root-password \"{self.getParam('minio_root_password')}\"{newline}"
+                command += f'  --minio-root-password "$MINIO_ROOT_PASSWORD"{newline}'
 
             if self.getParam("tenant_entitlement_type") != "":
                 command += f"  --tenant-entitlement-type \"{self.getParam('tenant_entitlement_type')}\"{newline}"
@@ -586,7 +608,7 @@ class installArgBuilderMixin:
             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 += ' --cos-apikey "$COS_APIKEY"'
             if self.getParam("cos_instance_name") != "":
                 command += f" --cos-instance-name \"{self.getParam('cos_instance_name')}\""
             if self.getParam("cos_bucket_name") != "":

{mas_cli-23.2.0 → mas_cli-23.4.0}/python/src/mas/cli/install/settings/manageSettings.py

@@ -222,10 +222,10 @@ class ManageSettingsMixin:
             self.promptForString("Indexspace", "mas_app_settings_indexspace", default="MAXINDEX")
 
             if self.yesOrNo("Customize database encryption settings"):
-                self.promptForString("MXE_SECURITY_CRYPTO_KEY", "mas_manage_encryptionsecret_crypto_key")
-                self.promptForString("MXE_SECURITY_CRYPTOX_KEY", "mas_manage_encryptionsecret_cryptox_key")
-                self.promptForString("MXE_SECURITY_OLD_CRYPTO_KEY", "mas_manage_encryptionsecret_old_crypto_key")
-                self.promptForString("MXE_SECURITY_OLD_CRYPTOX_KEY", "mas_manage_encryptionsecret_old_cryptox_key")
+                self.promptForString("MXE_SECURITY_CRYPTO_KEY", "mas_manage_encryptionsecret_crypto_key", isPassword=True)
+                self.promptForString("MXE_SECURITY_CRYPTOX_KEY", "mas_manage_encryptionsecret_cryptox_key", isPassword=True)
+                self.promptForString("MXE_SECURITY_OLD_CRYPTO_KEY", "mas_manage_encryptionsecret_old_crypto_key", isPassword=True)
+                self.promptForString("MXE_SECURITY_OLD_CRYPTOX_KEY", "mas_manage_encryptionsecret_old_cryptox_key", isPassword=True)
                 self.promptForString("Encryption secret name", "mas_manage_ws_db_encryptionsecret")
 
     def _manageSettingsServerBundleConfig(self) -> None: