diff --git a/server/elastic/apply_mappings.py b/server/elastic/apply_mappings.py index 86368ab..65b8112 100755 --- a/server/elastic/apply_mappings.py +++ b/server/elastic/apply_mappings.py @@ -10,7 +10,11 @@ from pathlib import Path from requests.adapters import HTTPAdapter from requests.packages.urllib3.util.retry import Retry -HERE = Path(__file__).parent +HERE = Path(__file__).resolve().parent + +session = requests.Session() +adapter = HTTPAdapter(max_retries=Retry(5, backoff_factor=0.5)) +session.mount('http://', adapter) def apply_mappings_to_host(host: str): @@ -20,10 +24,6 @@ def apply_mappings_to_host(host: str): es_server = host url = f"{es_server}/_template/{f.stem}" - session = requests.Session() - adapter = HTTPAdapter(max_retries=Retry(5, backoff_factor=0.5)) - session.mount('http://', adapter) - session.delete(url) r = session.post( url, diff --git a/server/init_data.py b/server/init_data.py index b1f9823..b4ac8a8 100644 --- a/server/init_data.py +++ b/server/init_data.py @@ -25,7 +25,7 @@ from service_repo.auth.fixed_user import FixedUser log = config.logger(__file__) -migration_dir = (Path(__file__) / "../../migration/mongodb").resolve() +migration_dir = Path(__file__).resolve().parent / "mongo" / "migrations" class MissingElasticConfiguration(Exception): diff --git a/migration/mongodb/0.12.1.py b/server/mongo/migrations/0.12.1.py similarity index 100% rename from migration/mongodb/0.12.1.py rename to server/mongo/migrations/0.12.1.py diff --git a/server/mongo/migrations/0.13.0.py b/server/mongo/migrations/0.13.0.py new file mode 100644 index 0000000..e8570c9 --- /dev/null +++ b/server/mongo/migrations/0.13.0.py @@ -0,0 +1,6 @@ +from pymongo.database import Database, Collection + + +def migrate_auth(db: Database): + collection: Collection = db["user"] + collection.drop_index("name_1_company_1")