Skip to content

Enable support for a single Profile to use both Account and Workspace endpoints #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hectorcast-db wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Enable support for a single Profile to use both Account and Workspace endpoints #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7d9fef
tests
hectorcast-db Feb 4, 2026
3d2076d
done
hectorcast-db Feb 4, 2026
1dd0775
changelog
hectorcast-db Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEXT_CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
21 changes: 4 additions & 17 deletions databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,11 +249,6 @@ public synchronized Map<String, String> authenticate() throws DatabricksExceptio
}
Map<String, String> 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());
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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");
Expand All @@ -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();
Expand Down
Loading