From 1bf6929980c21e9df05a6bf4ad843e78ccb93ccf Mon Sep 17 00:00:00 2001
From: Denis Bilenko <denis.bilenko@databricks.com>
Date: Mon, 10 Feb 2025 23:54:21 +0100
Subject: [PATCH] Improve errors

---
 bundle/config/mutator/initialize_urls.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bundle/config/mutator/initialize_urls.go b/bundle/config/mutator/initialize_urls.go
index 35ff53d0b..fd154aba2 100644
--- a/bundle/config/mutator/initialize_urls.go
+++ b/bundle/config/mutator/initialize_urls.go
@@ -2,6 +2,7 @@ package mutator
 
 import (
 	"context"
+	"fmt"
 	"net/url"
 	"strconv"
 	"strings"
@@ -27,7 +28,7 @@ func (m *initializeURLs) Name() string {
 func (m *initializeURLs) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
 	workspaceId, err := b.WorkspaceClient().CurrentWorkspaceID(ctx)
 	if err != nil {
-		return diag.FromErr(err)
+		return diag.FromErrPrefix("CurrentWorkspaceID failed: ", err)
 	}
 	orgId := strconv.FormatInt(workspaceId, 10)
 	host := b.WorkspaceClient().Config.CanonicalHostName()
@@ -41,7 +42,7 @@ func (m *initializeURLs) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagn
 func initializeForWorkspace(b *bundle.Bundle, orgId, host string) error {
 	baseURL, err := url.Parse(host)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to parse host=%#v: %w", host, err)
 	}
 
 	// Add ?o=<workspace id> only if <workspace id> wasn't in the subdomain already.