summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrekby <[email protected]>2023-05-12 17:41:16 +0300
committerrekby <[email protected]>2023-05-12 17:41:16 +0300
commit77d647c5af534e8cef4a2624b05f7b9d0fe389dc (patch)
treef22b4df88c064d358a2b3c5cdcddd1daab4cdca0
parent9629a1cbefcb838e4801ad8a22944c8e81c8f0c9 (diff)
support POSTGRES_USER and POSTGRES_PASSWORD env vars for local ydb
-rw-r--r--ydb/public/tools/lib/cmds/__init__.py15
-rw-r--r--ydb/tests/library/harness/kikimr_config.py17
2 files changed, 31 insertions, 1 deletions
diff --git a/ydb/public/tools/lib/cmds/__init__.py b/ydb/public/tools/lib/cmds/__init__.py
index 326b9f9f4ad..0e26472ffeb 100644
--- a/ydb/public/tools/lib/cmds/__init__.py
+++ b/ydb/public/tools/lib/cmds/__init__.py
@@ -223,6 +223,20 @@ def use_in_memory_pdisks_flag():
return os.getenv('YDB_USE_IN_MEMORY_PDISKS') == 'true'
+def default_users():
+ if not os.getenv("POSTGRES_USER") and not os.getenv("POSTGRES_PASSWORD"):
+ return None
+
+ user = os.getenv("POSTGRES_USER")
+ if not user:
+ user = "postgres"
+
+ password = os.getenv("POSTGRES_PASSWORD")
+ if not password:
+ password = ""
+ return {user: password}
+
+
def enable_survive_restart():
return os.getenv('YDB_LOCAL_SURVIVE_RESTART') == 'true'
@@ -302,6 +316,7 @@ def deploy(arguments):
public_http_config_path=arguments.public_http_config_path,
auth_config_path=arguments.auth_config_path,
use_log_files=not arguments.dont_use_log_files,
+ default_users=default_users(),
**optionals
)
diff --git a/ydb/tests/library/harness/kikimr_config.py b/ydb/tests/library/harness/kikimr_config.py
index e0f2034fc09..303657459ed 100644
--- a/ydb/tests/library/harness/kikimr_config.py
+++ b/ydb/tests/library/harness/kikimr_config.py
@@ -142,7 +142,8 @@ class KikimrConfigGenerator(object):
enable_alter_database_create_hive_first=False,
disable_iterator_reads=False,
disable_iterator_lookups=False,
- overrided_actor_system_config=None
+ overrided_actor_system_config=None,
+ default_users=None, # dict[user]=password
):
self._version = version
self.use_log_files = use_log_files
@@ -313,6 +314,20 @@ class KikimrConfigGenerator(object):
self.yaml_config["grpc_config"]["cert"] = self.grpc_tls_cert_path
self.yaml_config["grpc_config"]["key"] = self.grpc_tls_key_path
+ if default_users is not None:
+ # check for None for remove default users for empty dict
+ if "security_config" not in self.yaml_config["domains_config"]:
+ self.yaml_config["domains_config"]["security_config"] = dict()
+
+ # remove existed default users
+ self.yaml_config["domains_config"]["security_config"]["default_users"] = []
+
+ for user, password in default_users.items():
+ self.yaml_config["domains_config"]["security_config"]["default_users"].append({
+ "name": user,
+ "password": password,
+ })
+
if os.getenv("YDB_ALLOW_ORIGIN") is not None:
self.yaml_config["monitoring_config"] = {"allow_origin": str(os.getenv("YDB_ALLOW_ORIGIN"))}