Reuse shared ExtractHostQueryParams, remove redundant mutator

Refactor Workspace.NormalizeHostURL() to use auth.ExtractHostQueryParams()
instead of duplicating URL query parameter parsing. Remove the
NormalizeHostURL mutator since Client() already calls NormalizeHostURL()
before building the SDK config, making the Initialize-phase mutator
redundant.

Addresses review feedback from andrewnester on #4825.

Co-authored-by: Isaac

Author: simonfaltum

bundle/config/mutator/normalize_host_url.go

@@ -1,10 +1,10 @@
 package config
 
 import (
-	"net/url"
 	"os"
 	"path/filepath"
 
+	"github.com/databricks/cli/libs/auth"
 	"github.com/databricks/cli/libs/databrickscfg"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/config"
@@ -146,40 +146,14 @@ func (w *Workspace) Config() *config.Config {
 // config. Must be called before Config() so the extracted fields are included
 // in the SDK config used for profile resolution and authentication.
 func (w *Workspace) NormalizeHostURL() {
-	if w.Host == "" {
-		return
-	}
-	u, err := url.Parse(w.Host)
-	if err != nil {
-		return
-	}
-	q := u.Query()
-	if len(q) == 0 {
-		return
-	}
-
-	// Extract workspace_id from ?o= or ?workspace_id= if not already set.
+	params := auth.ExtractHostQueryParams(w.Host)
+	w.Host = params.Host
 	if w.WorkspaceID == "" {
-		if v := q.Get("o"); v != "" {
-			w.WorkspaceID = v
-		} else if v := q.Get("workspace_id"); v != "" {
-			w.WorkspaceID = v
-		}
+		w.WorkspaceID = params.WorkspaceID
 	}
-
-	// Extract account_id from ?a= or ?account_id= if not already set.
 	if w.AccountID == "" {
-		if v := q.Get("a"); v != "" {
-			w.AccountID = v
-		} else if v := q.Get("account_id"); v != "" {
-			w.AccountID = v
-		}
+		w.AccountID = params.AccountID
 	}
-
-	// Strip query parameters from the host.
-	u.RawQuery = ""
-	u.Fragment = ""
-	w.Host = u.String()
 }
 
 func (w *Workspace) Client() (*databricks.WorkspaceClient, error) {

bundle/config/mutator/normalize_host_url_test.go

@@ -79,20 +79,40 @@ func TestWorkspaceNormalizeHostURL(t *testing.T) {
 			Host: "https://spog.databricks.com/?o=12345",
 		}
 		w.NormalizeHostURL()
-		assert.Equal(t, "https://spog.databricks.com/", w.Host)
+		assert.Equal(t, "https://spog.databricks.com", w.Host)
 		assert.Equal(t, "12345", w.WorkspaceID)
 	})
 
+	t.Run("extracts both workspace_id and account_id", func(t *testing.T) {
+		w := Workspace{
+			Host: "https://spog.databricks.com/?o=605&a=abc123",
+		}
+		w.NormalizeHostURL()
+		assert.Equal(t, "https://spog.databricks.com", w.Host)
+		assert.Equal(t, "605", w.WorkspaceID)
+		assert.Equal(t, "abc123", w.AccountID)
+	})
+
 	t.Run("explicit workspace_id takes precedence", func(t *testing.T) {
 		w := Workspace{
 			Host:        "https://spog.databricks.com/?o=999",
 			WorkspaceID: "explicit",
 		}
 		w.NormalizeHostURL()
-		assert.Equal(t, "https://spog.databricks.com/", w.Host)
+		assert.Equal(t, "https://spog.databricks.com", w.Host)
 		assert.Equal(t, "explicit", w.WorkspaceID)
 	})
 
+	t.Run("explicit account_id takes precedence", func(t *testing.T) {
+		w := Workspace{
+			Host:      "https://spog.databricks.com/?a=from-url",
+			AccountID: "explicit-account",
+		}
+		w.NormalizeHostURL()
+		assert.Equal(t, "https://spog.databricks.com", w.Host)
+		assert.Equal(t, "explicit-account", w.AccountID)
+	})
+
 	t.Run("no-op for host without query params", func(t *testing.T) {
 		w := Workspace{
 			Host: "https://normal.databricks.com",

bundle/config/workspace.go

@@ -34,10 +34,6 @@ func Initialize(ctx context.Context, b *bundle.Bundle) {
 		validate.ValidateEngine(),
 		validate.Scripts(),
 
-		// Extract query parameters (?o=, ?a=) from workspace host URL and strip them.
-		// Must run before any mutator that uses the host for authentication or API calls.
-		mutator.NormalizeHostURL(),
-
 		// Updates (dynamic): sync.{paths,include,exclude} (makes them relative to bundle root rather than to definition file)
 		// Rewrites sync paths to be relative to the bundle root instead of the file they were defined in.
 		mutator.RewriteSyncPaths(),