Fixes #25979: Migrate custom properties along with node properties for consistency #6060
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
clarktsiory
reviewed
Nov 29, 2024
Comment on lines
+86
to
+87
| (getNode1PropNamesAsSeenByLdap() must containTheSameElementsAs(List("foo", "datacenter", "from_inv"))) and | ||
| (getNode1PropNamesAsSeenByRepo() must containTheSameElementsAs(List("foo", "datacenter", "from_inv"))) |
There was a problem hiding this comment.
I forgot but is this really guaranteed to be true i.e. does the other test that adds datacenter, from_inv always execute before this one ?
...dder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateCustomProperties.scala
Outdated
Show resolved
Hide resolved
| * in the ou=Accepted Inventories branch, and if so, it save back them so that | ||
| * they are moved along with other properties. | ||
| * Added in rudder 8.1.8 (https://issues.rudder.io/issues/25978) | ||
| * Can be removed in Rudder 8.3 |
There was a problem hiding this comment.
This PR is in 8.3, the comment could be misleading, why not removing this file then ?
There was a problem hiding this comment.
yes, I was not sure if we should put it in 8.1 or not. But there is 0 reasons to do so:
- it's an architectural change,
- that doesn't correct any direct bugs
That goes to 8.3. I updated the text accordingly.
…ties for consistency Fixes #25979: Migrate custom properties along with node properties for consistency
|
PR updated with a new commit |
… properties for consistency Fixes #25979: Migrate custom properties along with node properties for consistency
|
PR updated with a new commit |
|
Given #6063, we will need to think back how to do the migration:
Perhas we should add |
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.
https://issues.rudder.io/issues/25979
Ported from first correction of #6059
So, we have two kind of properties for nodes:
customPropertycomes from inventory and are stored inou=[Pending, Accepted] Inventoriesbranch,serializedNodePropertycomes from plugin, users, etc and are stored inou=Nodesbranch.Before 8.0, the separation was mandatory because node entry under
ou=Nodeswas only created at acceptation time. This limitation was removed in Rudder 8.0.It makes not architectural sense to have the split persists. We can merge them together in
ou=Nodesentries.