ethyca · PSalant726 · Jun 10, 2022 · Jun 9, 2022 · Jun 9, 2022 · Jun 10, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,7 @@ The types of changes are:
 * `Security` in case of vulnerabilities.
 
 
-## [Unreleased](https://github.com/ethyca/fidesops/compare/1.5.2...main)
+## [Unreleased](https://github.com/ethyca/fidesops/compare/1.5.3...main)
 
 ### Added
 * Subject Request Details page [#563](https://github.com/ethyca/fidesops/pull/563)
@@ -29,6 +29,14 @@ The types of changes are:
 
 * Refactor auth and enable static file serving [#577](https://github.com/ethyca/fidesops/pull/577)
 
+## [1.5.3](https://github.com/ethyca/fidesops/compare/1.5.2...1.5.3)
+
+### Changed
+* Database migrations now exist as part of the core `fidesops` package [#620](https://github.com/ethyca/fidesops/pull/620)
+
+### Removed
+* The `[package]` config section no longer exists [#620](https://github.com/ethyca/fidesops/pull/620)
+
 ## [1.5.2](https://github.com/ethyca/fidesops/compare/1.5.1...1.5.2)
 
 ### Added

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,10 +3,10 @@ include README.md
 include requirements.txt
 include dev-requirements.txt
 include versioneer.py
-include src/alembic.ini
+include src/fidesops/alembic.ini
 include src/fidesops/_version.py
-graft src/migrations
-exclude src/migrations/README
-exclude src/migrations/script.py.mako
+graft src/fidesops/migrations
+exclude src/fidesops/migrations/README
+exclude src/fidesops/migrations/script.py.mako
 
 global-exclude *.pyc
diff --git a/src/alembic.ini → src/fidesops/alembic.ini b/src/alembic.ini → src/fidesops/alembic.ini
diff --git a/src/fidesops/core/config.py b/src/fidesops/core/config.py
@@ -95,31 +95,6 @@ class Config:
         env_prefix = "FIDESOPS__EXECUTION__"
 
 
-class PackageSettings(FidesSettings):
-    """Configuration settings for the fidesops package itself."""
-
-    PATH: Optional[str] = None
-
-    @validator("PATH", pre=True)
-    def ensure_valid_package_path(cls, v: Optional[str]) -> str:
-        """
-        Ensure a valid path to the fidesops src/ directory is provided.
-
-        This is required to enable fidesops-plus to start successfully.
-        """
-
-        if isinstance(v, str) and os.path.isdir(v):
-            return (
-                v if os.path.basename(v) == "fidesops" else os.path.join(v, "fidesops/")
-            )
-
-        current_dir = os.path.dirname(os.path.abspath(__file__))
-        return os.path.normpath(os.path.join(current_dir, "../../"))
-
-    class Config:
-        env_prefix = "FIDESOPS__PACKAGE__"
-
-
 class RedisSettings(FidesSettings):
     """Configuration settings for Redis."""
 
@@ -253,7 +228,6 @@ class FidesopsConfig(FidesSettings):
     """Configuration variables for the FastAPI project"""
 
     database: DatabaseSettings
-    package = PackageSettings()
     redis: RedisSettings
     security: SecuritySettings
     execution: ExecutionSettings

diff --git a/src/fidesops/db/database.py b/src/fidesops/db/database.py
@@ -1,29 +1,27 @@
 """
 Contains all of the logic for spinning up/tearing down the database.
 """
-import os
+from os import path
 
 from alembic import command
 from alembic.config import Config
 from alembic.migration import MigrationContext
 from pydantic import PostgresDsn
 
-from fidesops.core.config import config
 from fidesops.db.session import get_db_engine
 
 from .base import Base
 
 
-def get_alembic_config(
-    database_url: str,
-    package_source_dir: str = config.package.PATH,
-) -> Config:
+def get_alembic_config(database_url: str) -> Config:
     """
     Do lots of magic to make alembic work programmatically.
     """
 
-    migrations_dir = os.path.join(package_source_dir, "migrations/")
-    alembic_config = Config(os.path.join(package_source_dir, "alembic.ini"))
+    current_dir = path.dirname(path.abspath(__file__))
+    migrations_dir = path.abspath(path.join(current_dir, "../migrations"))
+
+    alembic_config = Config(path.abspath(path.join(current_dir, "../alembic.ini")))
     alembic_config.set_main_option("script_location", migrations_dir.replace("%", "%%"))
     alembic_config.set_main_option("sqlalchemy.url", database_url)
     return alembic_config
@@ -35,14 +33,11 @@ def upgrade_db(alembic_config: Config, revision: str = "head") -> None:
     command.upgrade(alembic_config, revision)
 
 
-def init_db(
-    database_url: PostgresDsn,
-    package_source_dir: str = config.package.PATH,
-) -> None:
+def init_db(database_url: PostgresDsn) -> None:
     """
     Runs the migrations and creates all of the database objects.
     """
-    alembic_config = get_alembic_config(database_url, package_source_dir)
+    alembic_config = get_alembic_config(database_url)
     upgrade_db(alembic_config)
 
 

diff --git a/src/fidesops/main.py b/src/fidesops/main.py
@@ -56,7 +56,7 @@ def start_webserver() -> None:
 
     if config.database.ENABLED:
         logger.info("Running any pending DB migrations...")
-        init_db(config.database.SQLALCHEMY_DATABASE_URI, config.package.PATH)
+        init_db(config.database.SQLALCHEMY_DATABASE_URI)
 
     scheduler.start()
 

diff --git a/src/migrations/README → src/fidesops/migrations/README b/src/migrations/README → src/fidesops/migrations/README
diff --git a/src/migrations/__init__.py → src/fidesops/migrations/__init__.py b/src/migrations/__init__.py → src/fidesops/migrations/__init__.py
diff --git a/src/migrations/env.py → src/fidesops/migrations/env.py b/src/migrations/env.py → src/fidesops/migrations/env.py
diff --git a/src/migrations/script.py.mako → src/fidesops/migrations/script.py.mako b/src/migrations/script.py.mako → src/fidesops/migrations/script.py.mako
diff --git a/...grations/versions/0210948a8147_initial.py → ...grations/versions/0210948a8147_initial.py b/...grations/versions/0210948a8147_initial.py → ...grations/versions/0210948a8147_initial.py
diff --git a/...ions/versions/07014ff34eb2_add_mariadb.py → ...ions/versions/07014ff34eb2_add_mariadb.py b/...ions/versions/07014ff34eb2_add_mariadb.py → ...ions/versions/07014ff34eb2_add_mariadb.py
diff --git a/...7_add_saas_config_to_connection_config.py → ...7_add_saas_config_to_connection_config.py b/...7_add_saas_config_to_connection_config.py → ...7_add_saas_config_to_connection_config.py
diff --git a/...1ff88b7bd579_add_authorization_request.py → ...1ff88b7bd579_add_authorization_request.py b/...1ff88b7bd579_add_authorization_request.py → ...1ff88b7bd579_add_authorization_request.py
diff --git a/...s/27fe9da9d0f9_privacy_request_stopped.py → ...s/27fe9da9d0f9_privacy_request_stopped.py b/...s/27fe9da9d0f9_privacy_request_stopped.py → ...s/27fe9da9d0f9_privacy_request_stopped.py
diff --git a/...adds_first_name_and_last_name_to_user_.py → ...adds_first_name_and_last_name_to_user_.py b/...adds_first_name_and_last_name_to_user_.py → ...adds_first_name_and_last_name_to_user_.py
diff --git a/...3a7c5fb119c9_add_manual_connector_type.py → ...3a7c5fb119c9_add_manual_connector_type.py b/...3a7c5fb119c9_add_manual_connector_type.py → ...3a7c5fb119c9_add_manual_connector_type.py
diff --git a/...5078badb90b9_adds_drp_action_to_policy.py → ...5078badb90b9_adds_drp_action_to_policy.py b/...5078badb90b9_adds_drp_action_to_policy.py → ...5078badb90b9_adds_drp_action_to_policy.py
diff --git a/src/migrations/versions/530fb8533ca4_test.py → .../migrations/versions/530fb8533ca4_test.py b/src/migrations/versions/530fb8533ca4_test.py → .../migrations/versions/530fb8533ca4_test.py
diff --git a/...d643d7_fidesops_user_and_client_detail.py → ...d643d7_fidesops_user_and_client_detail.py b/...d643d7_fidesops_user_and_client_detail.py → ...d643d7_fidesops_user_and_client_detail.py
diff --git a/...0db16d05_add_fidesops_user_permissions.py → ...0db16d05_add_fidesops_user_permissions.py b/...0db16d05_add_fidesops_user_permissions.py → ...0db16d05_add_fidesops_user_permissions.py
diff --git a/...s/906d7198df28_privacy_request_approve.py → ...s/906d7198df28_privacy_request_approve.py b/...s/906d7198df28_privacy_request_approve.py → ...s/906d7198df28_privacy_request_approve.py
diff --git a/src/migrations/versions/__init__.py → src/fidesops/migrations/versions/__init__.py b/src/migrations/versions/__init__.py → src/fidesops/migrations/versions/__init__.py
diff --git a/...sions/c5336b841d70_add_policy_webhooks.py → ...sions/c5336b841d70_add_policy_webhooks.py b/...sions/c5336b841d70_add_policy_webhooks.py → ...sions/c5336b841d70_add_policy_webhooks.py
diff --git a/...dd_user_login_and_password_reset_dates.py → ...dd_user_login_and_password_reset_dates.py b/...dd_user_login_and_password_reset_dates.py → ...dd_user_login_and_password_reset_dates.py
diff --git a/...ns/versions/c98da12d76f8_add_audit_log.py → ...ns/versions/c98da12d76f8_add_audit_log.py b/...ns/versions/c98da12d76f8_add_audit_log.py → ...ns/versions/c98da12d76f8_add_audit_log.py
diff --git a/...65e7e921814_add_privacy_request_status.py → ...65e7e921814_add_privacy_request_status.py b/...65e7e921814_add_privacy_request_status.py → ...65e7e921814_add_privacy_request_status.py
diff --git a/...ons/versions/e55a51b354e3_add_bigquery.py → ...ons/versions/e55a51b354e3_add_bigquery.py b/...ons/versions/e55a51b354e3_add_bigquery.py → ...ons/versions/e55a51b354e3_add_bigquery.py
diff --git a/...74d_add_redshift_and_snowflake_support.py → ...74d_add_redshift_and_snowflake_support.py b/...74d_add_redshift_and_snowflake_support.py → ...74d_add_redshift_and_snowflake_support.py
diff --git a/...ations/versions/f3841942d90c_add_mssql.py → ...ations/versions/f3841942d90c_add_mssql.py b/...ations/versions/f3841942d90c_add_mssql.py → ...ations/versions/f3841942d90c_add_mssql.py