Skip to content

[Internal] Use resolved host type from host metadata in getHostType()#749

Open
tanmay-db wants to merge 13 commits intomainfrom
hosttype-resolved
Open

[Internal] Use resolved host type from host metadata in getHostType()#749
tanmay-db wants to merge 13 commits intomainfrom
hosttype-resolved

Conversation

@tanmay-db
Copy link
Copy Markdown
Contributor

@tanmay-db tanmay-db commented Mar 30, 2026 •
edited
Loading

🥞 Stacked PR

Use this link to review incremental changes.

Changes

Uses the resolved host type from host metadata as the primary source in getHostType(), falling back to URL pattern matching:

  • Modifies getHostType() to return resolvedHostType when available (set during resolveHostMetadata() from PR [Internal] Add HostType to HostMetadata #747)
  • URL-based pattern matching (accounts. prefix → ACCOUNTS, otherwise → WORKSPACE) is now only used as a fallback when host metadata hasn't been resolved
    yet
  • Makes DatabricksConfigTest and UnifiedHostTest hermetic using FixtureServer

getHostType() priority chain:

  1. resolvedHostType from /.well-known/databricks-config host metadata (highest)
  2. URL pattern matching — accounts. / accounts-dod. prefix → ACCOUNTS (fallback)
  3. Default → WORKSPACE

Tests

  • DatabricksConfigTest: tests for getHostType() returning resolvedHostType when set, including UNIFIED host type
  • UnifiedHostTest: tests for unified host behavior — workspace ID from environment variables, correct host type resolution, hermetic with FixtureServer

@tanmay-db
Add HostType to HostMetadata
c879465 
Signed-off-by: Tanmay Rustagi <tanmay.rustagi@databricks.com>
@tanmay-db tanmay-db temporarily deployed to test-trigger-is March 30, 2026 15:10 — with GitHub Actions Inactive
@tanmay-db tanmay-db temporarily deployed to test-trigger-is March 30, 2026 15:10 — with GitHub Actions Inactive
This was referenced Mar 30, 2026
Open
Open
@tanmay-db tanmay-db changed the title Hosttype resolved [Internal] Use resolved host type from host metadata in getHostType() Mar 30, 2026
@tanmay-db
Regenerate lockfile for commons-configuration2 2.13.0
2aec9e4 
Signed-off-by: Tanmay Rustagi <tanmay.rustagi@databricks.com>
@tanmay-db tanmay-db temporarily deployed to test-trigger-is March 30, 2026 16:42 — with GitHub Actions Inactive
@tanmay-db tanmay-db temporarily deployed to test-trigger-is March 30, 2026 16:44 — with GitHub Actions Inactive
@tanmay-db
Revert lockfile.json to main state
dff706f 
Signed-off-by: Tanmay Rustagi <tanmay.rustagi@databricks.com>
@tanmay-db
Resolve TokenAudience from default_oidc_audience in host metadata
acb210f 
Signed-off-by: Tanmay Rustagi <tanmay.rustagi@databricks.com>
@tanmay-db
Use resolved host type from host metadata in getHostType()
6b1ed72 
Signed-off-by: Tanmay Rustagi <tanmay.rustagi@databricks.com>
@tanmay-db tanmay-db temporarily deployed to test-trigger-is March 30, 2026 17:00 — with GitHub Actions Inactive
@tanmay-db tanmay-db temporarily deployed to test-trigger-is March 30, 2026 17:02 — with GitHub Actions Inactive
@tanmay-db
Merge branch 'main' into hosttype-resolved
40b3250 
# Conflicts:
#	databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java
#	databricks-sdk-java/src/main/java/com/databricks/sdk/core/HostType.java
#	databricks-sdk-java/src/test/java/com/databricks/sdk/core/UnifiedHostTest.java
@tanmay-db
Fix test failures: fixture double-consumption, experimental flag, imp…
c1dadf7 
…orts

DatabricksConfigTest.java:
- Add second fixture for tests calling both resolve() and
  resolveHostMetadata(), since resolve() internally calls
  tryResolveHostMetadata() consuming the first fixture.
- Replace setExperimentalIsUnifiedHost(true) with host_type in
  metadata response, since PR #720 removed the experimental flag
  check from getHostType().

UnifiedHostTest.java:
- Add missing java.io.IOException import.
- Remove 3 broken header injection tests that asserted
  X-Databricks-Org-Id in authenticate() headers — that header is
  injected at the service impl level, not during authentication.
- Remove stale setExperimentalIsUnifiedHost(true) from remaining
  tests (no-op after PR #720).
- Update javadoc to reflect re-introduced UNIFIED host type.
@tanmay-db
Remove redundant resolveHostMetadata() calls, use host_type metadata
6dfbf98 
- Remove redundant explicit resolveHostMetadata() calls since
  resolve() already triggers it internally via tryResolveHostMetadata().
  Revert to single fixtures where the second call was removed.
- Keep double fixture only for testResolveHostMetadataDoesNotOverwriteExistingHostType
  which genuinely needs a second resolveHostMetadata() call.
- Use host_type in metadata response instead of experimentalIsUnifiedHost
  flag (removed by PR #720) to make getClientType() return ACCOUNT.
@tanmay-db
Make tests hermetic by using FixtureServer instead of real hostnames
91389f1 
- testWorkspaceIdFromEnvironmentVariables: use FixtureServer URL
  instead of https://mycompany.databricks.com to avoid hitting
  real /.well-known/databricks-config during resolve().
- testNewWithWorkspaceHost: use FixtureServer URL as workspace host
  instead of https://workspace.cloud.databricks.com.
- Remove unnecessary second fixture from testEndToEndResolveToGetHostType.
@tanmay-db
Make AccountClientTest.testGetWorkspaceClientForUnifiedHost hermetic …
29fa190 
…with FixtureServer

Replace real unified.databricks.com hostname with FixtureServer to prevent
host metadata resolution from hitting live servers during tests.

Co-authored-by: Isaac
tanmay-db added a commit that referenced this pull request Apr 11, 2026
@tanmay-db
Remove account fallback test that requires resolvedHostType in getHos…
27c3239 
…tType()

testResolveHostMetadataFallsBackToAccountIdWhenNoDefaultOidcAudience
relies on resolvedHostType influencing getHostType(), which is only
implemented in PR #749 (hosttype-resolved branch). Moved to that branch.
@tanmay-db tanmay-db temporarily deployed to test-trigger-is April 11, 2026 11:46 — with GitHub Actions Inactive
@tanmay-db tanmay-db temporarily deployed to test-trigger-is April 11, 2026 12:11 — with GitHub Actions Inactive
@tanmay-db
Rename default_oidc_audience to token_federation_default_oidc_audiences
43d53f1 
Update HostMetadata field from single string to List<String> to match
the actual API response format. DatabricksConfig picks the first element
from the list when setting tokenAudience.

Co-authored-by: Isaac
@tanmay-db tanmay-db temporarily deployed to test-trigger-is April 13, 2026 11:01 — with GitHub Actions Inactive
@tanmay-db tanmay-db temporarily deployed to test-trigger-is April 13, 2026 13:05 — with GitHub Actions Inactive
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 13, 2026

If integration tests don't run automatically, an authorized user can run them manually by following the instructions below:

Trigger:
go/deco-tests-run/sdk-java

Inputs:

  • PR number: 749
  • Commit SHA: 613e7629bd70ac238d8343e3b0e08adae72a41bd

Checks will be approved automatically on success.

@tanmay-db tanmay-db marked this pull request as ready for review April 13, 2026 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@tanmay-db