Skip to content

Infer host from profile during login#629

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
mgyucht merged 2 commits into from
Aug 2, 2023
Merged

Infer host from profile during login #629

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1baefc8
Infer host from profile during login
mgyucht Jul 31, 2023
d08152b
Merge branch 'main' into infer-host-from-profile-during-login
mgyucht Jul 31, 2023
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
47 changes: 30 additions & 17 deletions cmd/auth/login.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,36 @@ func newLoginCommand(persistentAuth *auth.PersistentAuth) *cobra.Command {

cmd.RunE = func(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()

var profileName string

@andrewnesterandrewnesterJul 31, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Profile prompt was used also to store new profile with a chosen name(or update existing one)
So for example, it would me allow to override "dogfood" profile with a new host even if I have already one.

With this change if I understand it correctly, it's not possible, right?

@mgyuchtmgyuchtAug 1, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Users can update the host used for a profile by passing --host on the CLI, so this would remove the prompt for hostname if the profile exists. My assumption is that people typically do not change the hostname for a profile; 99% of the time, they are reauthing to a host that they've already configured.

profileFlag := cmd.Flag("profile")
if profileFlag != nil && profileFlag.Value.String() != "" {
profileName = profileFlag.Value.String()
} else {
prompt := cmdio.Prompt(ctx)
prompt.Label = "Databricks Profile Name"
prompt.Default = persistentAuth.ProfileName()

@andrewnesterandrewnesterJul 31, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previously it proposed default value based on host name, what does it prompts now?

@mgyuchtmgyuchtAug 1, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be just empty string, as we don't know where they are trying to authenticate to.

prompt.AllowEdit = true
profile, err := prompt.Run()
if err != nil {
return err
}
profileName = profile
}

// If the chosen profile has a hostname and the user hasn't specified a host, infer the host from the profile.
_, profiles, err := databrickscfg.LoadProfiles(databrickscfg.DefaultPath, func(p databrickscfg.Profile) bool {
return p.Name == profileName
})
if err != nil {
return err
}
if persistentAuth.Host == "" {
configureHost(ctx, persistentAuth, args, 0)
if len(profiles) > 0 && profiles[0].Host != "" {
persistentAuth.Host = profiles[0].Host
} else {
configureHost(ctx, persistentAuth, args, 0)
}
}
defer persistentAuth.Close()

Expand All@@ -66,22 +94,7 @@ func newLoginCommand(persistentAuth *auth.PersistentAuth) *cobra.Command {
ctx, cancel := context.WithTimeout(ctx, loginTimeout)
defer cancel()

var profileName string
profileFlag := cmd.Flag("profile")
if profileFlag != nil && profileFlag.Value.String() != "" {
profileName = profileFlag.Value.String()
} else {
prompt := cmdio.Prompt(ctx)
prompt.Label = "Databricks Profile Name"
prompt.Default = persistentAuth.ProfileName()
prompt.AllowEdit = true
profile, err := prompt.Run()
if err != nil {
return err
}
profileName = profile
}
err := persistentAuth.Challenge(ctx)
err = persistentAuth.Challenge(ctx)
if err != nil {
return err
}
Expand Down