feat(fabric): update connection configuration for Fabric adapter

Author: mattiasthalen

sqlmesh/core/config/connection.py

@@ -1708,12 +1708,9 @@ class FabricConnectionConfig(MSSQLConnectionConfig):
     DISPLAY_NAME: t.ClassVar[t.Literal["Fabric"]] = "Fabric"  # type: ignore
     DISPLAY_ORDER: t.ClassVar[t.Literal[17]] = 17  # type: ignore
     driver: t.Literal["pyodbc"] = "pyodbc"
+    workspace: str
+    tenant: str
     autocommit: t.Optional[bool] = True
-    workspace_id: t.Optional[str] = None
-    # Service Principal authentication for Fabric REST API
-    tenant_id: t.Optional[str] = None
-    client_id: t.Optional[str] = None
-    client_secret: t.Optional[str] = None
 
     @property
     def _engine_adapter(self) -> t.Type[EngineAdapter]:
@@ -1725,7 +1722,7 @@ def _engine_adapter(self) -> t.Type[EngineAdapter]:
     def _extra_engine_config(self) -> t.Dict[str, t.Any]:
         return {
             "database": self.database,
-            "catalog_support": CatalogSupport.REQUIRES_SET_CATALOG,
+            "catalog_support": CatalogSupport.FULL_SUPPORT,
         }
 
 

sqlmesh/core/engine_adapter/fabric.py

@@ -57,9 +57,9 @@ def _insert_overwrite_by_condition(
 
     def _get_access_token(self) -> str:
         """Get access token using Service Principal authentication."""
-        tenant_id = self._extra_config.get("tenant_id")
-        client_id = self._extra_config.get("client_id")
-        client_secret = self._extra_config.get("client_secret")
+        tenant_id = self._extra_config.get("tenant")
+        client_id = self._extra_config.get("user")
+        client_secret = self._extra_config.get("password")
 
         if not all([tenant_id, client_id, client_secret]):
             raise SQLMeshError(
@@ -102,14 +102,14 @@ def _make_fabric_api_request(
         if not requests:
             raise SQLMeshError("requests library is required for Fabric catalog operations")
 
-        workspace_id = self._extra_config.get("workspace_id")
-        if not workspace_id:
+        workspace = self._extra_config.get("workspace")
+        if not workspace:
             raise SQLMeshError(
-                "workspace_id parameter is required in connection config for Fabric catalog operations"
+                "workspace parameter is required in connection config for Fabric catalog operations"
             )
 
         base_url = "https://api.fabric.microsoft.com/v1"
-        url = f"{base_url}/workspaces/{workspace_id}/{endpoint}"
+        url = f"{base_url}/workspaces/{workspace}/{endpoint}"
 
         headers = self._get_fabric_auth_headers()
 

tests/core/engine_adapter/integration/config.yaml

@@ -192,10 +192,12 @@ gateways:
       driver: pyodbc
       host: {{ env_var("FABRIC_HOST") }}
       user: {{ env_var("FABRIC_CLIENT_ID") }}
-      password: {{ env_var("FABRIC_CLIENT_SECRET") }}    
+      password: {{ env_var("FABRIC_CLIENT_SECRET") }}
       database: {{ env_var("FABRIC_DATABASE") }}
+      tenant: {{ env_var("FABRIC_TENANT") }}
+      workspace: {{ env_var("FABRIC_WORKSPACE") }}
       odbc_properties:
-        Authentication: ActiveDirectoryServicePrincipal        
+        Authentication: ActiveDirectoryServicePrincipal
     state_connection:
       type: duckdb