fdc-shared-kernel 0.0.192__tar.gz → 0.0.194__tar.gz

{fdc_shared_kernel-0.0.192 → fdc_shared_kernel-0.0.194}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.192
+Version: 0.0.194
 Summary: Shared library for microservice
 Author-email: Shikhil S <shikhil.s@dbizsolution.com>, Ahammed Akdham N <ahammedakdham.n@dbizsolution.com>
 Classifier: Programming Language :: Python :: 3

{fdc_shared_kernel-0.0.192 → fdc_shared_kernel-0.0.194}/fdc_shared_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.192
+Version: 0.0.194
 Summary: Shared library for microservice
 Author-email: Shikhil S <shikhil.s@dbizsolution.com>, Ahammed Akdham N <ahammedakdham.n@dbizsolution.com>
 Classifier: Programming Language :: Python :: 3

{fdc_shared_kernel-0.0.192 → fdc_shared_kernel-0.0.194}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fdc_shared_kernel"
-version = "0.0.192"
+version = "0.0.194"
 requires-python = ">=3.7"
 readme = "README_pypi.md"
 description = "Shared library for microservice"

{fdc_shared_kernel-0.0.192 → fdc_shared_kernel-0.0.194}/shared_kernel/data_warehouse_handlers/connections/fabric_sql_warehouse_connection.py

@@ -1,10 +1,13 @@
 import hashlib
+import re
+import struct
 import time
 import threading
 
 from contextlib import contextmanager
 from typing import Dict
 
+from azure.identity import ClientSecretCredential
 from sqlalchemy import create_engine, text
 from sqlalchemy.engine import Engine
 from sqlalchemy.exc import InterfaceError, OperationalError, ProgrammingError
@@ -44,8 +47,11 @@ class FabricSQLWarehouseConnection(DataWarehouseConnection):
         self.search = pagination.get("search") if isinstance(pagination, dict) else None
 
     def _engine_key(self, cfg: FabricSQLConfig) -> str:
-        h = hashlib.md5(f"{cfg.host}:{cfg.port}:{cfg.database}:{cfg.username}".encode()).hexdigest()
-        return h
+        # All five credential fields are part of the key so that any change to any of them
+        # forces a new engine + fresh token request (no stale-cache bypass).
+        # Password is SHA-256 hashed so the raw secret is never stored in a dict key.
+        pwd_hash = hashlib.sha256(cfg.password.encode()).hexdigest()
+        return f"{cfg.host}|{cfg.port}|{cfg.database}|{cfg.username}|{cfg.tenant_id}|{pwd_hash}"
 
     def _get_fabric_connection_params(self, cfg: FabricSQLConfig) -> str:
         """
@@ -82,9 +88,9 @@ class FabricSQLWarehouseConnection(DataWarehouseConnection):
 
                     engine = create_engine(
                         connection_string,
-                        pool_size=10,
+                        pool_size=50,
                         max_overflow=5,
-                        pool_timeout=30,
+                        pool_timeout=60,
                         pool_recycle=1800,
                         pool_pre_ping=True,
                     )
@@ -118,22 +124,50 @@ class FabricSQLWarehouseConnection(DataWarehouseConnection):
                                 if token_info["token"] is None or now >= token_info["expires_at"] - 300:
                                     tenant_id = getattr(cfg, "tenant_id", None)
                                     if not tenant_id:
-                                        raise ValueError(
-                                            "tenant_id is required in FabricSQLConfig for authenticating to Microsoft Fabric via Active Directory Service Principal."
+                                        raise BadRequest(
+                                            "tenant_id is required in FabricSQLConfig for authenticating "
+                                            "to Microsoft Fabric via Active Directory Service Principal."
                                         )
-                                    
-                                    from azure.identity import ClientSecretCredential
-                                    import struct
-                                    
-                                    logger.info("Fetching fresh Entra ID access token for Fabric SQL connection...")
-                                    # Instantiate the credential to retrieve a token for the Azure SQL Endpoint
-                                    cred = ClientSecretCredential(
-                                        tenant_id=tenant_id,
-                                        client_id=cfg.username,
-                                        client_secret=cfg.password
+
+                                    # Validate that tenant_id looks like a UUID or a domain name.
+                                    # A truncated/malformed UUID (e.g. 'a815263-...' instead of '1a815263-...')
+                                    # causes a cryptic MSAL authority error — catch it here with a clear message.
+                                    _TENANT_UUID = re.compile(
+                                        r"^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
                                     )
-                                    token_obj = cred.get_token("https://database.windows.net/.default")
-                                    
+                                    _TENANT_DOMAIN = re.compile(r"^[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$")
+                                    if not (_TENANT_UUID.match(tenant_id) or _TENANT_DOMAIN.match(tenant_id)):
+                                        raise BadRequest(
+                                            f"Invalid fabric SQL warehouse tenant_id '{tenant_id}'"
+                                        )
+
+                                    # --- Secure diagnostic logging (never logs the full secret) ---
+                                    _secret = cfg.password or ""
+                                    _masked = (
+                                        f"{_secret[:3]}...{_secret[-3:]}" if len(_secret) > 6 else "***"
+                                    )
+                                    logger.info(
+                                        f"Fetching Entra ID token | tenant_id={tenant_id} "
+                                        f"| client_id={cfg.username} "
+                                        f"| secret_len={len(_secret)} "
+                                        f"| secret_preview={_masked}"
+                                    )
+
+                                    try:
+                                        cred = ClientSecretCredential(
+                                            tenant_id=tenant_id,
+                                            client_id=cfg.username,
+                                            client_secret=cfg.password
+                                        )
+                                        token_obj = cred.get_token("https://database.windows.net/.default")
+                                        logger.info(f"Entra ID token acquired via tenant_id={tenant_id}")
+                                    except Exception as auth_err:
+                                        raise BadRequest(
+                                            f"Authentication failed for tenant_id: {auth_err}. "
+                                            "Verify that tenant_id, client_id (user), and client_secret (password) "
+                                            "are all correct and the App Registration has not expired."
+                                        ) from auth_err
+
                                     # Encode the OAuth token to UTF-16-LE bytes.
                                     # Pack the payload into the binary structure required by ODBC Driver 18:
                                     # [4 bytes representing the length of the token string] followed by [the token string bytes].