ethyca-fides 2.60.0rc2__tar.gz → 2.60.1b0__tar.gz

{ethyca_fides-2.60.0rc2/src/ethyca_fides.egg-info → ethyca_fides-2.60.1b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ethyca_fides
-Version: 2.60.0rc2
+Version: 2.60.1b0
 Summary: Open-source ecosystem for data privacy as code.
 Home-page: https://github.com/ethyca/fides
 Author: Ethyca, Inc.

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/dev-requirements.txt

@@ -13,6 +13,7 @@ pytest-cov==4.0.0
 pytest-env==0.7.0
 pytest-mock==3.14.0
 pytest-rerunfailures==14.0
+pytest-xdist==3.6.1
 pytest==7.2.2
 requests-mock==1.10.0
 setuptools>=64.0.2

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0/src/ethyca_fides.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ethyca_fides
-Version: 2.60.0rc2
+Version: 2.60.1b0
 Summary: Open-source ecosystem for data privacy as code.
 Home-page: https://github.com/ethyca/fides
 Author: Ethyca, Inc.

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/ethyca_fides.egg-info/SOURCES.txt

@@ -497,6 +497,7 @@ src/fides/api/schemas/connection_configuration/connection_type_system_map.py
 src/fides/api/schemas/connection_configuration/connections_secrets_https.py
 src/fides/api/schemas/connection_configuration/saas_config_template_values.py
 src/fides/api/schemas/connection_configuration/enums/__init__.py
+src/fides/api/schemas/connection_configuration/enums/google_cloud_sql_ip_type.py
 src/fides/api/schemas/connection_configuration/enums/system_type.py
 src/fides/api/schemas/connection_configuration/enums/test_status.py
 src/fides/api/schemas/limiter/__init__.py
@@ -814,8 +815,6 @@ src/fides/ui-build/static/admin/properties.html
 src/fides/ui-build/static/admin/systems.html
 src/fides/ui-build/static/admin/taxonomy.html
 src/fides/ui-build/static/admin/user-management.html
-src/fides/ui-build/static/admin/_next/static/44eOp28jisdb1AR9L9B9m/_buildManifest.js
-src/fides/ui-build/static/admin/_next/static/44eOp28jisdb1AR9L9B9m/_ssgManifest.js
 src/fides/ui-build/static/admin/_next/static/chunks/1100-c3d52c9d7d6d0a39.js
 src/fides/ui-build/static/admin/_next/static/chunks/1817-3d9a78857dd5a9f4.js
 src/fides/ui-build/static/admin/_next/static/chunks/1904-00404c45e69d3225.js
@@ -840,7 +839,7 @@ src/fides/ui-build/static/admin/_next/static/chunks/5487-fd9b930f4246520a.js
 src/fides/ui-build/static/admin/_next/static/chunks/570-c99f07161bd339cd.js
 src/fides/ui-build/static/admin/_next/static/chunks/5826-5f6e7a91e9ff71d1.js
 src/fides/ui-build/static/admin/_next/static/chunks/5835-057c2dec5117817c.js
-src/fides/ui-build/static/admin/_next/static/chunks/5973-6f53799483424513.js
+src/fides/ui-build/static/admin/_next/static/chunks/5973-9199898696748d0c.js
 src/fides/ui-build/static/admin/_next/static/chunks/6060-cb1ab5be7067bf7b.js
 src/fides/ui-build/static/admin/_next/static/chunks/618f8807-d15c33d1d6c8b961.js
 src/fides/ui-build/static/admin/_next/static/chunks/6277-b4885ac291c35484.js
@@ -871,7 +870,7 @@ src/fides/ui-build/static/admin/_next/static/chunks/9719-8ce33427015f12ae.js
 src/fides/ui-build/static/admin/_next/static/chunks/9729-fcf6ff4e3534e4a8.js
 src/fides/ui-build/static/admin/_next/static/chunks/9767-e8b0b48d602451d8.js
 src/fides/ui-build/static/admin/_next/static/chunks/9951-d8d1174b00f9dac1.js
-src/fides/ui-build/static/admin/_next/static/chunks/9965-dac854cdf6141611.js
+src/fides/ui-build/static/admin/_next/static/chunks/9965-023779db7a1b4aa2.js
 src/fides/ui-build/static/admin/_next/static/chunks/c78d26b1-88a3e1bacb2a03c2.js
 src/fides/ui-build/static/admin/_next/static/chunks/e3251fe7-5777b5d778e6fffa.js
 src/fides/ui-build/static/admin/_next/static/chunks/ea076c0a.84423f606aef37cd.js
@@ -906,7 +905,7 @@ src/fides/ui-build/static/admin/_next/static/chunks/pages/consent/configure-790c
 src/fides/ui-build/static/admin/_next/static/chunks/pages/consent/privacy-experience-f0ba90152c43c742.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/consent/privacy-notices-90b331a666216e38.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/consent/properties-b9919fa183e9308a.js
-src/fides/ui-build/static/admin/_next/static/chunks/pages/consent/reporting-1762ed46d98cebad.js
+src/fides/ui-build/static/admin/_next/static/chunks/pages/consent/reporting-51284600803b1fa6.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/consent/configure/add-vendors-b3d62016149e5aa4.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/consent/privacy-experience/[id]-6641f24adf72b00c.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/consent/privacy-experience/new-300fd2800c417d0b.js
@@ -998,6 +997,8 @@ src/fides/ui-build/static/admin/_next/static/media/inter-vietnamese-500-normal.7
 src/fides/ui-build/static/admin/_next/static/media/inter-vietnamese-600-normal.eb82de1d.woff2
 src/fides/ui-build/static/admin/_next/static/media/inter-vietnamese-700-normal.00e401a9.woff2
 src/fides/ui-build/static/admin/_next/static/media/logo-white.c9bf4196.svg
+src/fides/ui-build/static/admin/_next/static/snXG8lXqPoT4hj3yvlEtk/_buildManifest.js
+src/fides/ui-build/static/admin/_next/static/snXG8lXqPoT4hj3yvlEtk/_ssgManifest.js
 src/fides/ui-build/static/admin/add-systems/manual.html
 src/fides/ui-build/static/admin/add-systems/multiple.html
 src/fides/ui-build/static/admin/consent/configure.html

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/fides/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-04-24T11:08:38-0600",
+ "date": "2025-04-24T14:18:37-0300",
  "dirty": false,
  "error": null,
- "full-revisionid": "076a62e140a3536823c6a04738729775ae222f12",
- "version": "2.60.0rc2"
+ "full-revisionid": "5a6ec5645f426b24c13755893e0df66d7c2f94f3",
+ "version": "2.60.1b0"
 }
 '''  # END VERSION_JSON
 

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/fides/api/api/deps.py

@@ -1,10 +1,12 @@
-from contextlib import contextmanager
-from typing import Generator
+from contextlib import asynccontextmanager, contextmanager
+from typing import AsyncGenerator, Generator
 
 from fastapi import Depends
+from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import Session
 
 from fides.api.common_exceptions import RedisNotConfigured
+from fides.api.db.ctl_session import async_session
 from fides.api.db.session import get_db_engine, get_db_session
 from fides.api.util.cache import get_cache as get_redis_connection
 from fides.config import CONFIG, FidesConfig
@@ -102,3 +104,17 @@ def get_cache() -> Generator:
             "Application redis cache required, but it is currently disabled! Please update your application configuration to enable integration with a Redis cache."
         )
     yield get_redis_connection()
+
+
+@asynccontextmanager
+async def get_async_autoclose_db_session() -> AsyncGenerator[AsyncSession, None]:
+    """
+    Return an async database session as an async context manager that automatically closes when the context exits.
+
+    Use this when you need manual control over the async session lifecycle outside of API endpoints.
+    """
+    session = async_session()
+    try:
+        yield session
+    finally:
+        await session.close()

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/fides/api/api/v1/endpoints/admin.py

@@ -16,6 +16,7 @@ ADMIN_ROUTER = APIRouter(prefix=API_PREFIX, tags=["Admin"])
 
 class DBActions(str, Enum):
     "The available path parameters for the `/admin/db/{action}` endpoint."
+
     upgrade = "upgrade"
     reset = "reset"
     downgrade = "downgrade"
@@ -29,7 +30,7 @@ class DBActions(str, Enum):
     ],
     status_code=status.HTTP_200_OK,
 )
-async def db_action(action: DBActions, revision: Optional[str] = "head") -> Dict:
+def db_action(action: DBActions, revision: Optional[str] = "head") -> Dict:
     """
     Initiate one of the enumerated DBActions.
 
@@ -40,7 +41,7 @@ async def db_action(action: DBActions, revision: Optional[str] = "head") -> Dict
 
     if action == DBActions.downgrade:
         try:
-            await migrate_db(database_url=CONFIG.database.sync_database_uri, revision=revision, downgrade=True)  # type: ignore[arg-type]
+            migrate_db(database_url=CONFIG.database.sync_database_uri, revision=revision, downgrade=True)  # type: ignore[arg-type]
             action_text = "downgrade"
         except Exception as e:
             logger.exception("Database downgrade failed")
@@ -68,7 +69,7 @@ async def db_action(action: DBActions, revision: Optional[str] = "head") -> Dict
 
         try:
             logger.info("Database being configured...")
-            await configure_db(CONFIG.database.sync_database_uri, revision=revision)
+            configure_db(CONFIG.database.sync_database_uri, revision=revision)
         except Exception as e:
             logger.exception("Database configuration failed: {e}")
             raise HTTPException(

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/fides/api/app_setup.py

@@ -16,7 +16,11 @@ from slowapi.extension import _rate_limit_exceeded_handler  # type: ignore
 from slowapi.middleware import SlowAPIMiddleware  # type: ignore
 
 import fides
-from fides.api.api.deps import get_api_session
+from fides.api.api.deps import (
+    get_api_session,
+    get_async_autoclose_db_session,
+    get_autoclose_db_session,
+)
 from fides.api.api.v1 import CTL_ROUTER
 from fides.api.api.v1.api import api_router
 from fides.api.api.v1.endpoints.admin import ADMIN_ROUTER
@@ -24,7 +28,8 @@ from fides.api.api.v1.endpoints.generic_overrides import GENERIC_OVERRIDES_ROUTE
 from fides.api.api.v1.endpoints.health import HEALTH_ROUTER
 from fides.api.api.v1.exception_handlers import ExceptionHandlers
 from fides.api.common_exceptions import RedisConnectionError, RedisNotConfigured
-from fides.api.db.database import configure_db
+from fides.api.db import seed
+from fides.api.db.database import configure_db, seed_db
 from fides.api.db.seed import create_or_update_parent_user
 from fides.api.models.application_config import ApplicationConfig
 from fides.api.oauth.system_manager_oauth_util import (
@@ -165,9 +170,12 @@ async def run_database_startup(app: FastAPI) -> None:
 
     if CONFIG.database.automigrate:
         try:
-            await configure_db(
-                CONFIG.database.sync_database_uri, samples=CONFIG.database.load_samples
-            )
+            configure_db(CONFIG.database.sync_database_uri)
+            with get_autoclose_db_session() as session:
+                seed_db(session)
+            if CONFIG.database.load_samples:
+                async with get_async_autoclose_db_session() as async_session:
+                    await seed.load_samples(async_session)
         except Exception as e:
             logger.error("Error occurred during database configuration: {}", str(e))
     else:

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/fides/api/db/database.py

@@ -14,8 +14,7 @@ from sqlalchemy_utils.functions import create_database, database_exists
 from sqlalchemy_utils.types.encrypted.encrypted_type import InvalidCiphertextError
 
 from fides.api.db.base import Base  # type: ignore[attr-defined]
-from fides.api.db.ctl_session import async_session
-from fides.api.db.seed import load_default_resources, load_samples
+from fides.api.db.seed import load_default_resources
 from fides.api.util.errors import get_full_exception_name
 from fides.core.utils import get_db_engine
 
@@ -48,9 +47,8 @@ def downgrade_db(alembic_config: Config, revision: str = "head") -> None:
     command.downgrade(alembic_config, revision)
 
 
-async def migrate_db(
+def migrate_db(
     database_url: str,
-    samples: bool = False,
     revision: str = "head",
     downgrade: bool = False,
 ) -> None:
@@ -66,11 +64,6 @@ async def migrate_db(
     else:
         upgrade_db(alembic_config, revision)
 
-        async with async_session() as session:
-            await load_default_resources(session)
-            if samples:
-                await load_samples(session)
-
 
 def create_db_if_not_exists(database_url: str) -> None:
     """
@@ -121,13 +114,17 @@ def get_db_health(
         return ("unhealthy", None)
 
 
-async def configure_db(
-    database_url: str, samples: bool = False, revision: Optional[str] = "head"
-) -> None:
-    """Set up the db to be used by the app."""
+def seed_db(session: Session) -> None:
+    """Load default resources into the database, and optionally load samples."""
+    load_default_resources(session)
+
+
+def configure_db(database_url: str, revision: Optional[str] = "head") -> None:
+    """Set up the db to be used by the app. Creates db if needed and runs migrations."""
     try:
         create_db_if_not_exists(database_url)
-        await migrate_db(database_url, samples=samples, revision=revision)  # type: ignore[arg-type]
+        migrate_db(database_url, revision=revision)  # type: ignore[arg-type]
+
     except InvalidCiphertextError as cipher_error:
         log.error(
             "Unable to configure database due to a decryption error! Check to ensure your `app_encryption_key` has not changed."

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/fides/api/db/seed.py

@@ -25,6 +25,7 @@ from fides.api.models.fides_user_permissions import FidesUserPermissions
 from fides.api.models.policy import Policy, Rule, RuleTarget
 from fides.api.models.sql_models import (  # type: ignore[attr-defined]
     Dataset,
+    Organization,
     System,
     sql_model_map,
 )
@@ -44,7 +45,7 @@ from fides.api.util.text import to_snake_case
 from fides.config import CONFIG
 from fides.service.dataset.dataset_config_service import DatasetConfigService
 
-from .crud import create_resource, get_resource, list_resource, upsert_resources
+from .crud import upsert_resources
 from .samples import (
     load_sample_connections_from_project,
     load_sample_resources_from_project,
@@ -282,106 +283,41 @@ def load_default_erasure_policy(
     )
 
 
-def load_default_dsr_policies() -> None:
+def load_default_dsr_policies(session: Session) -> None:
     """
     Checks whether DSR execution policies exist in the database, and
     inserts them to target a default set of data categories if not.
     """
-    with sync_session() as db_session:  # type: ignore[attr-defined]
-        client_id = get_client_id(db_session)
+    client_id = get_client_id(session)
 
-        # By default, include all categories *except* those related to a user's
-        # financial, payment, and credentials data. These are typically not
-        # included in access and erasure requests as they are covered by other
-        # compliance programs (e.g. legal, tax, security) and most
-        # organizations need to be extra careful about how these are used -
-        # especially for erasure! Therefore, a safe default for "out of the
-        # box" behaviour is to exclude these
+    # By default, include all categories *except* those related to a user's
+    # financial, payment, and credentials data. These are typically not
+    # included in access and erasure requests as they are covered by other
+    # compliance programs (e.g. legal, tax, security) and most
+    # organizations need to be extra careful about how these are used -
+    # especially for erasure! Therefore, a safe default for "out of the
+    # box" behaviour is to exclude these
 
-        default_data_categories = get_user_data_categories()
+    default_data_categories = get_user_data_categories()
 
-        log.debug(
-            f"Preparing to create default rules for the following Data Categories: {default_data_categories} if they do not already exist"
-        )
-
-        load_default_access_policy(db_session, client_id, default_data_categories)
-        load_default_erasure_policy(db_session, client_id, default_data_categories)
-
-        log.info("All default policies & rules created")
-
-
-async def load_default_organization(async_session: AsyncSession) -> None:
-    """
-    Seed the database with a default organization unless
-    one with a matching name already exists.
-    """
-
-    log.info("Loading the default organization...")
-    organizations: List[Dict] = list(
-        map(dict, DEFAULT_TAXONOMY.model_dump(mode="json")["organization"])
+    log.debug(
+        f"Preparing to create default rules for the following Data Categories: {default_data_categories} if they do not already exist"
     )
 
-    inserted = 0
-    for org in organizations:
-        try:
-            existing = await get_resource(
-                sql_model_map["organization"],
-                org["fides_key"],
-                async_session,
-                raise_not_found=False,
-            )
-            if not existing:
-                await create_resource(sql_model_map["organization"], org, async_session)
-                inserted += 1
-        except AlreadyExistsError:
-            pass
+    load_default_access_policy(session, client_id, default_data_categories)
+    load_default_erasure_policy(session, client_id, default_data_categories)
 
-    log.debug(f"INSERTED {inserted} organization resource(s)")
-    log.debug(f"SKIPPED {len(organizations)-inserted} organization resource(s)")
-
-
-async def load_default_taxonomy(async_session: AsyncSession) -> None:
-    """Seed the database with the default taxonomy resources."""
-
-    upsert_resource_types = list(DEFAULT_TAXONOMY.model_fields_set)
-    upsert_resource_types.remove("organization")
-
-    log.info("Loading the default fideslang taxonomy resources...")
-    for resource_type in upsert_resource_types:
-        log.debug(f"Processing {resource_type} resources...")
-        default_resources = DEFAULT_TAXONOMY.model_dump(mode="json")[resource_type]
-        existing_resources = await list_resource(
-            sql_model_map[resource_type], async_session
-        )
-        existing_keys = [item.fides_key for item in existing_resources]
-        resources = [
-            resource
-            for resource in default_resources
-            if resource["fides_key"] not in existing_keys
-        ]
-
-        if len(resources) == 0:
-            log.debug(f"No new {resource_type} resources to add from default taxonomy.")
-            continue
-
-        try:
-            await upsert_resources(
-                sql_model_map[resource_type], resources, async_session
-            )
-        except QueryError:  # pragma: no cover
-            pass  # The create_resource function will log the error
-        else:
-            log.debug(f"UPSERTED {len(resources)} {resource_type} resource(s)")
+    log.info("All default policies & rules created")
 
 
-async def load_default_resources(async_session: AsyncSession) -> None:
+def load_default_resources(session: Session) -> None:
     """
     Seed the database with default resources that the application
     expects to be available.
     """
-    await load_default_organization(async_session)
-    await load_default_taxonomy(async_session)
-    load_default_dsr_policies()
+    load_default_organization(session)
+    load_default_taxonomy(session)
+    load_default_dsr_policies(session)
 
 
 async def load_samples(async_session: AsyncSession) -> None:
@@ -549,3 +485,70 @@ async def load_samples(async_session: AsyncSession) -> None:
 
     except QueryError:  # pragma: no cover
         pass  # The upsert_resources function will log any error
+
+
+def load_default_organization(db: Session) -> None:
+    """
+    Seed the database with a default organization unless
+    one with a matching name already exists.
+    """
+    log.info("Loading the default organization...")
+    organizations: List[Dict] = list(
+        map(dict, DEFAULT_TAXONOMY.model_dump(mode="json")["organization"])
+    )
+
+    inserted = 0
+    for org in organizations:
+        try:
+            existing = Organization.get_by(
+                db=db, field="fides_key", value=org["fides_key"]
+            )
+            if not existing:
+                Organization.create(db=db, data=org, check_name=False)
+                inserted += 1
+        except AlreadyExistsError:
+            pass
+
+    log.debug(f"INSERTED {inserted} organization resource(s)")
+    log.debug(f"SKIPPED {len(organizations)-inserted} organization resource(s)")
+
+
+def load_default_taxonomy(db: Session) -> None:
+    """Synchronous version: Seed the database with the default taxonomy resources."""
+    upsert_resource_types = list(DEFAULT_TAXONOMY.model_fields_set)
+    upsert_resource_types.remove("organization")
+
+    log.info("Loading the default fideslang taxonomy resources...")
+    for resource_type in upsert_resource_types:
+        sql_model = sql_model_map[resource_type]
+        log.debug(f"Processing {resource_type} resources...")
+        default_resources = DEFAULT_TAXONOMY.model_dump(mode="json")[resource_type]
+
+        try:
+            # Fetch existing keys first
+            existing_keys = {item[0] for item in db.query(sql_model.fides_key).all()}
+        except Exception as exc:
+            log.error(f"Error fetching existing keys for {resource_type}: {exc}")
+            continue  # Skip this resource type if we can't get existing keys
+
+        # Filter for resources that don't exist
+        resources_to_create = [
+            resource
+            for resource in default_resources
+            if resource["fides_key"] not in existing_keys
+        ]
+
+        if not resources_to_create:
+            log.debug(f"No new {resource_type} resources to add from default taxonomy.")
+            continue
+
+        created_count = 0
+        for resource_data in resources_to_create:
+            try:
+                sql_model.create_or_update(db=db, data=resource_data)
+                created_count += 1
+            except Exception:
+                pass
+
+        if created_count > 0:
+            log.debug(f"UPSERTED {created_count} {resource_type} resource(s)")

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/fides/api/schemas/connection_configuration/connection_secrets_google_cloud_sql_mysql.py

@@ -8,6 +8,9 @@ from fides.api.schemas.base_class import NoValidationSchema
 from fides.api.schemas.connection_configuration.connection_secrets import (
     ConnectionConfigSecretsSchema,
 )
+from fides.api.schemas.connection_configuration.enums.google_cloud_sql_ip_type import (
+    GoogleCloudSQLIPType,
+)
 
 
 class KeyfileCreds(BaseModel):
@@ -51,6 +54,11 @@ class GoogleCloudSQLMySQLSchema(ConnectionConfigSecretsSchema):
         json_schema_extra={"sensitive": True},
         description="The contents of the key file that contains authentication credentials for a service account in GCP.",
     )
+    ip_type: Optional[GoogleCloudSQLIPType] = Field(
+        default=None,
+        title="IP type",
+        description="Specify the IP Address type required for your database (defaults to public). See the Google Cloud documentation for more information about connection options: https://cloud.google.com/sql/docs/postgres/connect-overview",
+    )
 
     _required_components: ClassVar[List[str]] = [
         "db_iam_user",
@@ -66,6 +74,15 @@ class GoogleCloudSQLMySQLSchema(ConnectionConfigSecretsSchema):
             v = json.loads(v)
         return KeyfileCreds.model_validate(v)
 
+    @field_validator("ip_type", mode="before")
+    @classmethod
+    def empty_string_to_none(cls, v: Optional[str]) -> Optional[GoogleCloudSQLIPType]:
+        if v == "":
+            return None
+        if v is not None:
+            return GoogleCloudSQLIPType(v)
+        return v
+
 
 class GoogleCloudSQLMySQLDocsSchema(GoogleCloudSQLMySQLSchema, NoValidationSchema):
     """Google Cloud SQL MySQL Secrets Schema for API Docs"""

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/fides/api/schemas/connection_configuration/connection_secrets_google_cloud_sql_postgres.py

@@ -8,6 +8,9 @@ from fides.api.schemas.base_class import NoValidationSchema
 from fides.api.schemas.connection_configuration.connection_secrets import (
     ConnectionConfigSecretsSchema,
 )
+from fides.api.schemas.connection_configuration.enums.google_cloud_sql_ip_type import (
+    GoogleCloudSQLIPType,
+)
 
 
 class KeyfileCreds(BaseModel):
@@ -57,6 +60,11 @@ class GoogleCloudSQLPostgresSchema(ConnectionConfigSecretsSchema):
         json_schema_extra={"sensitive": True},
         description="The contents of the key file that contains authentication credentials for a service account in GCP.",
     )
+    ip_type: Optional[GoogleCloudSQLIPType] = Field(
+        default=None,
+        title="IP type",
+        description="Specify the IP Address type required for your database (defaults to public). See the Google Cloud documentation for more information about connection options: https://cloud.google.com/sql/docs/postgres/connect-overview",
+    )
 
     _required_components: ClassVar[List[str]] = [
         "db_iam_user",
@@ -71,6 +79,15 @@ class GoogleCloudSQLPostgresSchema(ConnectionConfigSecretsSchema):
             v = json.loads(v)
         return KeyfileCreds.model_validate(v)
 
+    @field_validator("ip_type", mode="before")
+    @classmethod
+    def empty_string_to_none(cls, v: Optional[str]) -> Optional[GoogleCloudSQLIPType]:
+        if v == "":
+            return None
+        if v is not None:
+            return GoogleCloudSQLIPType(v)
+        return v
+
 
 class GoogleCloudSQLPostgresDocsSchema(
     GoogleCloudSQLPostgresSchema, NoValidationSchema

ethyca_fides-2.60.1b0/src/fides/api/schemas/connection_configuration/enums/google_cloud_sql_ip_type.py

@@ -0,0 +1,9 @@
+from enum import Enum
+
+
+class GoogleCloudSQLIPType(str, Enum):
+    """Enum for Google Cloud SQL IP types"""
+
+    public = "public"
+    private = "private"
+    private_service_connect = "psc"

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/fides/api/service/connectors/google_cloud_mysql_connector.py

@@ -8,6 +8,9 @@ from sqlalchemy.engine import Engine, LegacyCursorResult, create_engine  # type:
 from fides.api.schemas.connection_configuration.connection_secrets_google_cloud_sql_mysql import (
     GoogleCloudSQLMySQLSchema,
 )
+from fides.api.schemas.connection_configuration.enums.google_cloud_sql_ip_type import (
+    GoogleCloudSQLIPType,
+)
 from fides.api.service.connectors.sql_connector import SQLConnector
 from fides.api.util.collection_util import Row
 from fides.config import get_config
@@ -37,6 +40,7 @@ class GoogleCloudSQLMySQLConnector(SQLConnector):
             conn: pymysql.connections.Connection = connector.connect(
                 config.instance_connection_name,
                 "pymysql",
+                ip_type=config.ip_type or GoogleCloudSQLIPType.public,
                 user=config.db_iam_user,
                 db=config.dbname,
                 enable_iam_auth=True,

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/fides/api/service/connectors/google_cloud_postgres_connector.py

@@ -16,6 +16,9 @@ from fides.api.graph.execution import ExecutionNode
 from fides.api.schemas.connection_configuration.connection_secrets_google_cloud_sql_postgres import (
     GoogleCloudSQLPostgresSchema,
 )
+from fides.api.schemas.connection_configuration.enums.google_cloud_sql_ip_type import (
+    GoogleCloudSQLIPType,
+)
 from fides.api.service.connectors.query_configs.google_cloud_postgres_query_config import (
     GoogleCloudSQLPostgresQueryConfig,
 )
@@ -53,6 +56,7 @@ class GoogleCloudSQLPostgresConnector(SQLConnector):
             conn: pg8000.dbapi.Connection = connector.connect(
                 config.instance_connection_name,
                 "pg8000",
+                ip_type=config.ip_type or GoogleCloudSQLIPType.public,
                 user=config.db_iam_user,
                 db=config.dbname or self.default_db_name,
                 enable_iam_auth=True,

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/fides/api/service/connectors/sql_connector.py

@@ -119,8 +119,8 @@ class SQLConnector(BaseConnector[Engine]):
             )
         except ClientResponseError as e:
             raise ConnectionException(f"Connection error: {e.message}")
-        except Exception:
-            raise ConnectionException("Connection error.")
+        except Exception as exc:
+            raise ConnectionException(f"Connection error: {exc}")
 
         return ConnectionTestStatus.succeeded
 

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/fides/api/util/data_category.py

@@ -26,6 +26,7 @@ def generate_fides_data_categories() -> Type[EnumType]:
     return FidesDataCategory
 
 
+# TODO: Move away from using this, it conflicts with the DataCategory model
 DataCategory = generate_fides_data_categories()
 
 

{ethyca_fides-2.60.0rc2 → ethyca_fides-2.60.1b0}/src/fides/ui-build/static/admin/404.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link data-next-font="" rel="preconnect" href="/" crossorigin="anonymous"/><link rel="preload" href="/_next/static/css/a063d3d67fe688f6.css" as="style"/><link rel="stylesheet" href="/_next/static/css/a063d3d67fe688f6.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-42372ed130431b0a.js"></script><script src="/_next/static/chunks/webpack-32c43a8d709ca5c6.js" defer=""></script><script src="/_next/static/chunks/framework-c92fc3344e6fd165.js" defer=""></script><script src="/_next/static/chunks/main-090643377c8254e6.js" defer=""></script><script src="/_next/static/chunks/pages/_app-854abc8128542e40.js" defer=""></script><script src="/_next/static/chunks/pages/404-73e79d3760ef2658.js" defer=""></script><script src="/_next/static/44eOp28jisdb1AR9L9B9m/_buildManifest.js" defer=""></script><script src="/_next/static/44eOp28jisdb1AR9L9B9m/_ssgManifest.js" defer=""></script><style>.data-ant-cssinjs-cache-path{content:"";}</style></head><body><div id="__next"><div style="height:100%;display:flex"></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/404","query":{},"buildId":"44eOp28jisdb1AR9L9B9m","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link data-next-font="" rel="preconnect" href="/" crossorigin="anonymous"/><link rel="preload" href="/_next/static/css/a063d3d67fe688f6.css" as="style"/><link rel="stylesheet" href="/_next/static/css/a063d3d67fe688f6.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-42372ed130431b0a.js"></script><script src="/_next/static/chunks/webpack-32c43a8d709ca5c6.js" defer=""></script><script src="/_next/static/chunks/framework-c92fc3344e6fd165.js" defer=""></script><script src="/_next/static/chunks/main-090643377c8254e6.js" defer=""></script><script src="/_next/static/chunks/pages/_app-854abc8128542e40.js" defer=""></script><script src="/_next/static/chunks/pages/404-73e79d3760ef2658.js" defer=""></script><script src="/_next/static/snXG8lXqPoT4hj3yvlEtk/_buildManifest.js" defer=""></script><script src="/_next/static/snXG8lXqPoT4hj3yvlEtk/_ssgManifest.js" defer=""></script><style>.data-ant-cssinjs-cache-path{content:"";}</style></head><body><div id="__next"><div style="height:100%;display:flex"></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/404","query":{},"buildId":"snXG8lXqPoT4hj3yvlEtk","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>