diff --git a/.gitignore b/.gitignore index e921c42..5e84bf8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ keyring passwords.py *github* *venv* *git* +*tech_spec* diff --git a/comment_mapping.xlsx b/comment_mapping.xlsx index ea20157..2dc3c61 100644 Binary files a/comment_mapping.xlsx and b/comment_mapping.xlsx differ diff --git a/migration_script.py b/migration_script.py index 6d1b450..a2b6eb1 100644 --- a/migration_script.py +++ b/migration_script.py @@ -235,15 +235,18 @@ class Migration: with create_temp_file(content=exported_content, suffix=".zip", logger=self.logger) as tmp_zip_path, \ create_temp_file(suffix=".dir", logger=self.logger) as tmp_unpack_dir: - with zipfile.ZipFile(tmp_zip_path, "r") as zip_ref: - zip_ref.extractall(tmp_unpack_dir) - - if self.db_config_replacement: - update_yamls(db_configs=[self.db_config_replacement], path=str(tmp_unpack_dir)) - - with create_temp_file(suffix=".zip", logger=self.logger) as tmp_new_zip: - create_dashboard_export(zip_path=tmp_new_zip, source_paths=[str(tmp_unpack_dir)]) - self.to_c.import_dashboard(file_name=tmp_new_zip, dash_id=dash_id, dash_slug=dash_slug) + if not self.db_config_replacement: + self.to_c.import_dashboard(file_name=tmp_zip_path, dash_id=dash_id, dash_slug=dash_slug) + else: + with zipfile.ZipFile(tmp_zip_path, "r") as zip_ref: + zip_ref.extractall(tmp_unpack_dir) + + if self.db_config_replacement: + update_yamls(db_configs=[self.db_config_replacement], path=str(tmp_unpack_dir)) + + with create_temp_file(suffix=".zip", logger=self.logger) as tmp_new_zip: + create_dashboard_export(zip_path=tmp_new_zip, source_paths=[str(tmp_unpack_dir)]) + self.to_c.import_dashboard(file_name=tmp_new_zip, dash_id=dash_id, dash_slug=dash_slug) self.logger.info("[execute_migration][Success] Dashboard %s imported.", title) except Exception as exc: diff --git a/run_mapper.py b/run_mapper.py index 99d405a..ad5532f 100644 --- a/run_mapper.py +++ b/run_mapper.py @@ -6,6 +6,7 @@ # import argparse +import keyring from superset_tool.utils.init_clients import setup_clients from superset_tool.utils.logger import SupersetLogger from superset_tool.utils.dataset_mapper import DatasetMapper @@ -33,10 +34,10 @@ def main(): # [AI_NOTE]: Конфигурация БД должна быть вынесена во внешний файл или переменные окружения. POSTGRES_CONFIG = { 'dbname': 'dwh', - 'user': 'your_user', - 'password': 'your_password', - 'host': 'your_host', - 'port': 'your_port' + 'user': keyring.get_password("system", f"dwh gp user"), + 'password': keyring.get_password("system", f"dwh gp password"), + 'host': '10.66.229.201', + 'port': '5432' } logger.info("[main][Enter] Starting dataset mapper CLI.")