-
Notifications
You must be signed in to change notification settings - Fork 4
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 support for multiple config files #13
Merged
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
- added YamlBase merge tests - refactored tests to use assert
moved ignore-missing to a pointer
added a --dump-config flag, which generates the final config to be used by shipshape
Not only was it redundant, but it was also causing a race issue.
run tests with -race flag
Fixed one more race condition.
The merge is now working as required; given the following files: # initial-config.yml
checks:
file:
- name: '[FILE] Illegal files'
path: web/sites/default/files
disallowed-pattern: '^(adminer|phpmyadmin|bigdump)?\.php$' # config-override.yml
checks:
file:
- path: ./ Running project-dir: /Users/yusuf/projects/shipshape
fail-severity: high
checks:
file:
- name: '[FILE] Illegal files'
severity: normal
path: ./
disallowed-pattern: ^(adminer|phpmyadmin|bigdump)?\.php$ |
steveworley
approved these changes
Aug 31, 2022
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.
First pass at the merge; currently it can merge the following scenario.
Given the following files:
Running
go run . -f initial-config.yml -f config-override.yml --dump-config
will provide the following config:Note: I did some major refactoring:
check
suffix to the check files - a future refactoring would be to move the checks out into a separate directory altogetherEnsure*
and the like, to instead useassert.*
Still a work in progress, and the next step is to allow the following config override to work:
The intention would be to replace the path for all
file
checks in the config.