Only add ResticPassword if set #147
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
|
also I think: Mergo is not really necessary if the idea is just to add keys into the map if they haven't been defined yet |
srueg
approved these changes
Nov 19, 2020
Closed
|
Just tested this, seems to fix the dropped About the mergo remark: it's not only keys that haven't been defined yet. For example the global restic password should always be overwritten if it's defined in a specific job. |
ccremer
changed the title
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.
see #135 for context - @Kidswiss mentioned that the RESTIC_PASSWORD setting is lost with the new implementation.
I believe this was responsible for the Restic password not being merged correct. As it's been set by default even if the backend didn't specify, the global default wasn't being used instead.
I added a test to clarify the way Mergo merges.