Skip to content

[7.x] [Fleet] Rename CONFIG_CHANGE action to POLICY_CHANGE (#78221)#78798

Merged
jen-huang merged 6 commits intoelastic:7.xfrom
jen-huang:backport/7.x/pr-78221
Sep 30, 2020
Merged

[7.x] [Fleet] Rename CONFIG_CHANGE action to POLICY_CHANGE (#78221)#78798
jen-huang merged 6 commits intoelastic:7.xfrom
jen-huang:backport/7.x/pr-78221

Conversation

@jen-huang
Copy link
Copy Markdown
Contributor

@jen-huang jen-huang commented Sep 29, 2020

Backports the following commits to 7.x:

@jen-huang @elasticmachine
[Fleet] Rename CONFIG_CHANGE action to POLICY_CHANGE (elastic#78221)
f3357b8 
* Initial pass at config->policy change action

* Make policy change action BWC with agent <= 7.9

* Fix test

* Add agent action SO migration for policy change actions

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@jen-huang jen-huang added the backport This PR is a backport of another PR label Sep 29, 2020
@jen-huang
Copy link
Copy Markdown
Contributor Author

jen-huang commented Sep 29, 2020

The failure on Error: expected 'CONFIG_CHANGE' to equal 'POLICY_CHANGE' could happen if we detect that the agent version is < 7.10.0 and thus send CONFIG_CHANGE instead. But the agent version used in the test suite is set to the Kibana version, which should be 7.10.0 on this branch. The test passes locally using this branch 🤔 Going to re-run CI to double check...

@jen-huang
Copy link
Copy Markdown
Contributor Author

jen-huang commented Sep 29, 2020

@elasticmachine merge upstream

@jen-huang
Copy link
Copy Markdown
Contributor Author

jen-huang commented Sep 30, 2020

The problem was that semver.lt('7.10.0-SNAPSHOT', '7.10.0') was returning true, causing the code to return CONFIG_CHANGE instead of POLICY_CHANGE. I've adjusted the condition and added tests in 676ce45 and will open a PR to cherry-pick this commit into master.

@jen-huang jen-huang mentioned this pull request Sep 30, 2020
Merged
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Sep 30, 2020

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@jen-huang jen-huang merged commit 39ec0bc into elastic:7.x Sep 30, 2020
@jen-huang jen-huang deleted the backport/7.x/pr-78221 branch September 30, 2020 08:29
@jen-huang jen-huang mentioned this pull request Oct 16, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

backport This PR is a backport of another PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jen-huang @kibanamachine @elasticmachine