steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass `DATABRICKS_CONFIG_FILE` env var to sdk config during `auth profiles` (#1394) 

## Changes
* Currently, we use `auth profiles` command with
`DATABRICKS_CONFIG_FILE` env var set, the file pointed to by the env var
is ONLY used for loading the profile names (ini file sections). It is
not passed to go sdk config object. We also don't use env variable
loader in the go sdk config object, so this env var is ignored by the
config and only default file is read.
* This PR explicitly sets the config file path in the go sdk config
object.

## Tests
* integration tests in vscode
This commit is contained in:
Kartik Gupta 2024-04-24 11:18:13 +02:00 committed by GitHub
parent 60122f6035
commit 1c02224902
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/auth/profiles.go
View File

@ -29,10 +29,11 @@ func (c *profileMetadata) IsEmpty() bool {
return c.Host == "" && c.AccountID == "" return c.Host == "" && c.AccountID == ""
} }
func (c *profileMetadata) Load(ctx context.Context, skipValidate bool) { func (c *profileMetadata) Load(ctx context.Context, configFilePath string, skipValidate bool) {
cfg := &config.Config{ cfg := &config.Config{
Loaders: []config.Loader{config.ConfigFile}, Loaders: []config.Loader{config.ConfigFile},
Profile: c.Name, ConfigFile: configFilePath,
Profile: c.Name,
} }
_ = cfg.EnsureResolved() _ = cfg.EnsureResolved()
if cfg.IsAws() { if cfg.IsAws() {
@ -117,7 +118,7 @@ func newProfilesCommand() *cobra.Command {
go func() { go func() {
ctx := cmd.Context() ctx := cmd.Context()
t := time.Now() t := time.Now()
profile.Load(ctx, skipValidate) profile.Load(ctx, iniFile.Path(), skipValidate)
log.Debugf(ctx, "Profile %q took %s to load", profile.Name, time.Since(t)) log.Debugf(ctx, "Profile %q took %s to load", profile.Name, time.Since(t))
wg.Done() wg.Done()
}() }()

2
cmd/auth/profiles_test.go
View File

@ -36,7 +36,7 @@ func TestProfiles(t *testing.T) {
// Load the profile // Load the profile
profile := &profileMetadata{Name: "profile1"} profile := &profileMetadata{Name: "profile1"}
profile.Load(ctx, true) profile.Load(ctx, configFile, true)
// Check the profile // Check the profile
assert.Equal(t, "profile1", profile.Name) assert.Equal(t, "profile1", profile.Name)