Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fixes #15019: Tag are not displayed with a nice diff in eventLog #5109

Merged
merged 1 commit into from Oct 19, 2023
Merged

Fixes #15019: Tag are not displayed with a nice diff in eventLog #5109

merged 1 commit into from Oct 19, 2023

Conversation

clarktsiory
Copy link
Contributor

@clarktsiory clarktsiory commented Oct 18, 2023 •
edited

https://issues.rudder.io/issues/15019

  • Adding a defaultValue constant in PolicyMode that is used across many files to specify that the policy mode is inferred from the global context

  • Add display of diffs for tags using 'simple lines diff' (the same that is used when displaying diffs on properties) :
    Screenshot from 2023-10-18 09-41-18

  • Add display of diffs also for the policy mode of a directive :
    from-default-to-enforce

@clarktsiory
Copy link
Contributor Author

PR updated with a new commit

fanf
fanf reviewed Oct 19, 2023
View reviewed changes
...s/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/DirectiveDiff.scala
modIsActivated: Option[SimpleDiff[Boolean]],
modIsSystem: Option[SimpleDiff[Boolean]],
modPolicyMode: Option[SimpleDiff[Option[PolicyMode]]],
modTags: Option[SimpleDiff[Tags]]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For information: when you do that kind of change, you need to ensure that it does not impact a plugin (here, the one that could be impacted is change-validation).
(and it's ok, it is not, it's just so that you won't be surprise the first time a change in rudder breaks a plugin, and so you will understand why our plugin build system is so complex)

fanf
fanf approved these changes Oct 19, 2023
View reviewed changes
Copy link
Member

@fanf fanf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, GG :)

image

@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/rudder/pull/5109
-- Your faithful QA
Kant merge: "Live your life as though your every act were to become a universal law."
(https://ci.normation.com/jenkins/job/merge-accepted-pr/74973/console)

@fanf
Copy link
Member

fanf commented Oct 19, 2023

OK, squash merging this PR

@fanf fanf force-pushed the bug_15019/tag_are_not_displayed_with_a_nice_diff_in_eventlog branch from 70b707f to f9efb33 Compare October 19, 2023 16:31
@fanf fanf merged commit f9efb33 into Normation:branches/rudder/7.3 Oct 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fanf fanf fanf approved these changes

@VinceMacBuche VinceMacBuche Awaiting requested review from VinceMacBuche

Assignees
No one assigned
Labels
qa: Can't merge
Projects
None yet
Milestone
No milestone
3 participants
@clarktsiory @Normation-Quality-Assistant @fanf