Fixes #25061: Archive API for import/export doesn't know about rule categories #6720
Conversation
This file contains hidden or 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
686e68d to
5a5748b
Compare
Contributor
Author
|
Commit modified |
5a5748b to
b6353f0
Compare
Contributor
Author
|
Commit modified |
b6353f0 to
5a2f406
Compare
Contributor
Author
|
Commit modified |
5a2f406 to
b945333
Compare
Contributor
Author
|
Commit modified |
clarktsiory
commented
Nov 25, 2025
Comment on lines
+108
to
+120
| test("move nested rule category2")( | ||
| withCtx(_.save(policyArchiveRuleCategory(rootRuleCategoryWithSubcat2), MergePolicy.KeepRuleTargets))(root => { | ||
| // the expected value is wrong : the test Repo does something unexpected, it leads to multiple categories with same ID, and the root is moved. | ||
| // for now, check that the "rootRuleCategory" effectively contains the expected format | ||
| assertTrue( | ||
| root | ||
| .find(rootRuleCategory.id) | ||
| .map(_._1) | ||
| .getOrElse(rootRuleCategory) | ||
| .transformInto[JRuleCategories] == rootRuleCategoryWithSubcat2.transformInto[JRuleCategories] | ||
| ) | ||
| }) | ||
| ) |
Contributor
Author
There was a problem hiding this comment.
this is problematic in tests : the test ruleCategoryRepo is not behaving the same as the LDAP one, we will need to correct this and add tests in another PR
(#6743)
fanf
approved these changes
Nov 28, 2025
Member
fanf
left a comment
There was a problem hiding this comment.
Work great ! I was able to create a new category and move a rule in it just with an import :)
Contributor
|
OK, merging this PR |
39d589b
into
Normation:branches/rudder/8.3
20 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
https://issues.rudder.io/issues/25061
Adding the implementation that was marked as a TODO comment : save the tree of
RuleCategoryin the exported archive underrule-categories.json, and be able to import the same JSON file, and create/move categories accordingly.In tests :
By adding the latter, I identified some inconsistency in the test implementation, that will need a following PR