fix(fabric): Update docs and add id to parameter names

Author: mattiasthalen

docs/integrations/engines/fabric.md

@@ -29,6 +29,6 @@ pip install "sqlmesh[fabric]"
 | `autocommit`      | Is autocommit mode enabled. Default: false                   |     bool     |    N     |
 | `driver`          | The driver to use for the connection. Default: pyodbc            |    string    |    N     |
 | `driver_name`     | The driver name to use for the connection. E.g., *ODBC Driver 18 for SQL Server* |    string    |    N     |
-| `tenant`          | The Fabric tenant UUID                             |    string    |    Y     |
-| `workspace`       | The Fabric workspace UUID                             |    string    |    Y     |
+| `tenant_id`          | The Azure / Entra tenant UUID                             |    string    |    Y     |
+| `workspace_id`       | The Fabric workspace UUID. The preferred way to retrieve it is by running `notebookutils.runtime.context.get("currentWorkspaceId")` in a python notebook.                             |    string    |    Y     |
 | `odbc_properties` | The dict of ODBC connection properties. E.g., authentication: ActiveDirectoryServicePrincipal. See more [here](https://learn.microsoft.com/en-us/sql/connect/odbc/dsn-connection-string-attribute?view=sql-server-ver16). | dict |    N     |

sqlmesh/core/config/connection.py

@@ -1708,8 +1708,8 @@ 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
+    workspace_id: str
+    tenant_id: str
     autocommit: t.Optional[bool] = True
 
     @property
@@ -1723,8 +1723,8 @@ def _extra_engine_config(self) -> t.Dict[str, t.Any]:
         return {
             "database": self.database,
             "catalog_support": CatalogSupport.FULL_SUPPORT,
-            "workspace": self.workspace,
-            "tenant": self.tenant,
+            "workspace_id": self.workspace_id,
+            "tenant_id": self.tenant_id,
             "user": self.user,
             "password": self.password,
         }

sqlmesh/core/engine_adapter/fabric.py

@@ -82,7 +82,7 @@ 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")
+        tenant_id = self._extra_config.get("tenant_id")
         client_id = self._extra_config.get("user")
         client_secret = self._extra_config.get("password")
 
@@ -127,14 +127,14 @@ def _make_fabric_api_request(
         if not requests:
             raise SQLMeshError("requests library is required for Fabric catalog operations")
 
-        workspace = self._extra_config.get("workspace")
-        if not workspace:
+        workspace_id = self._extra_config.get("workspace_id")
+        if not workspace_id:
             raise SQLMeshError(
-                "workspace parameter is required in connection config for Fabric catalog operations"
+                "workspace_id parameter is required in connection config for Fabric catalog operations"
             )
 
         base_url = "https://api.fabric.microsoft.com/v1"
-        url = f"{base_url}/workspaces/{workspace}/{endpoint}"
+        url = f"{base_url}/workspaces/{workspace_id}/{endpoint}"
 
         headers = self._get_fabric_auth_headers()
 
@@ -177,14 +177,14 @@ def _make_fabric_api_request_with_location(
         if not requests:
             raise SQLMeshError("requests library is required for Fabric catalog operations")
 
-        workspace = self._extra_config.get("workspace")
-        if not workspace:
+        workspace_id = self._extra_config.get("workspace_id")
+        if not workspace_id:
             raise SQLMeshError(
-                "workspace parameter is required in connection config for Fabric catalog operations"
+                "workspace_id parameter is required in connection config for Fabric catalog operations"
             )
 
         base_url = "https://api.fabric.microsoft.com/v1"
-        url = f"{base_url}/workspaces/{workspace}/{endpoint}"
+        url = f"{base_url}/workspaces/{workspace_id}/{endpoint}"
         headers = self._get_fabric_auth_headers()
 
         try:
@@ -445,10 +445,7 @@ def _ensure_schema_exists(self, table_name: TableName) -> None:
             catalog_name = table.catalog
 
             # Build the full schema name
-            if catalog_name:
-                full_schema_name = f"{catalog_name}.{schema_name}"
-            else:
-                full_schema_name = schema_name
+            full_schema_name = f"{catalog_name}.{schema_name}" if catalog_name else schema_name
 
             logger.debug(f"Ensuring schema exists: {full_schema_name}")
 

tests/core/engine_adapter/integration/config.yaml

@@ -194,8 +194,8 @@ gateways:
       user: {{ env_var("FABRIC_CLIENT_ID") }}
       password: {{ env_var("FABRIC_CLIENT_SECRET") }}
       database: {{ env_var("FABRIC_DATABASE") }}
-      tenant: {{ env_var("FABRIC_TENANT") }}
-      workspace: {{ env_var("FABRIC_WORKSPACE") }}
+      tenant_id: {{ env_var("FABRIC_TENANT_ID") }}
+      workspace_id: {{ env_var("FABRIC_WORKSPACE_ID") }}
       odbc_properties:
         Authentication: ActiveDirectoryServicePrincipal
     state_connection: