Add ability to override/merge items in local .DEREK.yml #140
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
alexellis
reviewed
Jan 20, 2020
alexellis
reviewed
Jan 20, 2020
alexellis
reviewed
Jan 20, 2020
alexellis
requested changes
Jan 20, 2020
Currently it only follows the local file's redirect url (only goes 1 layer deep) |
Waterdrips
force-pushed
the
merge-configs
branch
from
4022163 to
59fe949
Compare
Waterdrips
force-pushed
the
merge-configs
branch
from
59fe949 to
4d54685
Compare
We can now provide some local overrides from our Local DEREK.yml, these overrides are then merged with the remote DEREK.yaml. This allows us to add specific users to specific repos, or add features for specific ones too. Any slices are merged and the single values are overridden by the local values. Signed-off-by: Alistair Hey <alistair@heyal.co.uk>
Waterdrips
force-pushed
the
merge-configs
branch
from
4d54685 to
4a9cdaf
Compare
alexellis
changed the title
alexellis
reviewed
Mar 9, 2020
|
|
||
| func MergeDerekRepoConfigs(localConfig, remoteConfig DerekRepoConfig) (DerekRepoConfig, error) { | ||
|
|
||
| mergeErr := mergo.Merge(&remoteConfig, &localConfig, mergo.WithAppendSlice) |
There was a problem hiding this comment.
Are we going to have the same issues we have with ofc-bootstrap? I saw some tests, do we need more?
|
I suspect the messages list might break @Waterdrips, can you add some tests for union/intersection? |
|
Good spot. Iv just written a failing test. I'll get a pr in to sort that messages list soon |
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.
Description
We can now provide some local overrides from our Local DEREK.yml,
these overrides are then merged with the remote DEREK.yaml.
This allows us to add specific users to specific repos, or add
features for specific ones too. Any slices are merged and the
single values are overridden by the local values.
Signed-off-by: Alistair Hey alistair@heyal.co.uk
Motivation and Context
Config redirect with local repo-based overrides #94
How Has This Been Tested?
Unit tests written, and this was tested on github using this repo: https://github.com/Waterdrips/heyal-ofc-customers
I setup a .DEREK.yml that had me as a contributor and a load of general config, but no "features"
pointed the Redirect at .DEREK-OVERRIDE.yml in the same repo, which added @alexellis as a contributor, plus it had the features listed.
Then I created a non signed commit and PR, DCO check was done (features in redirect file)
I was able to use the derek commands (local file)
And Alex was able to use Derek commands (set in redirect file)
Types of changes
Checklist:
git commit -s