Revert bundle initialize_urls changes to avoid URL output regression

The shared workspaceurls lib uses a stricter adb- hostname check for
workspace ID detection. This is correct but changes bundle summary URL
output on non-Azure workspaces (adds ?o= where it was previously
omitted due to a loose strings.Contains match). That behavior change
should be a separate PR with its own integration test updates.

experimental open still uses the shared lib with the strict check.

Author: simonfaltum

bundle/config/mutator/initialize_urls.go

@@ -2,10 +2,12 @@ package mutator
 
 import (
 	"context"
+	"net/url"
+	"strconv"
+	"strings"
 
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/libs/diag"
-	"github.com/databricks/cli/libs/workspaceurls"
 )
 
 type initializeURLs struct{}
@@ -23,24 +25,38 @@ func (m *initializeURLs) Name() string {
 }
 
 func (m *initializeURLs) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
-	workspaceID, err := b.WorkspaceClient().CurrentWorkspaceID(ctx)
+	workspaceId, err := b.WorkspaceClient().CurrentWorkspaceID(ctx)
 	if err != nil {
 		return diag.FromErr(err)
 	}
+	orgId := strconv.FormatInt(workspaceId, 10)
 	host := b.WorkspaceClient().Config.CanonicalHostName()
-	err = initializeForWorkspace(b, workspaceID, host)
+	err = initializeForWorkspace(b, orgId, host)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 	return nil
 }
 
-func initializeForWorkspace(b *bundle.Bundle, workspaceID int64, host string) error {
-	baseURL, err := workspaceurls.WorkspaceBaseURL(host, workspaceID)
+func initializeForWorkspace(b *bundle.Bundle, orgId, host string) error {
+	baseURL, err := url.Parse(host)
 	if err != nil {
 		return err
 	}
 
+	// Add ?o=<workspace id> only if <workspace id> wasn't in the subdomain already.
+	// The ?o= is needed when vanity URLs / legacy workspace URLs are used.
+	// If it's not needed we prefer to leave it out since these URLs are rather
+	// long for most terminals.
+	//
+	// See https://docs.databricks.com/en/workspace/workspace-details.html for
+	// further reading about the '?o=' suffix.
+	if !strings.Contains(baseURL.Hostname(), orgId) {
+		values := baseURL.Query()
+		values.Add("o", orgId)
+		baseURL.RawQuery = values.Encode()
+	}
+
 	for _, group := range b.Config.Resources.AllResources() {
 		for _, r := range group.Resources {
 			r.InitializeURL(*baseURL)

bundle/config/mutator/initialize_urls_test.go

@@ -109,7 +109,7 @@ func TestInitializeURLs(t *testing.T) {
 		"dashboard1":       "https://mycompany.databricks.com/dashboardsv3/01ef8d56871e1d50ae30ce7375e42478/published?o=123456",
 	}
 
-	err := initializeForWorkspace(b, 123456, "https://mycompany.databricks.com/")
+	err := initializeForWorkspace(b, "123456", "https://mycompany.databricks.com/")
 	require.NoError(t, err)
 
 	for _, group := range b.Config.Resources.AllResources() {
@@ -133,28 +133,8 @@ func TestInitializeURLsWithoutOrgId(t *testing.T) {
 		},
 	}
 
-	err := initializeForWorkspace(b, 123456, "https://adb-123456.azuredatabricks.net/")
+	err := initializeForWorkspace(b, "123456", "https://adb-123456.azuredatabricks.net/")
 	require.NoError(t, err)
 
 	require.Equal(t, "https://adb-123456.azuredatabricks.net/jobs/1", b.Config.Resources.Jobs["job1"].URL)
 }
-
-func TestInitializeURLsWithWorkspaceIDInVanityHostname(t *testing.T) {
-	b := &bundle.Bundle{
-		Config: config.Root{
-			Resources: config.Resources{
-				Jobs: map[string]*resources.Job{
-					"job1": {
-						BaseResource: resources.BaseResource{ID: "1"},
-						JobSettings:  jobs.JobSettings{Name: "job1"},
-					},
-				},
-			},
-		},
-	}
-
-	err := initializeForWorkspace(b, 123456, "https://workspace-123456.example.com/")
-	require.NoError(t, err)
-
-	require.Equal(t, "https://workspace-123456.example.com/jobs/1?o=123456", b.Config.Resources.Jobs["job1"].URL)
-}