From a7d9fefc23d0309a6c234b1bed961df277272bf6 Mon Sep 17 00:00:00 2001 From: Hector Castejon Diaz Date: Wed, 4 Feb 2026 13:02:42 +0000 Subject: [PATCH 1/3] tests --- .../src/main/java/com/databricks/sdk/core/ApiClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ApiClient.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ApiClient.java index 6507d1eb6..6f727dbab 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ApiClient.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ApiClient.java @@ -52,7 +52,7 @@ public Builder withDatabricksConfig(DatabricksConfig config) { this.getAuthTypeFunc = v -> config.getAuthType(); this.httpClient = config.getHttpClient(); this.debugTruncateBytes = config.getDebugTruncateBytes(); - this.accountId = config.getAccountId(); + this.accountId = config.getAccountId(); this.workspaceId = config.getWorkspaceId(); this.isDebugHeaders = config.isDebugHeaders(); From 3d2076d1bca05f4f4b4ff5e13435084e59a19f79 Mon Sep 17 00:00:00 2001 From: Hector Castejon Diaz Date: Wed, 4 Feb 2026 13:36:14 +0000 Subject: [PATCH 2/3] done --- .../com/databricks/sdk/core/ApiClient.java | 2 +- .../databricks/sdk/core/DatabricksConfig.java | 21 ++++--------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ApiClient.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ApiClient.java index 6f727dbab..6507d1eb6 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ApiClient.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/ApiClient.java @@ -52,7 +52,7 @@ public Builder withDatabricksConfig(DatabricksConfig config) { this.getAuthTypeFunc = v -> config.getAuthType(); this.httpClient = config.getHttpClient(); this.debugTruncateBytes = config.getDebugTruncateBytes(); - this.accountId = config.getAccountId(); + this.accountId = config.getAccountId(); this.workspaceId = config.getWorkspaceId(); this.isDebugHeaders = config.isDebugHeaders(); diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java index 8388c218e..918152393 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java @@ -249,11 +249,6 @@ public synchronized Map authenticate() throws DatabricksExceptio } Map headers = new HashMap<>(headerFactory.headers()); - // For unified hosts with workspace operations, add the X-Databricks-Org-Id header - if (getHostType() == HostType.UNIFIED && workspaceId != null && !workspaceId.isEmpty()) { - headers.put("X-Databricks-Org-Id", workspaceId); - } - return headers; } catch (DatabricksException e) { String msg = String.format("%s auth: %s", credentialsProvider.authType(), e.getMessage()); @@ -487,17 +482,13 @@ public DatabricksConfig setAzureUseMsi(boolean azureUseMsi) { return this; } - /** - * @deprecated Use {@link #getAzureUseMsi()} instead. - */ + /** @deprecated Use {@link #getAzureUseMsi()} instead. */ @Deprecated() public boolean getAzureUseMSI() { return azureUseMsi; } - /** - * @deprecated Use {@link #getAzureUseMsi()} instead. - */ + /** @deprecated Use {@link #getAzureUseMsi()} instead. */ @Deprecated public DatabricksConfig setAzureUseMSI(boolean azureUseMsi) { this.azureUseMsi = azureUseMsi; @@ -772,9 +763,7 @@ public OpenIDConnectEndpoints getOidcEndpoints() throws IOException { return getDatabricksOidcEndpoints(); } - /** - * @return The Azure Entra ID OIDC endpoints. - */ + /** @return The Azure Entra ID OIDC endpoints. */ public OpenIDConnectEndpoints getAzureEntraIdWorkspaceEndpoints() throws IOException { if (isAzure() && getAzureClientId() != null) { Request request = new Request("GET", getHost() + "/oidc/oauth2/v2.0/authorize"); @@ -790,9 +779,7 @@ public OpenIDConnectEndpoints getAzureEntraIdWorkspaceEndpoints() throws IOExcep return null; } - /** - * @return The Databricks OIDC endpoints. - */ + /** @return The Databricks OIDC endpoints. */ public OpenIDConnectEndpoints getDatabricksOidcEndpoints() throws IOException { if (discoveryUrl == null) { return fetchDefaultOidcEndpoints(); From 1dd0775084105b3deab3302acced5cee8a79da47 Mon Sep 17 00:00:00 2001 From: Hector Castejon Diaz Date: Wed, 4 Feb 2026 16:13:48 +0000 Subject: [PATCH 3/3] changelog --- NEXT_CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md index b3e7f4e86..b21d4bf90 100644 --- a/NEXT_CHANGELOG.md +++ b/NEXT_CHANGELOG.md @@ -3,6 +3,7 @@ ## Release v0.94.0 ### New Features and Improvements +* Add support for single Profile for Account and Workspace operations in Unified Mode. ### Bug Fixes