Skip to content

Use SDK constant to check if default auth cannot be configured #2977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pietern merged 4 commits into from
Aug 27, 2025
Merged

Use SDK constant to check if default auth cannot be configured #2977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91e9cb6
Use SDK constant to check if default auth cannot be configured
pietern Jun 3, 2025
eeaf224
Update labs entrypoint
pietern Jun 3, 2025
6361db4
Merge branch 'main' into use-sdk-constant
pietern Jun 25, 2025
f7b3ac3
Merge branch 'main' into use-sdk-constant
pietern Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/labs/project/entrypoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func (e *Entrypoint) validLogin(cmd *cobra.Command) (*config.Config, error) {
isACC := cfg.IsAccountClient()
if e.IsAccountLevel && cfg.Profile == "" {
if !cmdio.IsPromptSupported(ctx) {
return nil, root.ErrCannotConfigureAuth
return nil, config.ErrCannotConfigureDefault
}
replaceCfg, err := e.envAwareConfig(ctx)
if err != nil {
Expand Down
19 changes: 2 additions & 17 deletions cmd/root/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"errors"
"fmt"
"net/http"
"strings"

"github.com/databricks/cli/libs/auth"
"github.com/databricks/cli/libs/cmdctx"
Expand Down Expand Up @@ -34,20 +33,6 @@ func (e ErrNoAccountProfiles) Error() string {
return e.path + " does not contain account profiles"
}

func isCannotConfigureAuth(err error) bool {
// As of SDK v0.70.0, this constant was removed.
//
// return errors.Is(err, config.ErrCannotConfigureAuth)
//
// The prefix check is based on this:
//
// https://github.com/databricks/databricks-sdk-go/commit/ef3a65c6ee8f0de253ce6f554e6d905d6a5fdc85#diff-83d1fd7f94efd3481cd11ebab8065cc81e18ef0d8776097c29b8a183a20df52fR86
return strings.Contains(err.Error(), "cannot configure default credentials, ")
}

// Referenced by cmd/labs/project/entrypoint.go.
var ErrCannotConfigureAuth = errors.New("cannot configure default credentials, please check https://docs.databricks.com/en/dev-tools/auth.html#databricks-client-unified-authentication to configure credentials for your preferred authentication method")

func initProfileFlag(cmd *cobra.Command) {
cmd.PersistentFlags().StringP("profile", "p", "", "~/.databrickscfg profile")
cmd.RegisterFlagCompletionFunc("profile", profile.ProfileCompletion)
Expand All @@ -74,7 +59,7 @@ func accountClientOrPrompt(ctx context.Context, cfg *config.Config, allowPrompt
// Prompt to select a profile if the current configuration is not an account client.
prompt = prompt || errors.Is(err, databricks.ErrNotAccountClient)
// Prompt to select a profile if the current configuration doesn't resolve to a credential provider.
prompt = prompt || isCannotConfigureAuth(err)
prompt = prompt || errors.Is(err, config.ErrCannotConfigureDefault)
}

if !prompt {
Expand Down Expand Up @@ -174,7 +159,7 @@ func workspaceClientOrPrompt(ctx context.Context, cfg *config.Config, allowPromp
// Prompt to select a profile if the current configuration is not a workspace client.
prompt = prompt || errors.Is(err, databricks.ErrNotWorkspaceClient)
// Prompt to select a profile if the current configuration doesn't resolve to a credential provider.
prompt = prompt || isCannotConfigureAuth(err)
prompt = prompt || errors.Is(err, config.ErrCannotConfigureDefault)
}

if !prompt {
Expand Down
Loading