Always resolve .databrickscfg file #659
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pietern
approved these changes
Aug 14, 2023
libs/databrickscfg/profiles.go
Outdated
|
|
||
| func LoadProfiles(path string, fn ProfileMatchFunction) (file string, profiles Profiles, err error) { | ||
| f, err := config.LoadFile(path) | ||
| func GetDatabricksCfg() (*config.File, error) { |
There was a problem hiding this comment.
Can be just Get() -- the rest is implied by the package name.
libs/databrickscfg/profiles.go
Outdated
| @@ -64,12 +66,34 @@ func MatchAllProfiles(p Profile) bool { | |||
| return true | |||
| } | |||
|
|
|||
| const DefaultPath = "~/.databrickscfg" | |||
| // Get the path to the .databrickscfg file, falling back to the default in the current user's home directory. | |||
| func GetDatabricksCfgPath() (string, error) { | |||
There was a problem hiding this comment.
Can be GetPath() -- rest implied by the package name.
pietern
added a commit
that referenced
this pull request
Aug 16, 2023
CLI: * Always resolve .databrickscfg file ([#659](#659)). Bundles: * Add internal tag for bundle fields to be skipped from schema ([#636](#636)). * Log the bundle root configuration file if applicable ([#657](#657)). * Execute paths without the .tmpl extension as templates ([#654](#654)). * Enable environment overrides for job clusters ([#658](#658)). * Merge artifacts and resources block with overrides enabled ([#660](#660)). * Locked terraform binary version to <= 1.5.5 ([#666](#666)). * Return better error messages for invalid JSON schema types in templates ([#661](#661)). * Use custom prompter for bundle template inputs ([#663](#663)). * Add map and pair helper functions for bundle templates ([#665](#665)). * Correct name for force acquire deploy flag ([#656](#656)). * Confirm that override with a zero value doesn't work ([#669](#669)). Internal: * Consolidate functions in libs/git ([#652](#652)). * Upgraded Go version to 1.21 ([#664](#664)).
Merged
github-merge-queue bot
pushed a commit
that referenced
this pull request
Aug 16, 2023
CLI: * Always resolve .databrickscfg file ([#659](#659)). Bundles: * Add internal tag for bundle fields to be skipped from schema ([#636](#636)). * Log the bundle root configuration file if applicable ([#657](#657)). * Execute paths without the .tmpl extension as templates ([#654](#654)). * Enable environment overrides for job clusters ([#658](#658)). * Merge artifacts and resources block with overrides enabled ([#660](#660)). * Locked terraform binary version to <= 1.5.5 ([#666](#666)). * Return better error messages for invalid JSON schema types in templates ([#661](#661)). * Use custom prompter for bundle template inputs ([#663](#663)). * Add map and pair helper functions for bundle templates ([#665](#665)). * Correct name for force acquire deploy flag ([#656](#656)). * Confirm that override with a zero value doesn't work ([#669](#669)). Internal: * Consolidate functions in libs/git ([#652](#652)). * Upgraded Go version to 1.21 ([#664](#664)).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
#629 introduced a change to autopopulate the host from .databrickscfg if the user is logging back into a host they were previously using. This did not respect the DATABRICKS_CONFIG_FILE env variable, causing the flow to stop working for users with no .databrickscfg file in their home directory.
This PR refactors all config file loading to go through one interface,
databrickscfg.GetDatabricksCfg(), and an auxiliarydatabrickscfg.GetDatabricksCfgPath()to get the configured file path.Closes #655.
Tests