From 8ed51df4c6b7a70599413860076a424d9ce75043 Mon Sep 17 00:00:00 2001 From: Milov Dmitriy Date: Fri, 17 Jan 2025 10:40:38 +0300 Subject: [PATCH 1/5] fix: recreate and deploy commands --- Makefile | 2 +- app/extra/__init__.py | 3 +-- tests/conftest.py | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e96284943..6e34a69a3 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ launch: ## run standalone app without tty container docker compose run bash -c "alembic upgrade head && python ." recreate: ## re-run migration - docker exec -it multidirectory bash -c\ + docker exec -it multidirectory_api bash -c\ "alembic downgrade -1; alembic upgrade head; python -m extra.setup_dev" deploy: ## deploy ready-to-use diff --git a/app/extra/__init__.py b/app/extra/__init__.py index 307c775e0..e0ff806d8 100644 --- a/app/extra/__init__.py +++ b/app/extra/__init__.py @@ -5,6 +5,5 @@ """ from .dev_data import DATA, TEST_DATA -from .setup_dev import setup_enviroment -__all__ = ["DATA", "TEST_DATA", "setup_enviroment"] +__all__ = ["DATA", "TEST_DATA"] diff --git a/tests/conftest.py b/tests/conftest.py index 2ec8ba7d9..4dad2bf5a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -40,7 +40,8 @@ ) from config import Settings -from extra import TEST_DATA, setup_enviroment +from extra import TEST_DATA +from extra.setup_dev import setup_enviroment from ioc import MFACredsProvider from ldap_protocol.dialogue import LDAPSession from ldap_protocol.dns import ( From 4d924b368c004f99ab9369864149e78089259ae7 Mon Sep 17 00:00:00 2001 From: Milov Dmitriy Date: Mon, 20 Jan 2025 10:52:44 +0300 Subject: [PATCH 2/5] refactor: revert import changes --- app/extra/__init__.py | 3 ++- tests/conftest.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/extra/__init__.py b/app/extra/__init__.py index e0ff806d8..307c775e0 100644 --- a/app/extra/__init__.py +++ b/app/extra/__init__.py @@ -5,5 +5,6 @@ """ from .dev_data import DATA, TEST_DATA +from .setup_dev import setup_enviroment -__all__ = ["DATA", "TEST_DATA"] +__all__ = ["DATA", "TEST_DATA", "setup_enviroment"] diff --git a/tests/conftest.py b/tests/conftest.py index 4dad2bf5a..2ec8ba7d9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -40,8 +40,7 @@ ) from config import Settings -from extra import TEST_DATA -from extra.setup_dev import setup_enviroment +from extra import TEST_DATA, setup_enviroment from ioc import MFACredsProvider from ldap_protocol.dialogue import LDAPSession from ldap_protocol.dns import ( From e383d92c304c9306939d3d2ed3b57b70370a89a8 Mon Sep 17 00:00:00 2001 From: Milov Dmitriy Date: Mon, 20 Jan 2025 10:53:43 +0300 Subject: [PATCH 3/5] refactor: delete unused commands --- Makefile | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Makefile b/Makefile index 6e34a69a3..47b537183 100644 --- a/Makefile +++ b/Makefile @@ -21,16 +21,6 @@ launch: ## run standalone app without tty container docker compose down; docker compose run bash -c "alembic upgrade head && python ." -recreate: ## re-run migration - docker exec -it multidirectory_api bash -c\ - "alembic downgrade -1; alembic upgrade head; python -m extra.setup_dev" - -deploy: ## deploy ready-to-use - make build - docker compose down; docker compose up -d - make recreate - make up - down: ## shutdown services docker compose -f docker-compose.test.yml down --remove-orphans docker compose down --remove-orphans From 4d881a36e1e8aa85d61b96ff7cdbc7cf50893d3e Mon Sep 17 00:00:00 2001 From: Milov Dmitriy Date: Mon, 20 Jan 2025 11:20:19 +0300 Subject: [PATCH 4/5] refactor: rollback changes, delete only setup_dev --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 47b537183..fb2eedc08 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,16 @@ launch: ## run standalone app without tty container docker compose down; docker compose run bash -c "alembic upgrade head && python ." +recreate: ## re-run migration + docker exec -it multidirectory_api bash -c\ + "alembic downgrade -1; alembic upgrade head;" + +deploy: ## deploy ready-to-use + make build + docker compose down; docker compose up -d + make recreate + make up + down: ## shutdown services docker compose -f docker-compose.test.yml down --remove-orphans docker compose down --remove-orphans From c3c4cf8bd3bbfa1683c4433914f2e291746241d8 Mon Sep 17 00:00:00 2001 From: Milov Dmitriy Date: Mon, 20 Jan 2025 12:54:50 +0300 Subject: [PATCH 5/5] refactor: delete deploy, rename recreate --- Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile b/Makefile index fb2eedc08..4209f9868 100644 --- a/Makefile +++ b/Makefile @@ -21,16 +21,10 @@ launch: ## run standalone app without tty container docker compose down; docker compose run bash -c "alembic upgrade head && python ." -recreate: ## re-run migration +downgrade: ## re-run migration docker exec -it multidirectory_api bash -c\ "alembic downgrade -1; alembic upgrade head;" -deploy: ## deploy ready-to-use - make build - docker compose down; docker compose up -d - make recreate - make up - down: ## shutdown services docker compose -f docker-compose.test.yml down --remove-orphans docker compose down --remove-orphans