Remove unified flag usage, rely on host metadata

Port of Python SDK PR #1331. HostType() no longer returns UnifiedHost;
host type is determined solely by URL pattern. EnsureResolved() now
always resolves host metadata when a host is configured (not gated
behind Experimental_IsUnifiedHost). IsAccountClient() no longer panics
on unified hosts. ConfigType() returns WorkspaceConfig for account
hosts with WorkspaceID. buildHostCommand() no longer has a UnifiedHost
case. getOidcEndpoints() and getOAuthArgument() remove UnifiedHost
cases, relying on DiscoveryURL from metadata.

The Experimental_IsUnifiedHost field and UnifiedHost const remain in
the codebase for backward compatibility but are no longer checked.

Note: codegen templates in service/ files still check for UnifiedHost
and need to be updated in the codegen repo to use cfg.WorkspaceID
directly.

Co-authored-by: Isaac

Author: hectorcast-db

account_functions.go

@@ -63,10 +63,6 @@ func (c *AccountClient) GetWorkspaceClient(ws provisioning.Workspace) (*Workspac
 	}
 	cfg.AzureResourceID = ws.AzureResourceId()
 	cfg.WorkspaceID = fmt.Sprintf("%d", ws.WorkspaceId)
-	if c.Config.Experimental_IsUnifiedHost {
-		cfg.AccountID = c.Config.AccountID
-		cfg.Experimental_IsUnifiedHost = true
-	}
 	w, err := NewWorkspaceClient((*Config)(cfg))
 	if err != nil {
 		return nil, err

config/auth_oidc_test.go

@@ -74,6 +74,9 @@ func TestGithubOIDC_Scopes(t *testing.T) {
 						"expires_in":   3600,
 					})
 
+				case "/.well-known/databricks-config":
+					http.Error(w, "Not found", http.StatusNotFound)
+
 				default:
 					t.Errorf("Unexpected request: %s %s", r.Method, r.URL.Path)
 					http.Error(w, "Not found", http.StatusNotFound)

config/cli_token_source.go

@@ -70,14 +70,6 @@ func buildCliCommands(cliPath string, cfg *Config) (primaryCmd []string, hostCmd
 func buildHostCommand(cliPath string, cfg *Config) []string {
 	cmd := []string{cliPath, "auth", "token", "--host", cfg.Host}
 	switch cfg.HostType() {
-	case UnifiedHost:
-		cmd = append(cmd, "--experimental-is-unified-host")
-		if cfg.AccountID != "" {
-			cmd = append(cmd, "--account-id", cfg.AccountID)
-		}
-		if cfg.WorkspaceID != "" {
-			cmd = append(cmd, "--workspace-id", cfg.WorkspaceID)
-		}
 	case AccountHost:
 		cmd = append(cmd, "--account-id", cfg.AccountID)
 	}

config/cli_token_source_test.go

@@ -152,50 +152,14 @@ func TestBuildCliCommands(t *testing.T) {
 			wantCmd: []string{cliPath, "auth", "token", "--host", accountHost, "--account-id", accountID},
 		},
 		{
-			name: "unified host with account ID and workspace ID",
+			name: "former unified host treated as workspace",
 			cfg: &Config{
 				Host:                       unifiedHost,
 				Experimental_IsUnifiedHost: true,
 				AccountID:                  accountID,
 				WorkspaceID:                workspaceID,
 			},
-			wantCmd: []string{cliPath, "auth", "token", "--host", unifiedHost, "--experimental-is-unified-host", "--account-id", accountID, "--workspace-id", workspaceID},
-		},
-		{
-			name: "unified host with account ID only",
-			cfg: &Config{
-				Host:                       unifiedHost,
-				Experimental_IsUnifiedHost: true,
-				AccountID:                  accountID,
-			},
-			wantCmd: []string{cliPath, "auth", "token", "--host", unifiedHost, "--experimental-is-unified-host", "--account-id", accountID},
-		},
-		{
-			name: "unified host with workspace ID only",
-			cfg: &Config{
-				Host:                       unifiedHost,
-				Experimental_IsUnifiedHost: true,
-				WorkspaceID:                workspaceID,
-			},
-			wantCmd: []string{cliPath, "auth", "token", "--host", unifiedHost, "--experimental-is-unified-host", "--workspace-id", workspaceID},
-		},
-		{
-			name: "unified host with no account ID or workspace ID",
-			cfg: &Config{
-				Host:                       unifiedHost,
-				Experimental_IsUnifiedHost: true,
-			},
-			wantCmd: []string{cliPath, "auth", "token", "--host", unifiedHost, "--experimental-is-unified-host"},
-		},
-		{
-			// Explicit false should fall back to the standard host type detection
-			name: "unified host false with account host",
-			cfg: &Config{
-				Host:                       accountHost,
-				Experimental_IsUnifiedHost: false,
-				AccountID:                  accountID,
-			},
-			wantCmd: []string{cliPath, "auth", "token", "--host", accountHost, "--account-id", accountID},
+			wantCmd: []string{cliPath, "auth", "token", "--host", unifiedHost},
 		},
 		{
 			name:        "profile uses --profile with --host fallback",

config/config.go

@@ -379,14 +379,9 @@ func (c *Config) IsAws() bool {
 }
 
 // IsAccountClient returns true if client is configured for Accounts API.
-// Panics if the config has the unified host flag set.
 //
 // Deprecated: Use HostType() if possible, or ConfigType() if necessary.
 func (c *Config) IsAccountClient() bool {
-	if c.Experimental_IsUnifiedHost {
-		panic("IsAccountClient cannot be used with unified hosts; use HostType() instead")
-	}
-
 	if c.AccountID != "" && c.isTesting {
 		return true
 	}
@@ -413,11 +408,9 @@ func normalizedHost(host string) string {
 }
 
 // HostType returns the type of host that the client is configured for.
+// HostType now only returns WorkspaceHost or AccountHost. UnifiedHost is
+// deprecated; host metadata resolution handles unified host behavior.
 func (c *Config) HostType() HostType {
-	if c.Experimental_IsUnifiedHost {
-		return UnifiedHost
-	}
-
 	// TODO: Refactor tests so that this is not needed.
 	if c.AccountID != "" && c.isTesting {
 		return AccountHost
@@ -449,18 +442,12 @@ func (c *Config) HostType() HostType {
 func (c *Config) ConfigType() ConfigType {
 	switch c.HostType() {
 	case AccountHost:
-		return AccountConfig
-	case WorkspaceHost:
-		return WorkspaceConfig
-	case UnifiedHost:
-		if c.AccountID == "" {
-			// All unified host configs must have an account ID
-			return InvalidConfig
-		}
 		if c.WorkspaceID != "" {
 			return WorkspaceConfig
 		}
 		return AccountConfig
+	case WorkspaceHost:
+		return WorkspaceConfig
 	default:
 		return InvalidConfig
 	}
@@ -520,13 +507,14 @@ func (c *Config) EnsureResolved() error {
 	}
 	slices.Sort(c.Scopes)
 	c.Scopes = slices.Compact(c.Scopes)
-	if c.Experimental_IsUnifiedHost && c.Host != "" {
-		_ = c.fixHostIfNeeded()
-		meta, err := getHostMetadata(ctx, c.CanonicalHostName(), c.refreshClient)
-		if err != nil {
-			logger.Warnf(ctx, "Failed to resolve host metadata: %v. Falling back to user config.", err)
-		} else {
-			c.applyHostMetadata(ctx, meta)
+	if c.Host != "" {
+		if err := c.fixHostIfNeeded(); err == nil {
+			meta, err := getHostMetadata(ctx, c.CanonicalHostName(), c.refreshClient)
+			if err != nil {
+				logger.Warnf(ctx, "Failed to resolve host metadata: %v. Falling back to user config.", err)
+			} else {
+				c.applyHostMetadata(ctx, meta)
+			}
 		}
 	}
 	c.resolved = true
@@ -659,8 +647,6 @@ func (c *Config) getOidcEndpoints(ctx context.Context) (*u2m.OAuthAuthorizationS
 	switch c.HostType() {
 	case AccountHost:
 		return oauthClient.GetAccountOAuthEndpoints(ctx, host, c.AccountID)
-	case UnifiedHost:
-		return oauthClient.GetUnifiedOAuthEndpoints(ctx, host, c.AccountID)
 	case WorkspaceHost:
 		return oauthClient.GetWorkspaceOAuthEndpoints(ctx, host)
 	default:
@@ -752,8 +738,6 @@ func (c *Config) getOAuthArgument() (u2m.OAuthArgument, error) {
 	switch c.HostType() {
 	case AccountHost:
 		return u2m.NewProfileAccountOAuthArgument(host, c.AccountID, profile)
-	case UnifiedHost:
-		return u2m.NewProfileUnifiedOAuthArgument(host, c.AccountID, profile)
 	case WorkspaceHost:
 		return u2m.NewProfileWorkspaceOAuthArgument(host, profile)
 	default: