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.

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

[8.5](backport #1963) Don't send POLICY_CHANGE actions retrieved from index to agent. #1998

Merged
merged 3 commits into from
Oct 18, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 17, 2022

This is an automatic backport of pull request #1963 done by Mergify.
Cherry-pick of b51bf97 has failed:

On branch mergify/bp/8.5/pr-1963
Your branch is up to date with 'origin/8.5'.

You are currently cherry-picking commit b51bf97.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   internal/pkg/api/handleCheckin.go
	new file:   internal/pkg/api/handleCheckin_test.go
	deleted:    internal/pkg/api/handleChecking_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.next.asciidoc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Don't send POLICY_CHANGE actions retrieved from index to agent.

The fleet-server should not send any policy change actions that are
written to the actions index to an agent on checkin. The server will
remove these actions in the convert method and emit a warning message.
The ack token that is used is not altered in this case. Policy change
actions are dynamically generated by the fleet-server when it detects
that the agent is not running an up to date version of the policy.

* move filtering to its own method

* Fix linter, tests, fix file name

(cherry picked from commit b51bf97)

# Conflicts:
#	CHANGELOG.next.asciidoc
@mergify mergify bot requested a review from a team as a code owner October 17, 2022 19:15
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 17, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Oct 17, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-10-17T22:01:25.914+0000

  • Duration: 11 min 19 sec

Test stats 🧪

Test Results
Failed 0
Passed 358
Skipped 1
Total 359

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@michel-laterman michel-laterman merged commit d4db7f1 into 8.5 Oct 18, 2022
@michel-laterman michel-laterman deleted the mergify/bp/8.5/pr-1963 branch October 18, 2022 17:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants