From 5b0016f83bb232abeb7d039bfffa1414c32bc3ea Mon Sep 17 00:00:00 2001 From: Sarthak Sharma Date: Tue, 7 Jan 2025 19:30:10 +0530 Subject: [PATCH 01/10] [patch] sls-mongo-cfg use params.mongo_namespace --- python/src/mas/cli/install/settings/mongodbSettings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/src/mas/cli/install/settings/mongodbSettings.py b/python/src/mas/cli/install/settings/mongodbSettings.py index 1458be6d2a..cf24e7ca64 100644 --- a/python/src/mas/cli/install/settings/mongodbSettings.py +++ b/python/src/mas/cli/install/settings/mongodbSettings.py @@ -24,7 +24,7 @@ def configMongoDb(self) -> None: self.promptForString("MongoDb namespace", "mongodb_namespace", default="mongoce") else: # Even though "" works as the default, we use this value to contruct other values so we need to explicitly set it - self.setParam("mongodb_namespace", "mongoce") + self.setParam("mongodb_namespace", self.getParam('mongodb_namespace') or "mongoce") self.setParam("mongodb_action", "install") self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{self.getParam('mongodb_namespace')}.yml") From e78cf625db4294a7bd8a386754b7a0c63dc0b488 Mon Sep 17 00:00:00 2001 From: Sarthak Sharma Date: Wed, 8 Jan 2025 12:24:02 +0530 Subject: [PATCH 02/10] [patch] noninteractive sls-mongo-cfg with custom mongo.ns --- python/src/mas/cli/install/app.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py index 20e909d693..523b58cd8c 100644 --- a/python/src/mas/cli/install/app.py +++ b/python/src/mas/cli/install/app.py @@ -901,6 +901,12 @@ def nonInteractiveMode(self) -> None: self.fatalError(f"{key} must be set") self.slsLicenseFileLocal = value + # Set SLS MongoDB Configuration File if a `mongodb_namespace` is provided other than default + elif key == "mongodb_namespace": + if value is None: + self.fatalError(f"{key} must be set") + self .setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{value}.yml") + elif key.startswith("approval_"): if key not in self.approvals: raise KeyError(f"{key} is not a supported approval workflow ID: {self.approvals.keys()}") From efedfc9fcd60d7b7684af9a7af576bb12542b279 Mon Sep 17 00:00:00 2001 From: Sarthak Sharma Date: Wed, 8 Jan 2025 12:45:36 +0530 Subject: [PATCH 03/10] [patch] pep8 fix for method call --- python/src/mas/cli/install/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py index 523b58cd8c..7049bb6ff4 100644 --- a/python/src/mas/cli/install/app.py +++ b/python/src/mas/cli/install/app.py @@ -905,7 +905,7 @@ def nonInteractiveMode(self) -> None: elif key == "mongodb_namespace": if value is None: self.fatalError(f"{key} must be set") - self .setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{value}.yml") + self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{value}.yml") elif key.startswith("approval_"): if key not in self.approvals: From 860aaf110019a31761b27b79160529bcd53f442c Mon Sep 17 00:00:00 2001 From: Sarthak Sharma Date: Wed, 8 Jan 2025 14:33:36 +0530 Subject: [PATCH 04/10] [patch] pep8 remove extra indents --- python/src/mas/cli/install/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py index 7049bb6ff4..d6bf91d93b 100644 --- a/python/src/mas/cli/install/app.py +++ b/python/src/mas/cli/install/app.py @@ -906,7 +906,7 @@ def nonInteractiveMode(self) -> None: if value is None: self.fatalError(f"{key} must be set") self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{value}.yml") - + elif key.startswith("approval_"): if key not in self.approvals: raise KeyError(f"{key} is not a supported approval workflow ID: {self.approvals.keys()}") From d83ddf4c4eadcccc7c191432231a66bcc6d55e0f Mon Sep 17 00:00:00 2001 From: Sarthak Sharma Date: Mon, 3 Feb 2025 18:01:13 +0530 Subject: [PATCH 05/10] [patch] add sls_mongodb_cfg_file to params --- python/src/mas/cli/install/params.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/src/mas/cli/install/params.py b/python/src/mas/cli/install/params.py index acd7622d16..dcd3f33627 100644 --- a/python/src/mas/cli/install/params.py +++ b/python/src/mas/cli/install/params.py @@ -61,6 +61,7 @@ "mas_domain", # SLS "sls_namespace", + "sls_mongodb_cfg_file", # DNS Providers # TODO: Add CloudFlare and Route53 support "dns_provider", From baf2e57f557c5389eff42502df654a41d9363a4c Mon Sep 17 00:00:00 2001 From: Sarthak Sharma Date: Tue, 4 Feb 2025 14:31:40 +0530 Subject: [PATCH 06/10] [patch] set optional params later --- python/src/mas/cli/install/app.py | 10 +++++----- python/src/mas/cli/install/params.py | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py index 026f493f34..2fedc2a1fe 100644 --- a/python/src/mas/cli/install/app.py +++ b/python/src/mas/cli/install/app.py @@ -861,11 +861,6 @@ def nonInteractiveMode(self) -> None: self.fatalError(f"{key} must be set") self.setParam(key, value) - # These fields we just pass straight through to the parameters - elif key in optionalParams: - if value is not None: - self.setParam(key, value) - elif key == "kafka_provider": if value is not None: self.setParam("kafka_provider", value) @@ -1001,6 +996,11 @@ def nonInteractiveMode(self) -> None: self.setParam("mas_manual_cert_mgmt", False) self.manualCertsDir = None + # These fields we just pass straight through to the parameters + elif key in optionalParams: + if value is not None: + self.setParam(key, value) + # Fail if there's any arguments we don't know how to handle else: print(f"Unknown option: {key} {value}") diff --git a/python/src/mas/cli/install/params.py b/python/src/mas/cli/install/params.py index dcd3f33627..acd7622d16 100644 --- a/python/src/mas/cli/install/params.py +++ b/python/src/mas/cli/install/params.py @@ -61,7 +61,6 @@ "mas_domain", # SLS "sls_namespace", - "sls_mongodb_cfg_file", # DNS Providers # TODO: Add CloudFlare and Route53 support "dns_provider", From b079c5db946e9b0cc099489d731a21d34046ca64 Mon Sep 17 00:00:00 2001 From: Sarthak Sharma Date: Tue, 4 Feb 2025 18:04:04 +0530 Subject: [PATCH 07/10] [patch] add setParam for mongodb_namespace --- python/src/mas/cli/install/app.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py index 2fedc2a1fe..4026564493 100644 --- a/python/src/mas/cli/install/app.py +++ b/python/src/mas/cli/install/app.py @@ -966,6 +966,7 @@ def nonInteractiveMode(self) -> None: elif key == "mongodb_namespace": if value is None: self.fatalError(f"{key} must be set") + self.setParam(key, value) self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{value}.yml") elif key.startswith("approval_"): From c281252f4dd9e73d5e9fb648413e7a0288816e73 Mon Sep 17 00:00:00 2001 From: Sarthak Sharma Date: Tue, 4 Feb 2025 22:16:22 +0530 Subject: [PATCH 08/10] [patch] refactor set sls_mongo_cfg_file with optional params --- python/src/mas/cli/install/app.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py index 4026564493..cec86e2a22 100644 --- a/python/src/mas/cli/install/app.py +++ b/python/src/mas/cli/install/app.py @@ -861,6 +861,15 @@ def nonInteractiveMode(self) -> None: self.fatalError(f"{key} must be set") self.setParam(key, value) + # These fields we just pass straight through to the parameters + elif key in optionalParams: + if value is not None: + self.setParam(key, value) + + # if mongodb_namespace is provided, set SLS MongoDB Configuration File path + if key == "mongodb_namespace": + self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{value}.yml") + elif key == "kafka_provider": if value is not None: self.setParam("kafka_provider", value) @@ -962,13 +971,6 @@ def nonInteractiveMode(self) -> None: self.fatalError(f"{key} must be set") self.pipelineStorageClass = value - # Set SLS MongoDB Configuration File if a `mongodb_namespace` is provided other than default - elif key == "mongodb_namespace": - if value is None: - self.fatalError(f"{key} must be set") - self.setParam(key, value) - self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{value}.yml") - elif key.startswith("approval_"): if key not in self.approvals: raise KeyError(f"{key} is not a supported approval workflow ID: {self.approvals.keys()}") @@ -997,11 +999,6 @@ def nonInteractiveMode(self) -> None: self.setParam("mas_manual_cert_mgmt", False) self.manualCertsDir = None - # These fields we just pass straight through to the parameters - elif key in optionalParams: - if value is not None: - self.setParam(key, value) - # Fail if there's any arguments we don't know how to handle else: print(f"Unknown option: {key} {value}") From 73d9fd7c137100625207020636d27c4fc04cd420 Mon Sep 17 00:00:00 2001 From: Sarthak Sharma Date: Tue, 4 Feb 2025 23:43:16 +0530 Subject: [PATCH 09/10] [patch] revert change for configMongoDb --- python/src/mas/cli/install/settings/mongodbSettings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/src/mas/cli/install/settings/mongodbSettings.py b/python/src/mas/cli/install/settings/mongodbSettings.py index cf24e7ca64..1458be6d2a 100644 --- a/python/src/mas/cli/install/settings/mongodbSettings.py +++ b/python/src/mas/cli/install/settings/mongodbSettings.py @@ -24,7 +24,7 @@ def configMongoDb(self) -> None: self.promptForString("MongoDb namespace", "mongodb_namespace", default="mongoce") else: # Even though "" works as the default, we use this value to contruct other values so we need to explicitly set it - self.setParam("mongodb_namespace", self.getParam('mongodb_namespace') or "mongoce") + self.setParam("mongodb_namespace", "mongoce") self.setParam("mongodb_action", "install") self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{self.getParam('mongodb_namespace')}.yml") From 64231abeeddee4a97124388de725995826ffea83 Mon Sep 17 00:00:00 2001 From: Sarthak Sharma Date: Wed, 5 Feb 2025 22:54:44 +0530 Subject: [PATCH 10/10] [patch] refactor set mongodb_namespace --- python/src/mas/cli/install/app.py | 11 +++++++---- python/src/mas/cli/install/params.py | 2 -- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py index cec86e2a22..3157ebd4c8 100644 --- a/python/src/mas/cli/install/app.py +++ b/python/src/mas/cli/install/app.py @@ -866,10 +866,6 @@ def nonInteractiveMode(self) -> None: if value is not None: self.setParam(key, value) - # if mongodb_namespace is provided, set SLS MongoDB Configuration File path - if key == "mongodb_namespace": - self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{value}.yml") - elif key == "kafka_provider": if value is not None: self.setParam("kafka_provider", value) @@ -952,6 +948,13 @@ def nonInteractiveMode(self) -> None: self.setParam(key, value) if value in ["jms", "snojms"]: self.setParam("mas_app_settings_persistent_volumes_flag", "true") + + # MongoDB + elif key == "mongodb_namespace": + if value is not None and value != "": + self.setParam(key, value) + self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{value}.yml") + # SLS elif key == "license_file": if value is not None and value != "": diff --git a/python/src/mas/cli/install/params.py b/python/src/mas/cli/install/params.py index acd7622d16..2b77ea1bbe 100644 --- a/python/src/mas/cli/install/params.py +++ b/python/src/mas/cli/install/params.py @@ -71,8 +71,6 @@ "mas_cluster_issuer", # DRO "dro_namespace", - # MongoDb - "mongodb_namespace", # Db2 "db2_action_system", "db2_action_manage",