Skip to content

First look for databricks.yml before falling back to bundle.yml - #580

Merged
fjakobs merged 5 commits into
mainfrom
databricks-yaml
Jul 18, 2023
Merged

First look for databricks.yml before falling back to bundle.yml#580
fjakobs merged 5 commits into
mainfrom
databricks-yaml

Conversation

@fjakobs

@fjakobsfjakobs commented Jul 17, 2023

Copy link
Copy Markdown
Contributor

Changes

  • Add support for using databricks.yml as config file. If databricks.yml is not found then falling back to bundle.yml for backwards compatibility.
  • Add support for .yaml extension.
  • Give an error when more than one config file is found

Tests

  • added unit test
  • manual testing the different cases

pietern
pietern reviewed Jul 17, 2023
View reviewed changes

@pieternpietern left a comment

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.

Broad strokes LGTM. Comments are pretty minor.

Comment threadbundle/config/root.go Outdated
Comment threadbundle/config/root.go Outdated
Comment threadbundle/config/root.go Outdated
Comment threadbundle/config/root.go Outdated
Comment threadbundle/config/root.go Outdated
Comment threadbundle/config/root_test.go Outdated
Comment threadbundle/config/root_test.go Outdated
Comment threadbundle/root_test.go
Comment threadbundle/config/root.go Outdated
fjakobsand others added 2 commits July 17, 2023 16:33
@fjakobs@pietern
Update bundle/config/root.go
2d0ead8
Co-authored-by: Pieter Noordhuis <pieter.noordhuis@databricks.com>
@fjakobs@pietern
Update bundle/config/root.go
dcb4e66
Co-authored-by: Pieter Noordhuis <pieter.noordhuis@databricks.com>
pietern
pietern reviewed Jul 17, 2023
View reviewed changes
Comment threadbundle/config/root_test.go
Comment threadbundle/config/root_test.go Outdated
pietern
pietern reviewed Jul 17, 2023
View reviewed changes
Comment threadbundle/config/root_test.go Outdated
lennartkats-db
lennartkats-db requested changes Jul 18, 2023
View reviewed changes
Comment threadbundle/bundle_test.go
@pieternpietern changed the title First look for databricks.yaml before falling back to bundle.ymlFirst look for databricks.yml before falling back to bundle.ymlJul 18, 2023
@fjakobs
fjakobs merged commit 8cfb1c1 into mainJul 18, 2023
@fjakobs
fjakobs deleted the databricks-yaml branch July 18, 2023 10:16
@nfxnfx mentioned this pull request Jul 18, 2023
Merged
nfx pushed a commit that referenced this pull request Jul 18, 2023
Serge Smertin
Release v0.201.0
c2023a5
* Add development runs ([#522](#522)).
* Support tab completion for profiles ([#572](#572)).
* Correctly use --profile flag passed for all bundle commands ([#571](#571)).
* Disallow notebooks in paths where files are expected ([#573](#573)).
* Improve auth login experience ([#570](#570)).
* Remove base path checks during sync ([#576](#576)).
* First look for databricks.yml before falling back to bundle.yml ([#580](#580)).
* Integrate with auto-release infra ([#581](#581)).
API Changes:
* Removed `databricks metastores maintenance` command.
* Added `databricks metastores enable-optimization` command.
* Added `databricks tables update` command.
* Changed `databricks account settings delete-personal-compute-setting` command with new required argument order.
* Changed `databricks account settings read-personal-compute-setting` command with new required argument order.
* Added `databricks clean-rooms` command group.
OpenAPI SHA: 850a075ed9758d21a6bc4409506b48c8b9f93ab4, Date: 2023-07-18
Dependency updates:
* Bump golang.org/x/term from 0.9.0 to 0.10.0 ([#567](#567)).
* Bump golang.org/x/oauth2 from 0.9.0 to 0.10.0 ([#566](#566)).
* Bump golang.org/x/mod from 0.11.0 to 0.12.0 ([#568](#568)).
* Bump github.com/databricks/databricks-sdk-go from 0.12.0 to 0.13.0 ([#585](#585)).
nfx pushed a commit that referenced this pull request Jul 18, 2023
Serge Smertin
Release v0.201.0
000bd42
* Add development runs ([#522](#522)).
* Support tab completion for profiles ([#572](#572)).
* Correctly use --profile flag passed for all bundle commands ([#571](#571)).
* Disallow notebooks in paths where files are expected ([#573](#573)).
* Improve auth login experience ([#570](#570)).
* Remove base path checks during sync ([#576](#576)).
* First look for databricks.yml before falling back to bundle.yml ([#580](#580)).
* Integrate with auto-release infra ([#581](#581)).
API Changes:
* Removed `databricks metastores maintenance` command.
* Added `databricks metastores enable-optimization` command.
* Added `databricks tables update` command.
* Changed `databricks account settings delete-personal-compute-setting` command with new required argument order.
* Changed `databricks account settings read-personal-compute-setting` command with new required argument order.
* Added `databricks clean-rooms` command group.
OpenAPI SHA: 850a075ed9758d21a6bc4409506b48c8b9f93ab4, Date: 2023-07-18
Dependency updates:
* Bump golang.org/x/term from 0.9.0 to 0.10.0 ([#567](#567)).
* Bump golang.org/x/oauth2 from 0.9.0 to 0.10.0 ([#566](#566)).
* Bump golang.org/x/mod from 0.11.0 to 0.12.0 ([#568](#568)).
* Bump github.com/databricks/databricks-sdk-go from 0.12.0 to 0.13.0 ([#585](#585)).
nfx added a commit that referenced this pull request Jul 18, 2023
@nfx
Release v0.201.0 (#586)
acf292d
* Add development runs
([#522](#522)).
* Support tab completion for profiles
([#572](#572)).
* Correctly use --profile flag passed for all bundle commands
([#571](#571)).
* Disallow notebooks in paths where files are expected
([#573](#573)).
* Improve auth login experience
([#570](#570)).
* Remove base path checks during sync
([#576](#576)).
* First look for databricks.yml before falling back to bundle.yml
([#580](#580)).
* Integrate with auto-release infra
([#581](#581)).
API Changes:
* Removed `databricks metastores maintenance` command.
* Added `databricks metastores enable-optimization` command.
* Added `databricks tables update` command.
* Changed `databricks account settings delete-personal-compute-setting`
command with new required argument order.
* Changed `databricks account settings read-personal-compute-setting`
command with new required argument order.
* Added `databricks clean-rooms` command group.
OpenAPI SHA: 850a075ed9758d21a6bc4409506b48c8b9f93ab4, Date: 2023-07-18
Dependency updates:
* Bump golang.org/x/term from 0.9.0 to 0.10.0
([#567](#567)).
* Bump golang.org/x/oauth2 from 0.9.0 to 0.10.0
([#566](#566)).
* Bump golang.org/x/mod from 0.11.0 to 0.12.0
([#568](#568)).
* Bump github.com/databricks/databricks-sdk-go from 0.12.0 to 0.13.0
([#585](#585)).
@pieternpietern mentioned this pull request Jul 27, 2023
Closed
@pieternpietern mentioned this pull request Oct 25, 2023
Merged
github-merge-queueBot pushed a commit that referenced this pull request Oct 25, 2023
@pietern
Move bundle configuration filename code (#917)
486bf59
## Changes
This is unrelated to the config root so belongs in a separate file (this
was added in #580).
## Tests
n/a
@pieternpietern mentioned this pull request Oct 25, 2023
Merged
github-merge-queueBot pushed a commit that referenced this pull request Oct 25, 2023
@pietern
Consolidate bundle configuration loader function (#918)
6e21ced
## Changes
There were two functions related to loading a bundle configuration file;
one as a package function and one as a member function on the
configuration type. Loading the same configuration object twice doesn't
make sense and therefore we can consolidate to only using the package
function.
The package function would scan for known file names if the specified
path was a directory. This functionality was not in use because the
top-level bundle loader figures out the filename itself as of #580.
## Tests
Pass.
denik pushed a commit that referenced this pull request May 20, 2026
@fjakobs@pietern
First look for databricks.yml before falling back to bundle.yml (#580)
a9b2c35
## Changes
* Add support for using `databricks.yml` as config file. If
`databricks.yml` is not found then falling back to `bundle.yml` for
backwards compatibility.
* Add support for `.yaml` extension.
* Give an error when more than one config file is found
## Tests
* added unit test
* manual testing the different cases
---------
Co-authored-by: Pieter Noordhuis <pieter.noordhuis@databricks.com>
denik pushed a commit that referenced this pull request May 20, 2026
@nfx
Release v0.201.0 (#586)
dada575
* Add development runs
([#522](#522)).
* Support tab completion for profiles
([#572](#572)).
* Correctly use --profile flag passed for all bundle commands
([#571](#571)).
* Disallow notebooks in paths where files are expected
([#573](#573)).
* Improve auth login experience
([#570](#570)).
* Remove base path checks during sync
([#576](#576)).
* First look for databricks.yml before falling back to bundle.yml
([#580](#580)).
* Integrate with auto-release infra
([#581](#581)).
API Changes:
* Removed `databricks metastores maintenance` command.
* Added `databricks metastores enable-optimization` command.
* Added `databricks tables update` command.
* Changed `databricks account settings delete-personal-compute-setting`
command with new required argument order.
* Changed `databricks account settings read-personal-compute-setting`
command with new required argument order.
* Added `databricks clean-rooms` command group.
OpenAPI SHA: 850a075ed9758d21a6bc4409506b48c8b9f93ab4, Date: 2023-07-18
Dependency updates:
* Bump golang.org/x/term from 0.9.0 to 0.10.0
([#567](#567)).
* Bump golang.org/x/oauth2 from 0.9.0 to 0.10.0
([#566](#566)).
* Bump golang.org/x/mod from 0.11.0 to 0.12.0
([#568](#568)).
* Bump github.com/databricks/databricks-sdk-go from 0.12.0 to 0.13.0
([#585](#585)).
denik pushed a commit that referenced this pull request May 20, 2026
@pietern
Move bundle configuration filename code (#917)
cfd25f7
## Changes
This is unrelated to the config root so belongs in a separate file (this
was added in #580).
## Tests
n/a
denik pushed a commit that referenced this pull request May 20, 2026
@pietern
Consolidate bundle configuration loader function (#918)
8d2ccb4
## Changes
There were two functions related to loading a bundle configuration file;
one as a package function and one as a member function on the
configuration type. Loading the same configuration object twice doesn't
make sense and therefore we can consolidate to only using the package
function.
The package function would scan for known file names if the specified
path was a directory. This functionality was not in use because the
top-level bundle loader figures out the filename itself as of #580.
## Tests
Pass.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pieternpieternpietern approved these changes
@kartikgupta-dbkartikgupta-dbAwaiting requested review from kartikgupta-db
@lennartkats-dblennartkats-dbAwaiting requested review from lennartkats-db

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fjakobs@pietern@lennartkats-db