mirror of https://github.com/databricks/cli.git
Improve errors
This commit is contained in:
parent
a7edd65932
commit
1bf6929980
|
@ -2,6 +2,7 @@ package mutator
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"fmt"
|
||||||
"net/url"
|
"net/url"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
@ -27,7 +28,7 @@ func (m *initializeURLs) Name() string {
|
||||||
func (m *initializeURLs) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
|
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 {
|
if err != nil {
|
||||||
return diag.FromErr(err)
|
return diag.FromErrPrefix("CurrentWorkspaceID failed: ", err)
|
||||||
}
|
}
|
||||||
orgId := strconv.FormatInt(workspaceId, 10)
|
orgId := strconv.FormatInt(workspaceId, 10)
|
||||||
host := b.WorkspaceClient().Config.CanonicalHostName()
|
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 {
|
func initializeForWorkspace(b *bundle.Bundle, orgId, host string) error {
|
||||||
baseURL, err := url.Parse(host)
|
baseURL, err := url.Parse(host)
|
||||||
if err != nil {
|
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.
|
// Add ?o=<workspace id> only if <workspace id> wasn't in the subdomain already.
|
||||||
|
|
Loading…
Reference in New Issue