-
Notifications
You must be signed in to change notification settings - Fork 54
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.
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
Add --local-config-method, merge local app components with remote ones by default #301
Conversation
834f151
to
3137a76
Compare
While I was at it I also renamed the 'local' source mode to 'file' because 'local' is a misleading name. The local config is always parsed, even in 'appsre' mode. Really, what 'local' mode meant was that bonfire would fetch its apps config using the file defined at the Whether your source of truth is app-sre or the 'apps file', the |
When we release this, we should tag this as |
@skarekrow @bsquizz Can we add some E2E tests to keep this behavior away of future possible regressions ? they'll also help understand the behavior, I believe looking at a simplified use case with expectations is clearer than anything. Thanks! |
Latest commit keeps this all backward-compatible:
|
We're going to submit an ADR to get buy-in from leads on changing the default merge method |
Commit |
ff0ffff
to
a2ae703
Compare
fa42835
to
6e8c9c0
Compare
6e8c9c0
to
9b38868
Compare
9b38868
to
6c567ed
Compare
Fixes #300
This should obviate the original behavior of merging the local apps in totality and instead patch the apps specifed with the component overrides.
Special thanks to @rsnyman and @bsquizza for their help with this.