issue 6300: correctly handle configuration includes from arrays - v1 #9465
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
Includes from an "include" array were being loaded into the wrong parent as the logic for array handing in include context was not updated. If we are descending into an array in include context, pass through the current parent so the included configuration is included where it is expected. Bug: OISF#6300
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #9465 +/- ##
==========================================
- Coverage 82.18% 82.18% -0.01%
==========================================
Files 968 968
Lines 274199 274199
==========================================
- Hits 225363 225355 -8
- Misses 48836 48844 +8
Flags with carried forward coverage won't be shown. Click here to find out more. |
|
Information: QA ran without warnings. Pipeline 15866 |
victorjulien
approved these changes
Sep 8, 2023
jlucovsky
changed the title
Merged
|
Merged in #9492, thanks! |
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.
Includes from an "include" array were being loaded into the wrong
parent as the logic for array handing in include context was not
updated.
If we are descending into an array in include context, pass through
the current parent so the included configuration is included where it
is expected.
Bug: https://redmine.openinfosecfoundation.org/issues/6300
SV_BRANCH=OISF/suricata-verify#1382