[Fleet] Fix policy revision number getting bumped for no reason #104696
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
Zacqary
added
v8.0.0
Feature:Fleet
Contributor
|
Pinging @elastic/fleet (Feature:Fleet) |
Contributor
|
Pinging @elastic/fleet (Team:Fleet) |
Zacqary
added
the
release_note:skip
nchaulet
reviewed
Jul 7, 2021
Comment on lines
145
to
148
| const configTopLevelFields = omit(preconfiguredAgentPolicy, 'package_policies', 'id'); | ||
| const currentTopLevelFields = omit(policy, 'package_policies'); | ||
| const currentTopLevelFields = pick(policy, ...Object.keys(configTopLevelFields)); | ||
|
|
||
| if (!isEqual(configTopLevelFields, currentTopLevelFields)) { |
Member
There was a problem hiding this comment.
Do you think it will make sense to have a non regression test here? and maybe extract this to a hasPreconfiguredPolicyChanged() or better naming to make writing this test easier?
nchaulet
approved these changes
Jul 7, 2021
Member
nchaulet
left a comment
nchaulet
left a comment
There was a problem hiding this comment.
Thanks for adding the test 🚀
Contributor
💚 Build SucceededMetrics [docs]
History
To update your PR or re-run it, just comment with: cc @Zacqary |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Jul 7, 2021
…tic#104696) * [Fleet] Fix policy revision number getting bumped for no reason * Add test for comparing preconfig policy to current
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Jul 7, 2021
…tic#104696) * [Fleet] Fix policy revision number getting bumped for no reason * Add test for comparing preconfig policy to current
Contributor
kibanamachine
added a commit
that referenced
this pull request
Jul 7, 2021
) (#104767) * [Fleet] Fix policy revision number getting bumped for no reason * Add test for comparing preconfig policy to current Co-authored-by: Zacqary Adam Xeper <Zacqary@users.noreply.github.com>
jloleysens
added a commit
to jloleysens/kibana
that referenced
this pull request
Jul 8, 2021
…-of-max-results * 'master' of github.com:elastic/kibana: (36 commits) Lower Kibana app bundle limits (elastic#104688) [Security Solutions] Fixes bug with the filter query compatibility for transforms (elastic#104559) [RAC] Add mapping update logic to RuleDataClient (elastic#102586) Fix import workpad (elastic#104722) [canvas] Fix Storybook service decorator (elastic#104750) [Detection Rules] Add 7.14 rules (elastic#104772) [Enterprise Search] Fix beta notification in sidebar (elastic#104763) Fix engine routes that are meta engine or non-meta-engine specific (elastic#104757) [Fleet] Fix policy revision number getting bumped for no reason (elastic#104696) persistable state migrations (elastic#103680) [Fleet] Fix add agent in the package policy table (elastic#104749) [DOCS] Creates separate doc for security in production (elastic#103973) [SO Migration] fix reindex race on multi-instance mode (elastic#104516) [Security Solution] Update text in Endpoint Admin pages (elastic#104649) [package testing] Decrease timeout to 2 hours (elastic#104668) Fix background styling of waterfall chart sidebar tooltip. (elastic#103997) [Fleet + Integrations UI] Integrations UI Cleanup (elastic#104641) [Fleet] Link to download page of current stack version on Agent install instructions (elastic#104494) [Workplace Search] Fix Media Type field preview is unformatted bug (elastic#104684) [ML] add marker body (elastic#104672) ... # Conflicts: # x-pack/plugins/fleet/public/search_provider.test.ts
kibanamachine
added
the
backport missing
Contributor
|
Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync. |
1 similar comment
Contributor
|
Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync. |
kibanamachine
removed
the
backport missing
kibanamachine
added a commit
that referenced
this pull request
Jul 13, 2021
) (#104768) * [Fleet] Fix policy revision number getting bumped for no reason * Add test for comparing preconfig policy to current Co-authored-by: Zacqary Adam Xeper <Zacqary@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Summary
Fixes #104584
The check to see if any top-level fields on
is_managedpolicies had changed was broken, and wasn't correctly filtering the current agent policy down to only the diff-checked fields. This fixes the issue.