Skip to content

Sync Azure environment resolution logic with Go SDK #667

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 2 commits into
base: main
Choose a base branch
from
+8 −8
Open

Sync Azure environment resolution logic with Go SDK #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc7cc7d
sync logic with go
hectorcast-db Feb 17, 2026
ccb19fa
changelog
hectorcast-db Feb 17, 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
2 changes: 2 additions & 0 deletions NEXT_CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

### Bug Fixes

* Fixed inconsistent Azure environment resolution between `getAzureEnvironment()` and `getDatabricksEnvironment()` methods ([#XXX](https://github.com/databricks/databricks-sdk-java/pull/XXX))

### Security Vulnerabilities

### Documentation
Expand Down
13 changes: 5 additions & 8 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 @@ -532,11 +532,7 @@ public DatabricksConfig setAzureTenantId(String azureTenantId) {
}

public AzureEnvironment getAzureEnvironment() {
String env = "PUBLIC";
if (azureEnvironment != null) {
env = azureEnvironment;
}
return AzureEnvironment.getEnvironment(env);
return getDatabricksEnvironment().getAzureEnvironment();
}

public DatabricksConfig setAzureEnvironment(String azureEnvironment) {
Expand Down Expand Up @@ -871,10 +867,11 @@ public DatabricksEnvironment getDatabricksEnvironment() {
return this.databricksEnvironment;
}

if (this.host == null && this.azureWorkspaceResourceId != null) {
if ((this.host == null || this.azureEnvironment != null)
&& this.azureWorkspaceResourceId != null) {
String azureEnv = "PUBLIC";
if (this.azureEnvironment != null) {
azureEnv = this.azureEnvironment;
if (this.azureEnvironment != null && !this.azureEnvironment.isEmpty()) {
azureEnv = this.azureEnvironment.toUpperCase();
}
for (DatabricksEnvironment env : DatabricksEnvironment.ALL_ENVIRONMENTS) {
if (env.getCloud() != Cloud.AZURE) {
Expand Down
1 change: 1 addition & 0 deletions databricks-sdk-java/src/test/java/com/databricks/sdk/DatabricksAuthManualTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ void azureCliUserWithManagementAccess() {
createConfigWithMockClient()
.setAuthType("azure-cli")
.setHost("https://x")
.setAzureEnvironment("PUBLIC")
.setAzureWorkspaceResourceId(azureWorkspaceResourceId);
resolveConfig(config, env);
Map<String, String> headers = config.authenticate();
Expand Down
Loading